aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-30 22:58:17 +0800
committerobscuren <geffobscura@gmail.com>2014-05-30 22:58:17 +0800
commit5f28013f7937cf2264ec646bdc04bc55f26bad77 (patch)
tree9f34f820c3667cd586d8f09ef7954bb10eb2c3d5 /README.md
parentf0f205004cb4157b50692b056f64bf846ee8c2e0 (diff)
parent65c5a20e1c04c996f96f81cd959ab986b8482b6a (diff)
downloadgo-tangerine-5f28013f7937cf2264ec646bdc04bc55f26bad77.tar
go-tangerine-5f28013f7937cf2264ec646bdc04bc55f26bad77.tar.gz
go-tangerine-5f28013f7937cf2264ec646bdc04bc55f26bad77.tar.bz2
go-tangerine-5f28013f7937cf2264ec646bdc04bc55f26bad77.tar.lz
go-tangerine-5f28013f7937cf2264ec646bdc04bc55f26bad77.tar.xz
go-tangerine-5f28013f7937cf2264ec646bdc04bc55f26bad77.tar.zst
go-tangerine-5f28013f7937cf2264ec646bdc04bc55f26bad77.zip
Merge branch 'develop'
Diffstat (limited to 'README.md')
-rw-r--r--README.md12
1 files changed, 7 insertions, 5 deletions
diff --git a/README.md b/README.md
index 085030ce2..c32b51037 100644
--- a/README.md
+++ b/README.md
@@ -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