Skip to content

Commit 643b25d

Browse files
author
MarcoFalke
committed
Merge #14583: docs: Textual improvements in build docs
36c8e68 Various textual improvements in build docs (Martin Erlandsson) Pull request description: While reading the build docs, I found some opportunities for textual improvements (Force of habit, I used to work as a technical writer...) * Added a few missing words, should be uncontroversial. * Changed/added some punctuation, for better flow and readability. * Fixed one Markdown issue, where two list item headings rendered without a line break. (See image) This one needs to be verified after a build, I don't have a proper build environment yet. <img width="403" alt="layout_issue" src="https://user-images.githubusercontent.com/453092/47555613-893b4d00-d90c-11e8-8a31-943846059ae7.png"> Tree-SHA512: 1e40a0414e2ce91d223933cca169d3cef25f9d2c606fd75476cef946095eee161f700f9dbf8afe60388ab8c400283d057537266d171ea63125257b7156838ecb
2 parents efaf2d8 + 36c8e68 commit 643b25d

File tree

5 files changed

+28
-30
lines changed

5 files changed

+28
-30
lines changed

doc/build-freebsd.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ git clone https://github.com/bitcoin/bitcoin
2929

3030
## Building Bitcoin Core
3131

32-
**Important**: Use `gmake` (the non-GNU `make` will exit with an error).
32+
**Important**: Use `gmake` (the non-GNU `make` will exit with an error):
3333

3434
```
3535
./autogen.sh

doc/build-openbsd.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ BerkeleyDB is only necessary for the wallet functionality. To skip this, pass
3636
It is recommended to use Berkeley DB 4.8. You cannot use the BerkeleyDB library
3737
from ports, for the same reason as boost above (g++/libstd++ incompatibility).
3838
If you have to build it yourself, you can use [the installation script included
39-
in contrib/](/contrib/install_db4.sh) like so
39+
in contrib/](/contrib/install_db4.sh) like so:
4040

4141
```shell
4242
./contrib/install_db4.sh `pwd` CC=cc CXX=c++
@@ -94,7 +94,7 @@ The standard ulimit restrictions in OpenBSD are very strict:
9494

9595
data(kbytes) 1572864
9696

97-
This, unfortunately, in some cases not enough to compile some `.cpp` files in the project,
97+
This is, unfortunately, in some cases not enough to compile some `.cpp` files in the project,
9898
(see issue [#6658](https://github.com/bitcoin/bitcoin/issues/6658)).
9999
If your user is in the `staff` group the limit can be raised with:
100100

doc/build-osx.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,28 @@ Dependencies
2020

2121
See [dependencies.md](dependencies.md) for a complete overview.
2222

23-
If you want to build the disk image with `make deploy` (.dmg / optional), you need RSVG
23+
If you want to build the disk image with `make deploy` (.dmg / optional), you need RSVG:
2424

2525
brew install librsvg
2626

2727
Berkeley DB
2828
-----------
2929
It is recommended to use Berkeley DB 4.8. If you have to build it yourself,
3030
you can use [the installation script included in contrib/](/contrib/install_db4.sh)
31-
like so
31+
like so:
3232

3333
```shell
3434
./contrib/install_db4.sh .
3535
```
3636

3737
from the root of the repository.
3838

39-
**Note**: You only need Berkeley DB if the wallet is enabled (see the section *Disable-Wallet mode* below).
39+
**Note**: You only need Berkeley DB if the wallet is enabled (see [*Disable-wallet mode*](/doc/build-osx.md#disable-wallet-mode)).
4040

4141
Build Bitcoin Core
4242
------------------------
4343

44-
1. Clone the Bitcoin Core source code and cd into `bitcoin`
44+
1. Clone the Bitcoin Core source code:
4545

4646
git clone https://github.com/bitcoin/bitcoin
4747
cd bitcoin
@@ -80,13 +80,13 @@ Running
8080

8181
Bitcoin Core is now available at `./src/bitcoind`
8282

83-
Before running, it's recommended that you create an RPC configuration file.
83+
Before running, it's recommended that you create an RPC configuration file:
8484

8585
echo -e "rpcuser=bitcoinrpc\nrpcpassword=$(xxd -l 16 -p /dev/urandom)" > "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"
8686

8787
chmod 600 "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"
8888

89-
The first time you run bitcoind, it will start downloading the blockchain. This process could take several hours.
89+
The first time you run bitcoind, it will start downloading the blockchain. This process could take many hours, or even days on slower than average systems.
9090

9191
You can monitor the download process by looking at the debug.log file:
9292

doc/build-unix.md

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Some notes on how to build Bitcoin Core in Unix.
66

77
Note
88
---------------------
9-
Always use absolute paths to configure and compile Bitcoin Core and the dependencies,
10-
for example, when specifying the path of the dependency:
9+
Always use absolute paths to configure and compile Bitcoin Core and the dependencies.
10+
For example, when specifying the path of the dependency:
1111

1212
../dist/configure --enable-cxx --disable-shared --with-pic --prefix=$BDB_PREFIX
1313

@@ -24,7 +24,7 @@ make
2424
make install # optional
2525
```
2626

27-
This will build bitcoin-qt as well if the dependencies are met.
27+
This will build bitcoin-qt as well, if the dependencies are met.
2828

2929
Dependencies
3030
---------------------
@@ -87,11 +87,12 @@ You can add the repository and install using the following commands:
8787
sudo apt-get install libdb4.8-dev libdb4.8++-dev
8888

8989
Ubuntu and Debian have their own libdb-dev and libdb++-dev packages, but these will install
90-
BerkeleyDB 5.1 or later, which break binary wallet compatibility with the distributed executables which
90+
BerkeleyDB 5.1 or later. This will break binary wallet compatibility with the distributed executables, which
9191
are based on BerkeleyDB 4.8. If you do not care about wallet compatibility,
9292
pass `--with-incompatible-bdb` to configure.
9393

94-
See the section "Disable-wallet mode" to build Bitcoin Core without wallet.
94+
To build Bitcoin Core without wallet, see [*Disable-wallet mode*](/doc/build-unix.md#disable-wallet-mode)
95+
9596

9697
Optional (see --with-miniupnpc and --enable-upnp-default):
9798

@@ -161,15 +162,15 @@ Berkeley DB
161162
-----------
162163
It is recommended to use Berkeley DB 4.8. If you have to build it yourself,
163164
you can use [the installation script included in contrib/](/contrib/install_db4.sh)
164-
like so
165+
like so:
165166

166167
```shell
167168
./contrib/install_db4.sh `pwd`
168169
```
169170

170171
from the root of the repository.
171172

172-
**Note**: You only need Berkeley DB if the wallet is enabled (see the section *Disable-Wallet mode* below).
173+
**Note**: You only need Berkeley DB if the wallet is enabled (see [*Disable-wallet mode*](/doc/build-unix.md#disable-wallet-mode)).
173174

174175
Boost
175176
-----
@@ -193,9 +194,7 @@ Hardening Flags:
193194

194195

195196
Hardening enables the following features:
196-
197-
* Position Independent Executable
198-
Build position independent code to take advantage of Address Space Layout Randomization
197+
* _Position Independent Executable_: Build position independent code to take advantage of Address Space Layout Randomization
199198
offered by some kernels. Attackers who can cause execution of code at an arbitrary memory
200199
location are thwarted if they don't know where anything useful is located.
201200
The stack and heap are randomly located by default, but this allows the code section to be
@@ -213,8 +212,7 @@ Hardening enables the following features:
213212
TYPE
214213
ET_DYN
215214

216-
* Non-executable Stack
217-
If the stack is executable then trivial stack-based buffer overflow exploits are possible if
215+
* _Non-executable Stack_: If the stack is executable then trivial stack-based buffer overflow exploits are possible if
218216
vulnerable buffers are found. By default, Bitcoin Core should be built with a non-executable stack,
219217
but if one of the libraries it uses asks for an executable stack or someone makes a mistake
220218
and uses a compiler extension which requires an executable stack, it will silently build an

doc/build-windows.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ Below are some notes on how to build Bitcoin Core for Windows.
55

66
The options known to work for building Bitcoin Core on Windows are:
77

8-
* On Linux using the [Mingw-w64](https://mingw-w64.org/doku.php) cross compiler tool chain. Ubuntu Bionic 18.04 is required
8+
* On Linux, using the [Mingw-w64](https://mingw-w64.org/doku.php) cross compiler tool chain. Ubuntu Bionic 18.04 is required
99
and is the platform used to build the Bitcoin Core Windows release binaries.
10-
* On Windows using [Windows
10+
* On Windows, using [Windows
1111
Subsystem for Linux (WSL)](https://msdn.microsoft.com/commandline/wsl/about) and the Mingw-w64 cross compiler tool chain.
1212

1313
Other options which may work, but which have not been extensively tested are (please contribute instructions):
1414

15-
* On Windows using a POSIX compatibility layer application such as [cygwin](http://www.cygwin.com/) or [msys2](http://www.msys2.org/).
16-
* On Windows using a native compiler tool chain such as [Visual Studio](https://www.visualstudio.com).
15+
* On Windows, using a POSIX compatibility layer application such as [cygwin](http://www.cygwin.com/) or [msys2](http://www.msys2.org/).
16+
* On Windows, using a native compiler tool chain such as [Visual Studio](https://www.visualstudio.com).
1717

1818
Installing Windows Subsystem for Linux
1919
---------------------------------------
@@ -69,7 +69,7 @@ See also: [dependencies.md](dependencies.md).
6969

7070
## Building for 64-bit Windows
7171

72-
The first step is to install the mingw-w64 cross-compilation tool chain.
72+
The first step is to install the mingw-w64 cross-compilation tool chain:
7373

7474
sudo apt install g++-mingw-w64-x86-64
7575

@@ -81,13 +81,13 @@ Once the toolchain is installed the build steps are common:
8181

8282
Note that for WSL the Bitcoin Core source path MUST be somewhere in the default mount file system, for
8383
example /usr/src/bitcoin, AND not under /mnt/d/. If this is not the case the dependency autoconf scripts will fail.
84-
This means you cannot use a directory that located directly on the host Windows file system to perform the build.
84+
This means you cannot use a directory that is located directly on the host Windows file system to perform the build.
8585

8686
Acquire the source in the usual way:
8787

8888
git clone https://github.com/bitcoin/bitcoin.git
8989

90-
Once the source code is ready the build steps are below.
90+
Once the source code is ready the build steps are below:
9191

9292
PATH=$(echo "$PATH" | sed -e 's/:\/mnt.*//g') # strip out problematic Windows %PATH% imported var
9393
cd depends
@@ -142,9 +142,9 @@ way. This will install to `c:\workspace\bitcoin`, for example:
142142
Footnotes
143143
---------
144144

145-
<a name="footnote1">1</a>: Starting from Ubuntu Xenial 16.04 both the 32 and 64 bit Mingw-w64 packages install two different
145+
<a name="footnote1">1</a>: Starting from Ubuntu Xenial 16.04, both the 32 and 64 bit Mingw-w64 packages install two different
146146
compiler options to allow a choice between either posix or win32 threads. The default option is win32 threads which is the more
147147
efficient since it will result in binary code that links directly with the Windows kernel32.lib. Unfortunately, the headers
148-
required to support win32 threads conflict with some of the classes in the C++11 standard library in particular std::mutex.
148+
required to support win32 threads conflict with some of the classes in the C++11 standard library, in particular std::mutex.
149149
It's not possible to build the Bitcoin Core code using the win32 version of the Mingw-w64 cross compilers (at least not without
150150
modifying headers in the Bitcoin Core source code).

0 commit comments

Comments
 (0)