Merged changes to EVM compilers

ethereum · Feb 10, 2016 · 4d4af57 · 4d4af57
2 parents 11c7685 + daa6394
commit 4d4af57
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/source/ethereum-ecosystem/evm-compilers.rst b/source/ethereum-ecosystem/evm-compilers.rst
@@ -1,3 +1,11 @@
 ********************************************************************************
 EVM Compilers
-********************************************************************************
+********************************************************************************
+
+Contracts live on the blockchain in an Ethereum-specific binary format (Ethereum Virtual Machine (=EVM) bytecode). However, contracts are typically written in some high level language such as solidity and then compiled into byte code to be uploaded on the blockchain.
+
+Below are the different compilers supported in Ethereum which allow you to compile your Smart Contract into a EVM specific bytecode:
+
+**Serpent** - Serpent is a language similar to Python which can be used to develop Contracts in a high level language and compile to EVM bytecode. More details can be found here: https://github.com/ethereum/wiki/wiki/Serpent
+
+**Solidity** - Solidity is a language similar to JavaScript which allows you to develop Contracts and compile to EVM bytecode. More details can be found here: http://solidity.readthedocs.org/en/latest/
diff --git a/source/using-ethereum-the-basics/ether.rst b/source/using-ethereum-the-basics/ether.rst
@@ -8,10 +8,24 @@ What is Ether?
 Denominations
 ================================================================================
 
+There are different denominations used in Ether and each denomination has its own unique name and value. Below is a list of different denomination names and how they are related to Ether.
+
+1 ether = 10^18 wei
+1 ether = 10^15 Kwei
+1 ether = 10^12 Mwei
+1 ether = 10^9 Gwei
+1 ether = 10^6 szabo
+1 ether = 10^3 finney
+1 ether = 1 ether
+1 ether = 1/(10^3) kether
+1 ether = 1/(10^6) Mether
+1 ether = 1/(10^9) Gether
+1 ether = 1/(10^12) Tether
+
 Getting Ether
 ================================================================================
 
 [Will point to mining and exchanges pages with explanation of both]
 
 Sending Ether
-================================================================================
+================================================================================