aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2016-10-12 16:25:17 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2016-10-19 21:02:50 +0800
commit76c856397a58c42d88761fee95e89472494759d5 (patch)
tree2412fa136b649688f6f60c556e88d3507e434334
parent4f191d1f6fbdf9b424c4292db0ec10f5040a0b09 (diff)
downloaddexon-solidity-76c856397a58c42d88761fee95e89472494759d5.tar
dexon-solidity-76c856397a58c42d88761fee95e89472494759d5.tar.gz
dexon-solidity-76c856397a58c42d88761fee95e89472494759d5.tar.bz2
dexon-solidity-76c856397a58c42d88761fee95e89472494759d5.tar.lz
dexon-solidity-76c856397a58c42d88761fee95e89472494759d5.tar.xz
dexon-solidity-76c856397a58c42d88761fee95e89472494759d5.tar.zst
dexon-solidity-76c856397a58c42d88761fee95e89472494759d5.zip
Minor documentation fixes
-rw-r--r--docs/control-structures.rst4
-rw-r--r--docs/installing-solidity.rst2
-rw-r--r--docs/miscellaneous.rst1
3 files changed, 4 insertions, 3 deletions
diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index c754de64..597829d3 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -7,7 +7,7 @@ Expressions and Control Structures
Control Structures
===================
-Most of the control structures from C/JavaScript are available in Solidity
+Most of the control structures from C or JavaScript are available in Solidity
except for ``switch`` and ``goto``. So
there is: ``if``, ``else``, ``while``, ``for``, ``break``, ``continue``, ``return``, ``? :``, with
the usual semantics known from C or JavaScript.
@@ -785,7 +785,7 @@ Conventions in Solidity
In contrast to EVM assembly, Solidity knows types which are narrower than 256 bits,
e.g. ``uint24``. In order to make them more efficient, most arithmetic operations just
-treat them as 256 bit numbers and the higher-order bits are only cleaned at the
+treat them as 256-bit numbers and the higher-order bits are only cleaned at the
point where it is necessary, i.e. just shortly before they are written to memory
or before comparisons are performed. This means that if you access such a variable
from within inline assembly, you might have to manually clean the higher order bits
diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index 97eada79..44ee34f4 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -9,7 +9,7 @@ Installing Solidity
Versioning
==========
-Solidity versions follow `semantic versioning <https://semver.org>` and in addition to
+Solidity versions follow `semantic versioning <https://semver.org>`_ and in addition to
releases, **nightly development builds** are also made available. The nightly builds
are not guaranteed to be working and despite best efforts they might contain undocumented
and/or broken changes. We recommend to use the latest release. Package installers below
diff --git a/docs/miscellaneous.rst b/docs/miscellaneous.rst
index 72e32617..0b3eed38 100644
--- a/docs/miscellaneous.rst
+++ b/docs/miscellaneous.rst
@@ -61,6 +61,7 @@ Layout in Memory
****************
Solidity reserves three 256-bit slots:
+
- 0 - 64: scratch space for hashing methods
- 64 - 96: currently allocated memory size (aka. free memory pointer)