Merge pull request #114 from neo-project/dev

master < dev

docs/n3/foundation/Cryptography/hash_algorithm.md

@@ -2,7 +2,7 @@
 
 Hash function, or hash algorithm, is a method creating digital finger print from any kind of data. Hash function compresses message or data into a digested version to shrink the data into a fixed data size. This function disorganizes and remixes data, rebuilding a data fingerprint as a hash value. Hash value is always represented by a short string consisting of random letters and digits.
 
-Two different hash functions are used widely in the Neo system: SHA256 and RIPEMD160. The former is used to generate a longer hash value (32 bytes) and the latter is used to generate a shorter hash value (20 bytes). Usually when a hash value of an object is generated, hash functions are used twice. For example, when a hash of a block or transaction is generated, SHA256 is calculated twice; when a contract address is generated, the SHA256 hash of the script is calculated, then the NSPEMD160 hash of the previous hash is calculated. 
+Two different hash functions are used widely in the Neo system: SHA256 and RIPEMD160. The former is used to generate a longer hash value (32 bytes) and the latter is used to generate a shorter hash value (20 bytes). Usually when a hash value of an object is generated, hash functions are used twice. For example, when a hash of a block or transaction is generated, SHA256 is calculated twice; when a contract address is generated, the SHA256 hash of the script is calculated, then the RIPEMD160 hash of the previous hash is calculated. 
 
 In addition, the block will also use a hash structure called a Merkle Tree. It computes the hash of each transaction and combines one with the next and then hashes again, repeating this process until there is only one root hash (Merkle Root). 
 

docs/n3/foundation/Native tokens.md

@@ -11,7 +11,9 @@ There are 2 kinds of native tokens defined in the Neo system: NEO and NeoGas (GA
 
 NEO is the Governing Token. Neo holders can participate in Neo network management, including voting for consensus nodes, network parameter modification, etc. The total amount of NEO is 100 million. Its minimum unit is 1 and can not be divided. It's registered in Genesis block, and stored in standby validators' muti-signature addresses.
 
-GAS is the fuel token for the realization of Neo network resource control, with a smallest unit of 0.00000001. Users can obtain GAS either through a claim or purchase. When using the Neo network, they need to pay a certain amount of GAS as network fees, such as transfer, registering assets, publishing assets, running DApps, etc.
+GAS is the fuel token for the realization of Neo network resource control, with a smallest unit of 0.00000001, also known as a Datoshi. Users can obtain GAS either through a claim or purchase. When using the Neo network, they need to pay a certain amount of GAS as network fees, such as transfer, registering assets, publishing assets, running DApps, etc.
+
+To further elaborate, the smallest unit of GAS is Datoshi, where 1 Datoshi = 1e-8 GAS. Larger units of GAS can also be expressed in Datoshi. For instance, 1 Kdatoshi (thousand Datoshi) = 1e-5 GAS and 1 Mdatoshi (million Datoshi) = 1e-2 GAS. In other words, 100,000,000 Datoshi = 100,000 Kdatoshi = 100 Mdatoshi = 1 GAS. This system of measurement allows for precise calculations and transactions on the Neo network.
 
 The Neo N3 Genesis block will mint the exact amount of GAS token needed to account for all GAS token circulating on the NEO Legacy chain at the time of Genesis block.
 

docs/n3/foundation/governance.md

@@ -48,7 +48,9 @@ NEO has a max supply of 100 million tokens and the smallest unit of 1, or in oth
 
 ### GAS
 
-GAS is the fuel token for the realization of Neo network resource control, with a smallest unit of 0.00000001. Users can obtain GAS either through a claim or purchase. When using the Neo network, they need to pay a certain amount of GAS as network fees, such as transfer, registering assets, publishing assets, running DApps, etc.
+GAS is the fuel token for the realization of Neo network resource control, with a smallest unit of 0.00000001, also known as a Datoshi. Users can obtain GAS either through a claim or purchase. When using the Neo network, they need to pay a certain amount of GAS as network fees, such as transfer, registering assets, publishing assets, running DApps, etc.
+
+To further elaborate, the smallest unit of GAS is Datoshi, where 1 Datoshi = 1e-8 GAS. Larger units of GAS can also be expressed in Datoshi. For instance, 1 Kdatoshi (thousand Datoshi) = 1e-5 GAS and 1 Mdatoshi (million Datoshi) = 1e-2 GAS. In other words, 100,000,000 Datoshi = 100,000 Kdatoshi = 100 Mdatoshi = 1 GAS. This system of measurement allows for precise calculations and transactions on the Neo network.
 
 Unlike the Neo Legacy, there is no supply limit for Neo N3 GAS, and the system fee for transactions will be burned off.
 

src/css/_tailwind.css

@@ -55,6 +55,9 @@
   ul, ol {
     margin-left: 20px; 
   }
+  ul li p, ol li p {
+   display: inline;
+  } 
 
 }