diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-14 08:20:04 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-14 08:20:10 +0200 |
| commit | 08c63391247756c4f98607c01682a2b161d0c7fe (patch) | |
| tree | f928a8d7de37d83dd9a593a4f80e056386259268 | |
| parent | df2e6928faa724b669616d7539eabf2c13901a12 (diff) | |
| parent | 6b407e4e56dc82a8591c668401add49b6d128c87 (diff) | |
Merge pull request #4510
6b407e4 -datadir is now allowed in config files (Zak Wilcox)
| -rw-r--r-- | contrib/debian/manpages/bitcoin.conf.5 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/debian/manpages/bitcoin.conf.5 b/contrib/debian/manpages/bitcoin.conf.5 index 7438b4b66a..8a0078d5d5 100644 --- a/contrib/debian/manpages/bitcoin.conf.5 +++ b/contrib/debian/manpages/bitcoin.conf.5 @@ -2,7 +2,7 @@ .SH NAME bitcoin.conf \- bitcoin configuration file .SH SYNOPSIS -All command-line options (except for '\-datadir' and '\-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file. +All command-line options (except for '\-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file. .TP The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character. .TP |