Skip to content

Commit 08c6339

Browse files
committed
Merge pull request #4510
6b407e4 -datadir is now allowed in config files (Zak Wilcox)
2 parents df2e692 + 6b407e4 commit 08c6339

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

contrib/debian/manpages/bitcoin.conf.5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.SH NAME
33
bitcoin.conf \- bitcoin configuration file
44
.SH SYNOPSIS
5-
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.
5+
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.
66
.TP
77
The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character.
88
.TP

0 commit comments

Comments
 (0)