[Git][NTPsec/ntpsec][master] Change variable substitutions to work better

[Richard Laager]

Richard Laager pushed to branch master at NTPsec / ntpsec


Commits:
5ce23c09 by James Browning at 2019-12-09T20:11:31Z
Change variable substitutions to work better


- - - - -


4 changed files:

- docs/asciidoc.include
- docs/build.adoc
- docs/includes/ntpd-body.adoc
- docs/includes/ntpleapfetch-body.adoc


Changes:

=====================================
docs/asciidoc.include
=====================================
@@ -9,6 +9,7 @@
 :millshome: https://www.eecis.udel.edu/~mills/
 :GPSD: https://gpsd.io/
 :ntpconf: ntp.conf
+:ntpconfpath: /etc/ntp.conf
 // Annoyingly, these have to be *manually* synchronized with the headers
 // on their manual pages - asciidoc doesn't expand attributes in header lines.
 :ntpdconfman: ntp.conf(5)


=====================================
docs/build.adoc
=====================================
@@ -72,7 +72,7 @@ the executables by default in +/usr/local/bin+.
 == Configuration
 
 You are now ready to configure the daemon. You will need to create an NTP
-configuration file by default in `/etc/{ntpconf}`. Newbies should see the
+configuration file by default in +{ntpconfpath}+. Newbies should see the
 link:quick.html[Quick Start] page for orientation. Seasoned veterans can
 start with the link:ntpd.html[+ntpd+ - Network Time Protocol (NTP)
 daemon] page and move on to the specific configuration option pages from


=====================================
docs/includes/ntpd-body.adoc
=====================================
@@ -75,7 +75,7 @@ the IPv6 namespace.
 +-c+ _string_, +--configfile+=_string_::
   configuration file name.
 +
-The name and path of the configuration file, `/etc/{ntpconf}` by
+The name and path of the configuration file, +{ntpconfpath}+ by
 default.
 
 +-d+, +--debug-level+::
@@ -91,7 +91,7 @@ default.
 +
 The name and path of the frequency file, e.g. +/etc/ntp.drift+.
 This is the same operation as the _driftfile_
-configuration specification in the `/etc/{ntpconf}` file.
+configuration specification in the +{ntpconfpath}+ file.
 
 +-g+, +--panicgate+::
   Allow the first adjustment to be big. This option may appear an
@@ -503,7 +503,7 @@ as described in {ntpdconfman}.
 [options="header"]
 |===================================================================
 |File                    |Default           |Option      |Option
-|configuration file      |`/etc/{ntpconf}`  |+-c+        |+conffile+
+|configuration file      |+{ntpconfpath}+      |+-c+        |+conffile+
 |configuration directory |+/etc/ntp.d+      |+-c+        |+conffile+
 |frequency file          |none              |+-f+        |+driftfile+
 |leapseconds file        |none              |            |+leapfile+
@@ -516,7 +516,7 @@ as described in {ntpdconfman}.
 
 Configuration files are parsed according to the following rules:
 
-. The plain config file (normally `/etc/{ntpconf}` but the path can be
+. The plain config file (normally +{ntpconfpath}+ but the path can be
   overridden by the -c option) is read first if it exists.
 
 . Then the configuration directory, if it exists, is scanned. Normally


=====================================
docs/includes/ntpleapfetch-body.adoc
=====================================
@@ -58,7 +58,7 @@ frequent refreshes.
 +-f+ 'config'::
   Location of the {ntpconf} file.
 +
-Specify location of {ntpconf}, which defaults to /etc/{ntpconf}.  It is read
+Specify location of {ntpconf}, which defaults to +{ntpconfpath}+.  It is read
 to make sure the "leapfile" directive is present and to determine the default
 path to the leapfile.
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/5ce23c098bcd4b1b47565f6e1d59d07e419f832b

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/5ce23c098bcd4b1b47565f6e1d59d07e419f832b
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20191209/db8bd106/attachment-0001.htm>