aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorKarl-Johan Alm <karljohan-alm@garage.co.jp>2018-03-23 13:51:34 +0900
committerKarl-Johan Alm <karljohan-alm@garage.co.jp>2018-05-02 14:26:46 +0900
commit25b7ab9c02f691be6c1aa71a9cf51ac1a6ea9db4 (patch)
tree4ceacfccf30d32f42ea000786baa64af750f9fdb /doc
parent0f0badd5a3b71720ec81f7db8edf6e79e740c76a (diff)
downloadbitcoin-25b7ab9c02f691be6c1aa71a9cf51ac1a6ea9db4.tar.xz
doc: Add release notes for -includeconf
Diffstat (limited to 'doc')
-rw-r--r--doc/release-notes-pr10267.md13
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/release-notes-pr10267.md b/doc/release-notes-pr10267.md
new file mode 100644
index 0000000000..7e1967daf0
--- /dev/null
+++ b/doc/release-notes-pr10267.md
@@ -0,0 +1,13 @@
+Changed command-line options
+----------------------------
+
+- `-includeconf=<file>` can be used to include additional configuration files.
+ Only works inside the `bitcoin.conf` file, not inside included files or from
+ command-line. Multiple files may be included. Can be disabled from command-
+ line via `-noincludeconf`. Note that multi-argument commands like
+ `-includeconf` will override preceding `-noincludeconf`, i.e.
+
+ noincludeconf=1
+ includeconf=relative.conf
+
+ as bitcoin.conf will still include `relative.conf`.