doc: Improve Configuration file section

diff --git a/README.md b/README.md
index 1e16f59ebdebcc36f43522e34af6607118417896..514c3eeaee2135ca0feabd992386d1fb9d3fe1ad 100644 (file)
--- a/README.md
+++ b/README.md
@@ -654,14 +654,15 @@ The following variables are interpreted in the novaboot script:
 # CONFIGURATION FILE
 
 Novaboot can read its configuration from one or more files. By
-default, novaboot looks for files named `.novaboot` as described in
-["Configuration reading phase"](#configuration-reading-phase). Alternatively, configuration file
-location can be specified with the **-c** switch or with the
-NOVABOOT\_CONFIG environment variable. The configuration file has Perl
-syntax and should set values of certain Perl variables. The current
-configuration can be dumped with the **--dump-config** switch. Some
-configuration variables can be overridden by environment variables
-(see below) or by command line switches.
+default, novaboot looks for files in `/etc/novaboot.d` and files
+named `.novaboot` as described in ["Configuration reading phase"](#configuration-reading-phase).
+Alternatively, configuration file location can be specified with the
+**-c** switch or with the NOVABOOT\_CONFIG environment variable. The
+configuration file has Perl syntax (i.e. it is better to put `1;` as
+a last line) and should set values of certain Perl variables. The
+current configuration can be dumped with the **--dump-config** switch.
+Some configuration variables can be overridden by environment
+variables (see below) or by command line switches.
 
 Supported configuration variables include:
 

diff --git a/novaboot b/novaboot
index 5c9944d65c800bcdcda01808f7c6f4862d6f811c..7606fd8cedf15bda5859bb6a77e39948619e1ec8 100755 (executable)
--- a/novaboot
+++ b/novaboot
@@ -1829,14 +1829,15 @@ intermediate output.
 =head1 CONFIGURATION FILE
 
 Novaboot can read its configuration from one or more files. By
-default, novaboot looks for files named F<.novaboot> as described in
-L</Configuration reading phase>. Alternatively, configuration file
-location can be specified with the B<-c> switch or with the
-NOVABOOT_CONFIG environment variable. The configuration file has Perl
-syntax and should set values of certain Perl variables. The current
-configuration can be dumped with the B<--dump-config> switch. Some
-configuration variables can be overridden by environment variables
-(see below) or by command line switches.
+default, novaboot looks for files in F</etc/novaboot.d> and files
+named F<.novaboot> as described in L</Configuration reading phase>.
+Alternatively, configuration file location can be specified with the
+B<-c> switch or with the NOVABOOT_CONFIG environment variable. The
+configuration file has Perl syntax (i.e. it is better to put C<1;> as
+a last line) and should set values of certain Perl variables. The
+current configuration can be dumped with the B<--dump-config> switch.
+Some configuration variables can be overridden by environment
+variables (see below) or by command line switches.
 
 Supported configuration variables include: