Merge pull request #4510

6b407e4 -datadir is now allowed in config files (Zak Wilcox)
This commit is contained in:
Wladimir J. van der Laan 2014-07-14 08:20:04 +02:00
commit 08c6339124
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -2,7 +2,7 @@
.SH NAME .SH NAME
bitcoin.conf \- bitcoin configuration file bitcoin.conf \- bitcoin configuration file
.SH SYNOPSIS .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 .TP
The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character. The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character.
.TP .TP