mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge pull request #1791 from ethereum/docs-fixes
Mostly typo fixes in the documentation
This commit is contained in:
commit
e34a9600f2
@ -23,7 +23,7 @@ contract in order to become the "richest", inspired by
|
|||||||
`King of the Ether <https://www.kingoftheether.com/>`_.
|
`King of the Ether <https://www.kingoftheether.com/>`_.
|
||||||
|
|
||||||
In the following contract, if you are usurped as the richest,
|
In the following contract, if you are usurped as the richest,
|
||||||
you will recieve the funds of the person who has gone on to
|
you will receive the funds of the person who has gone on to
|
||||||
become the new richest.
|
become the new richest.
|
||||||
|
|
||||||
::
|
::
|
||||||
|
@ -1101,7 +1101,7 @@ Restrictions for libraries in comparison to contracts:
|
|||||||
|
|
||||||
- No state variables
|
- No state variables
|
||||||
- Cannot inherit nor be inherited
|
- Cannot inherit nor be inherited
|
||||||
- Cannot recieve Ether
|
- Cannot receive Ether
|
||||||
|
|
||||||
(These might be lifted at a later point.)
|
(These might be lifted at a later point.)
|
||||||
|
|
||||||
|
@ -399,6 +399,7 @@ Currently, Solidity automatically generates a runtime exception in the following
|
|||||||
#. If you call ``assert`` with an argument that evaluates to false.
|
#. If you call ``assert`` with an argument that evaluates to false.
|
||||||
|
|
||||||
While a user-provided exception is generated in the following situations:
|
While a user-provided exception is generated in the following situations:
|
||||||
|
|
||||||
#. Calling ``throw``.
|
#. Calling ``throw``.
|
||||||
#. Calling ``require`` with an argument that evaluates to ``false``.
|
#. Calling ``require`` with an argument that evaluates to ``false``.
|
||||||
|
|
||||||
@ -411,4 +412,4 @@ did not occur. Because we want to retain the atomicity of transactions, the safe
|
|||||||
|
|
||||||
If contracts are written so that ``assert`` is only used to test internal conditions and ``require``
|
If contracts are written so that ``assert`` is only used to test internal conditions and ``require``
|
||||||
is used in case of malformed input, a formal analysis tool that verifies that the invalid
|
is used in case of malformed input, a formal analysis tool that verifies that the invalid
|
||||||
opcode can never be reached can be used to check for the absence of errors assuming valid inputs.
|
opcode can never be reached can be used to check for the absence of errors assuming valid inputs.
|
||||||
|
@ -2,7 +2,7 @@ Solidity
|
|||||||
========
|
========
|
||||||
|
|
||||||
Solidity is a contract-oriented, high-level language whose syntax is similar to that of JavaScript
|
Solidity is a contract-oriented, high-level language whose syntax is similar to that of JavaScript
|
||||||
and it is designed to target the Ethereum Virtual Machine.
|
and it is designed to target the Ethereum Virtual Machine (EVM).
|
||||||
|
|
||||||
Solidity is statically typed, supports inheritance, libraries and complex
|
Solidity is statically typed, supports inheritance, libraries and complex
|
||||||
user-defined types among other features.
|
user-defined types among other features.
|
||||||
|
@ -250,6 +250,7 @@ The version string in detail
|
|||||||
============================
|
============================
|
||||||
|
|
||||||
The Solidity version string contains four parts:
|
The Solidity version string contains four parts:
|
||||||
|
|
||||||
- the version number
|
- the version number
|
||||||
- pre-release tag, usually set to ``develop.YYYY.MM.DD`` or ``nightly.YYYY.MM.DD``
|
- pre-release tag, usually set to ``develop.YYYY.MM.DD`` or ``nightly.YYYY.MM.DD``
|
||||||
- commit in the format of ``commit.GITHASH``
|
- commit in the format of ``commit.GITHASH``
|
||||||
@ -280,4 +281,4 @@ Example:
|
|||||||
3. a breaking change is introduced - version is bumped to 0.5.0
|
3. a breaking change is introduced - version is bumped to 0.5.0
|
||||||
4. the 0.5.0 release is made
|
4. the 0.5.0 release is made
|
||||||
|
|
||||||
This behaviour works well with the version pragma.
|
This behaviour works well with the :ref:`version pragma <version_pragma>`.
|
||||||
|
@ -7,6 +7,8 @@ and pragma directives.
|
|||||||
|
|
||||||
.. index:: ! pragma, version
|
.. index:: ! pragma, version
|
||||||
|
|
||||||
|
.. _version_pragma:
|
||||||
|
|
||||||
Version Pragma
|
Version Pragma
|
||||||
==============
|
==============
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user