Merge pull request #523 from ethcore/typo

Typo
This commit is contained in:
Marek Kotewicz 2016-02-27 10:32:41 +01:00
commit db9774fb62
3 changed files with 13 additions and 39 deletions

View File

@ -15,54 +15,28 @@
### Building from source ### Building from source
##### Ubuntu 14.04, 15.04, 15.10 First (if you don't already have it) get multirust:
- Linux:
```bash ```bash
# install multirust
curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes
# download and build parity
git clone https://github.com/ethcore/parity
cd parity
# parity should be build with rust beta
multirust override beta
# build in release
cargo build --release
```
##### Other Linux
```bash
# install rust beta
curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sudo sh -s -- --yes curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sudo sh -s -- --yes
# download and build parity
git clone https://github.com/ethcore/parity
cd parity
# parity should be build with rust beta
multirust override beta
# build in release
cargo build --release
``` ```
##### OSX with Homebrew - OSX with Homebrew:
```bash
brew update && brew install multirust
```
Then, download and build Parity:
```bash ```bash
# install multirust # download Parity code
brew update
brew install multirust
# download and build parity
git clone https://github.com/ethcore/parity git clone https://github.com/ethcore/parity
cd parity cd parity
# use rust beta for building parity # parity should be built with rust beta
multirust override beta multirust override beta
# build in release mode
cargo build --release cargo build --release
``` ```

@ -1 +1 @@
Subproject commit 3116f85a499ceaf4dfdc46726060fc056e2d7829 Subproject commit f32954b3ddb5af2dc3dc9ec6d9a28bee848fdf70

View File

@ -71,7 +71,7 @@ Options:
--listen-address URL Specify the IP/port on which to listen for peers [default: 0.0.0.0:30304]. --listen-address URL Specify the IP/port on which to listen for peers [default: 0.0.0.0:30304].
--public-address URL Specify the IP/port on which peers may connect. --public-address URL Specify the IP/port on which peers may connect.
--address URL Equivalent to --listen-address URL --public-address URL. --address URL Equivalent to --listen-address URL --public-address URL.
--peers NUM Try to manintain that many peers [default: 25]. --peers NUM Try to maintain that many peers [default: 25].
--no-discovery Disable new peer discovery. --no-discovery Disable new peer discovery.
--no-upnp Disable trying to figure out the correct public adderss over UPnP. --no-upnp Disable trying to figure out the correct public adderss over UPnP.
--node-key KEY Specify node secret key, either as 64-character hex string or input to SHA3 operation. --node-key KEY Specify node secret key, either as 64-character hex string or input to SHA3 operation.