aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2014-06-14 20:53:55 +0800
committerzelig <viktor.tron@gmail.com>2014-06-14 20:53:55 +0800
commit50fdfb127ac35120315628a286f0a507c4470a89 (patch)
tree0b7a995ce2c5b439dae03f1e264823f2404e794a /README.md
parent72df038d25c50a27adae8ea528dcedd3537267cf (diff)
parent1d300bbc108f9d404d2eb5cbc8990042c0129f04 (diff)
downloaddexon-50fdfb127ac35120315628a286f0a507c4470a89.tar
dexon-50fdfb127ac35120315628a286f0a507c4470a89.tar.gz
dexon-50fdfb127ac35120315628a286f0a507c4470a89.tar.bz2
dexon-50fdfb127ac35120315628a286f0a507c4470a89.tar.lz
dexon-50fdfb127ac35120315628a286f0a507c4470a89.tar.xz
dexon-50fdfb127ac35120315628a286f0a507c4470a89.tar.zst
dexon-50fdfb127ac35120315628a286f0a507c4470a89.zip
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Diffstat (limited to 'README.md')
-rw-r--r--README.md14
1 files changed, 8 insertions, 6 deletions
diff --git a/README.md b/README.md
index e5818ffca..104e4725c 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Ethereum
Ethereum Go Client © 2014 Jeffrey Wilcke.
-Current state: Proof of Concept 5.0 RC8.
+Current state: Proof of Concept 5.0 RC12.
For the development package please see the [eth-go package](https://github.com/ethereum/eth-go).
@@ -27,20 +27,22 @@ General command line options
```
Shared between ethereum and ethereal
--m Start mining blocks
--genaddr Generates a new address and private key (destructive action)
--p Port on which the server will accept incomming connections
+-id Set the custom identifier of the client (shows up on other clients)
+-port Port on which the server will accept incomming connections
-upnp Enable UPnP
--x Desired amount of peers
--r Start JSON RPC
+-maxpeer Desired amount of peers
+-rpc Start JSON RPC
+
-dir Data directory used to store configs and databases
-import Import a private key
+-genaddr Generates a new address and private key (destructive action)
-h This
Ethereum only
ethereum [options] [filename]
-js Start the JavaScript REPL
filename Load the given file and interpret as JavaScript
+-m Start mining blocks
Etheral only
-asset_path absolute path to GUI assets directory