diff options
| author | chriseth <chris@ethereum.org> | 2018-09-26 22:36:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-26 22:36:19 +0800 |
| commit | a86e1d187b929124c27365a8f2e185545c4157b1 (patch) | |
| tree | 3ec0af55892023ecba4f1935edf7d3fd6ef45cef | |
| parent | 410d94c49802ffd1a8cc834e30630308aed7283b (diff) | |
| parent | d51b55c847aa75b664d260b2bb54afdefb005f9f (diff) | |
| download | dexon-solidity-a86e1d187b929124c27365a8f2e185545c4157b1.tar.gz dexon-solidity-a86e1d187b929124c27365a8f2e185545c4157b1.tar.zst dexon-solidity-a86e1d187b929124c27365a8f2e185545c4157b1.zip | |
Merge pull request #4995 from ethereum/docs-2180-improve-introduction
Docs: Add content from old Solidity wiki
| -rw-r--r-- | docs/index.rst | 13 | ||||
| -rw-r--r-- | docs/introduction-to-smart-contracts.rst | 7 |
2 files changed, 12 insertions, 8 deletions
diff --git a/docs/index.rst b/docs/index.rst index 20fa1505..0449ff42 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -6,15 +6,18 @@ Solidity :alt: Solidity logo :align: center -Solidity is a contract-oriented, high-level language for implementing smart contracts. -It was influenced by C++, Python and JavaScript -and is designed to target the Ethereum Virtual Machine (EVM). +Solidity is an object-oriented, high-level language for implementing smart +contracts. Smart contracts are programs which govern the behaviour of accounts +within the Ethereum state. + +Solidity was influenced by C++, Python and JavaScript and is designed to target +the Ethereum Virtual Machine (EVM). Solidity is statically typed, supports inheritance, libraries and complex user-defined types among other features. -As you will see, it is possible to create contracts for voting, -crowdfunding, blind auctions, multi-signature wallets and more. +With Solidity you can create contracts for uses such as voting, crowdfunding, blind auctions, +and multi-signature wallets. .. note:: The best way to try out Solidity right now is using diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst index 2d4777e8..5e841417 100644 --- a/docs/introduction-to-smart-contracts.rst +++ b/docs/introduction-to-smart-contracts.rst @@ -8,8 +8,9 @@ Introduction to Smart Contracts A Simple Smart Contract *********************** -Let us begin with the most basic example. It is fine if you do not understand everything -right now, we will go into more detail later. +Let us begin with a basic example that sets the value of a variable and exposes +it for other contracts to access. It is fine if you do not understand +everything right now, we will go into more detail later. Storage ======= @@ -34,7 +35,7 @@ The first line simply tells that the source code is written for Solidity version 0.4.0 or anything newer that does not break functionality (up to, but not including, version 0.5.0). This is to ensure that the contract is not compilable with a new (breaking) compiler version, where it could behave differently. -So-called pragmas are common instrutions for compilers about how to treat the +So-called pragmas are common instructions for compilers about how to treat the source code (e.g. `pragma once <https://en.wikipedia.org/wiki/Pragma_once>`_). A contract in the sense of Solidity is a collection of code (its *functions*) and |