diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-09-30 23:01:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-30 23:01:56 +0800 |
| commit | 8ef47cb61a89c42ae7348a90d3eb3ee1765808d7 (patch) | |
| tree | 4f2e6ba5b6e94741bf18793605c99f234a7af056 | |
| parent | c4b5101b9d8337069c495b95b04a420e2665aa2d (diff) | |
| parent | fb7380a92d838123c5653900a4e3127d62da0241 (diff) | |
| download | dexon-solidity-8ef47cb61a89c42ae7348a90d3eb3ee1765808d7.tar dexon-solidity-8ef47cb61a89c42ae7348a90d3eb3ee1765808d7.tar.gz dexon-solidity-8ef47cb61a89c42ae7348a90d3eb3ee1765808d7.tar.bz2 dexon-solidity-8ef47cb61a89c42ae7348a90d3eb3ee1765808d7.tar.lz dexon-solidity-8ef47cb61a89c42ae7348a90d3eb3ee1765808d7.tar.xz dexon-solidity-8ef47cb61a89c42ae7348a90d3eb3ee1765808d7.tar.zst dexon-solidity-8ef47cb61a89c42ae7348a90d3eb3ee1765808d7.zip | |
Merge pull request #5123 from ethereum/docs-contracts-fixes
Fix issues introduced from PR #5043
| -rw-r--r-- | docs/contracts.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/contracts.rst b/docs/contracts.rst index 315d1815..93f54e4a 100644 --- a/docs/contracts.rst +++ b/docs/contracts.rst @@ -1131,7 +1131,7 @@ Multiple Inheritance and Linearization Languages that allow multiple inheritance have to deal with several problems. One is the `Diamond Problem <https://en.wikipedia.org/wiki/Multiple_inheritance#The_diamond_problem>`_. Solidity is similar to Python in that it uses "`C3 Linearization <https://en.wikipedia.org/wiki/C3_linearization>`_" -to force a specific order in the directed acyclic graph of base classes. This +to force a specific order in the directed acyclic graph (DAG) of base classes. This results in the desirable property of monotonicity but disallows some inheritance graphs. Especially, the order in which the base classes are given in the ``is`` directive is @@ -1295,7 +1295,7 @@ contract, and a regular ``JUMP`` call will be used instead of a ``DELEGATECALL`` .. index:: using for, set -The following example illustrates how to use libraries (butmanual method +The following example illustrates how to use libraries (but manual method be sure to check out :ref:`using for <using-for>` for a more advanced example to implement a set). |