Merge remote-tracking branch 'upstream/v0.11.2.x' into v0.11.2.x

This commit is contained in:
snogcel 2015-03-19 07:17:24 -06:00
commit b5d75f9848
2 changed files with 2 additions and 2 deletions

View File

@ -97,7 +97,7 @@ Make note of the hash (which is your collaterla_output) and index.
### Enter your MasterNode details into your masternode.conf file
[From the darkcoin github repo](https://github.com/darkcoin/darkcoin/blob/master/doc/masternode_conf.md)
The new masternode.conf format consists of a space seperated text file. Each line consisting of an alias, IP address followed by port, masternode private key, collateral output transaction id and collateral output index, donation address and donation percentage (the latter two are optional and should be in format "address:percantage").
The new masternode.conf format consists of a space seperated text file. Each line consisting of an alias, IP address followed by port, masternode private key, collateral output transaction id and collateral output index, donation address and donation percentage (the latter two are optional and should be in format "address:percentage").
```
alias ipaddress:port masternode_private_key collateral_output collateral_output_index donationin_address:donation_percentage

View File

@ -6,7 +6,7 @@ The multi masternode config allows to control multiple masternodes from a single
* Mac OS: ~/Library/Application Support/Darkcoin/
* Unix/Linux: ~/.darkcoin/
The new masternode.conf format consists of a space seperated text file. Each line consisting of an alias, IP address followed by port, masternode private key, collateral output transaction id, collateral output index, donation address and donation percentage (the latter two are optional and should be in format "address:percantage").
The new masternode.conf format consists of a space seperated text file. Each line consisting of an alias, IP address followed by port, masternode private key, collateral output transaction id, collateral output index, donation address and donation percentage (the latter two are optional and should be in format "address:percentage").
Example:
```