diff options
| author | chriseth <c@ethdev.com> | 2016-07-19 01:09:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-19 01:09:40 +0800 |
| commit | f24d70e914eeec1a3e51b0d118074ab68faa3bd3 (patch) | |
| tree | 57dd9ba6a6776ace9932b6165f4df4a5835c3836 /docs | |
| parent | 417fde3eab0f862f7265e6881d4dc4404b37497e (diff) | |
| parent | 5d113600aaf2fb59bebc7448f13b9af79dd70be5 (diff) | |
| download | dexon-solidity-f24d70e914eeec1a3e51b0d118074ab68faa3bd3.tar.gz dexon-solidity-f24d70e914eeec1a3e51b0d118074ab68faa3bd3.tar.zst dexon-solidity-f24d70e914eeec1a3e51b0d118074ab68faa3bd3.zip | |
Merge pull request #729 from Denton-L/minor-corrections
Minor corrections to documentation
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | docs/control-structures.rst | 4 | ||||
| -rw-r--r-- | docs/miscellaneous.rst | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/conf.py b/docs/conf.py index 8776ec43..d0e26362 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -49,7 +49,7 @@ master_doc = 'index' # General information about the project. project = 'Solidity' -copyright = '2015, Ethereum' +copyright = '2016, Ethereum' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/docs/control-structures.rst b/docs/control-structures.rst index 064996ac..f30a5bdd 100644 --- a/docs/control-structures.rst +++ b/docs/control-structures.rst @@ -422,7 +422,7 @@ The opcodes ``pushi`` and ``jumpdest`` cannot be used directly. +-------------------------+------+-----------------------------------------------------------------+ | dup1 ... dup16 | | copy ith stack slot to the top (counting from top) | +-------------------------+------+-----------------------------------------------------------------+ -| swap1 ... swap1 | `*` | swap topmost and ith stack slot below it | +| swap1 ... swap16 | `*` | swap topmost and ith stack slot below it | +-------------------------+------+-----------------------------------------------------------------+ | mload(p) | | mem[p..(p+32)) | +-------------------------+------+-----------------------------------------------------------------+ @@ -661,7 +661,7 @@ variables. Take care that when you assign to variables that point to memory or storage, you will only change the pointer and not the data. There are two kinds of assignments: Functional-style and instruction-style. -For functionaly-style assignments (``variable := value``), you need to provide a value in a +For functional-style assignments (``variable := value``), you need to provide a value in a functional-style expression that results in exactly one stack value and for instruction-style (``=: variable``), the value is just taken from the stack top. For both ways, the colon points to the name of the variable. diff --git a/docs/miscellaneous.rst b/docs/miscellaneous.rst index 85fc286c..825be2ce 100644 --- a/docs/miscellaneous.rst +++ b/docs/miscellaneous.rst @@ -192,7 +192,7 @@ Function Visibility Specifiers - ``public``: visible externally and internally (creates accessor function for storage/state variables) - ``private``: only visible in the current contract -- ``external``: only visible externally (only for functions) - i.e. can only be message-called (via ``this.fun``) +- ``external``: only visible externally (only for functions) - i.e. can only be message-called (via ``this.func``) - ``internal``: only visible internally |