diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-10-04 20:58:00 -0300 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-10-04 20:58:02 -0300 |
| commit | f504a1402afd0760e9d348ecc8bad0094aa7d705 (patch) | |
| tree | fcd42b69ae1935bb390294ed33ecdd19e8a95cee /doc | |
| parent | 4ad560dba9b3362b6639e1a1c7898ea9ca946af5 (diff) | |
| parent | 4a9f064ea10e58220dce114e0fafa90ff8f1fcdf (diff) | |
Merge #14395: Fix typos and cleanup
4a9f064ea1 Fix typos (Dimitris Apostolou)
Pull request description:
Tree-SHA512: 011133fb524c3c3cfd272aad0fe9103192b1cc00ac8b14d5b224368fffdb3893e8a19fe281e59ea1aba81bd5e5ab4b7b2de5c3f269e4a7aee66959727cd82cec
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/build-windows.md | 2 | ||||
| -rw-r--r-- | doc/developer-notes.md | 4 | ||||
| -rw-r--r-- | doc/init.md | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/build-windows.md b/doc/build-windows.md index 12adadacdc..8c4b79bebc 100644 --- a/doc/build-windows.md +++ b/doc/build-windows.md @@ -133,7 +133,7 @@ Installation ------------- After building using the Windows subsystem it can be useful to copy the compiled -executables to a directory on the windows drive in the same directory structure +executables to a directory on the Windows drive in the same directory structure as they appear in the release `.zip` archive. This can be done in the following way. This will install to `c:\workspace\bitcoin`, for example: diff --git a/doc/developer-notes.md b/doc/developer-notes.md index 1d103d481b..c86648c5b8 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -705,10 +705,10 @@ Current subtrees include: - Upstream at https://github.com/google/leveldb ; Maintained by Google, but open important PRs to Core to avoid delay. - **Note**: Follow the instructions in [Upgrading LevelDB](#upgrading-leveldb) when - merging upstream changes to the leveldb subtree. + merging upstream changes to the LevelDB subtree. - src/libsecp256k1 - - Upstream at https://github.com/bitcoin-core/secp256k1/ ; actively maintaned by Core contributors. + - Upstream at https://github.com/bitcoin-core/secp256k1/ ; actively maintained by Core contributors. - src/crypto/ctaes - Upstream at https://github.com/bitcoin-core/ctaes ; actively maintained by Core contributors. diff --git a/doc/init.md b/doc/init.md index 239b74e4e1..5778b09d05 100644 --- a/doc/init.md +++ b/doc/init.md @@ -22,7 +22,7 @@ Configuration At a bare minimum, bitcoind requires that the rpcpassword setting be set when running as a daemon. If the configuration file does not exist or this -setting is not set, bitcoind will shutdown promptly after startup. +setting is not set, bitcoind will shut down promptly after startup. This password does not have to be remembered or typed as it is mostly used as a fixed token that bitcoind and client programs read from the configuration |