[ntpsec commit] Avoid either making more HTML than we have to or complicating the build.
Eric S. Raymond
esr at ntpsec.org
Mon Oct 12 16:37:12 UTC 2015
Module: ntpsec
Branch: master
Commit: 75a2ce2a490dd987ac47f5819e28a5d492589682
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=75a2ce2a490dd987ac47f5819e28a5d492589682
Author: Eric S. Raymond <esr at thyrsus.com>
Date: Mon Oct 12 12:36:38 2015 -0400
Avoid either making more HTML than we have to or complicating the build.
All asciidoc inclusions move into doc/include. References get patched as needed.
---
docs/accopt.txt | 2 +-
docs/authopt.txt | 2 +-
docs/confopt.txt | 6 +++---
docs/{ => includes}/access-commands.txt | 0
docs/{ => includes}/assoc-auxcommands.txt | 0
docs/{ => includes}/assoc-commands.txt | 0
docs/{ => includes}/assoc-options.txt | 0
docs/{ => includes}/auth-commands.txt | 0
docs/{ => includes}/keygen-body.txt | 0
docs/{ => includes}/mon-commands.txt | 0
docs/{ => includes}/ntp-wait-body.txt | 0
docs/{ => includes}/ntpd-body.txt | 0
docs/{ => includes}/ntpq-body.txt | 0
docs/{ => includes}/ntptickadj-body.txt | 0
docs/{ => includes}/ntptime-body.txt | 0
docs/{ => includes}/ntptrace-body.txt | 0
docs/{ => includes}/sntp-body.txt | 0
docs/keygen.txt | 2 +-
docs/monopt.txt | 2 +-
docs/ntp-wait.txt | 2 +-
docs/ntpd.txt | 2 +-
docs/ntpq.txt | 2 +-
docs/ntptickadj.txt | 2 +-
docs/ntptime.txt | 2 +-
docs/ntptrace.txt | 2 +-
docs/sntp.txt | 2 +-
ntp-keygen/ntp-keygen-man.txt.in | 2 +-
ntpd/ntp.conf.txt | 12 ++++++------
ntpd/ntpd-man.txt.in | 2 +-
ntpq/ntpq-man.txt.in | 2 +-
scripts/ntp-wait/ntp-wait.txt.in | 2 +-
scripts/ntptrace/ntptrace-man.txt.in | 2 +-
sntp/{sntp.txt => sntp.txt.in} | 2 +-
util/ntptickadj-man.txt.in | 2 +-
util/ntptime-man.txt.in | 2 +-
35 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/docs/accopt.txt b/docs/accopt.txt
index 39ec50f..5a29c3d 100644
--- a/docs/accopt.txt
+++ b/docs/accopt.txt
@@ -21,7 +21,7 @@ include::includes/accopt.txt[]
Unless noted otherwise, further information about these ccommands is on
the link:accopt.html[Access Control Support] page.
-include::../docs/access-commands.txt[]
+include::includes/access-commands.txt[]
'''''
diff --git a/docs/authopt.txt b/docs/authopt.txt
index 25f4e5c..1ec044f 100644
--- a/docs/authopt.txt
+++ b/docs/authopt.txt
@@ -22,7 +22,7 @@ include::includes/authopt.txt[]
Unless noted otherwise, further information about these commands is on
the link:authentic.html[Authentication Support] page.
-include::auth-commands.txt[]
+include::includes/auth-commands.txt[]
'''''
diff --git a/docs/confopt.txt b/docs/confopt.txt
index fc90f3a..84f8d31 100644
--- a/docs/confopt.txt
+++ b/docs/confopt.txt
@@ -62,12 +62,12 @@ compatible pool of public NTP servers, which are probably what you
want to define associations with unless you specifically know
otherwise.
-include::assoc-commands.txt[]
+include::includes/assoc-commands.txt[]
[[option]]
== Server Command Options ==
-include::assoc-options.txt[]
+include::includes/assoc-options.txt[]
[[aux]]
== Auxiliary Commands ==
@@ -75,7 +75,7 @@ include::assoc-options.txt[]
Information on authentication for broadcast, manycast, and
manycat options can be found at link:authopt.html[Authentication Options].
-include::assoc-auxcommands.txt[]
+include::includes/assoc-auxcommands.txt[]
'''''
diff --git a/docs/access-commands.txt b/docs/includes/access-commands.txt
similarity index 100%
rename from docs/access-commands.txt
rename to docs/includes/access-commands.txt
diff --git a/docs/assoc-auxcommands.txt b/docs/includes/assoc-auxcommands.txt
similarity index 100%
rename from docs/assoc-auxcommands.txt
rename to docs/includes/assoc-auxcommands.txt
diff --git a/docs/assoc-commands.txt b/docs/includes/assoc-commands.txt
similarity index 100%
rename from docs/assoc-commands.txt
rename to docs/includes/assoc-commands.txt
diff --git a/docs/assoc-options.txt b/docs/includes/assoc-options.txt
similarity index 100%
rename from docs/assoc-options.txt
rename to docs/includes/assoc-options.txt
diff --git a/docs/auth-commands.txt b/docs/includes/auth-commands.txt
similarity index 100%
rename from docs/auth-commands.txt
rename to docs/includes/auth-commands.txt
diff --git a/docs/keygen-body.txt b/docs/includes/keygen-body.txt
similarity index 100%
rename from docs/keygen-body.txt
rename to docs/includes/keygen-body.txt
diff --git a/docs/mon-commands.txt b/docs/includes/mon-commands.txt
similarity index 100%
rename from docs/mon-commands.txt
rename to docs/includes/mon-commands.txt
diff --git a/docs/ntp-wait-body.txt b/docs/includes/ntp-wait-body.txt
similarity index 100%
rename from docs/ntp-wait-body.txt
rename to docs/includes/ntp-wait-body.txt
diff --git a/docs/ntpd-body.txt b/docs/includes/ntpd-body.txt
similarity index 100%
rename from docs/ntpd-body.txt
rename to docs/includes/ntpd-body.txt
diff --git a/docs/ntpq-body.txt b/docs/includes/ntpq-body.txt
similarity index 100%
rename from docs/ntpq-body.txt
rename to docs/includes/ntpq-body.txt
diff --git a/docs/ntptickadj-body.txt b/docs/includes/ntptickadj-body.txt
similarity index 100%
rename from docs/ntptickadj-body.txt
rename to docs/includes/ntptickadj-body.txt
diff --git a/docs/ntptime-body.txt b/docs/includes/ntptime-body.txt
similarity index 100%
rename from docs/ntptime-body.txt
rename to docs/includes/ntptime-body.txt
diff --git a/docs/ntptrace-body.txt b/docs/includes/ntptrace-body.txt
similarity index 100%
rename from docs/ntptrace-body.txt
rename to docs/includes/ntptrace-body.txt
diff --git a/docs/sntp-body.txt b/docs/includes/sntp-body.txt
similarity index 100%
rename from docs/sntp-body.txt
rename to docs/includes/sntp-body.txt
diff --git a/docs/keygen.txt b/docs/keygen.txt
index d948b23..fc67924 100644
--- a/docs/keygen.txt
+++ b/docs/keygen.txt
@@ -28,7 +28,7 @@ include::includes/manual.txt[]
'''''
-includes::keygen-body.txt
+include::includes/keygen-body.txt
// The end of "Cryptographic Data Files" runs into this following text.
diff --git a/docs/monopt.txt b/docs/monopt.txt
index 472f3bb..b998cb9 100644
--- a/docs/monopt.txt
+++ b/docs/monopt.txt
@@ -55,7 +55,7 @@ retrospective analysis.
Unless noted otherwise, further information about these commands is on
the link:decode.html[Event Messages and Status Codes] page.
-include::mon-commands.txt[]
+include::includes/mon-commands.txt[]
'''''
diff --git a/docs/ntp-wait.txt b/docs/ntp-wait.txt
index 4810637..4f9813f 100644
--- a/docs/ntp-wait.txt
+++ b/docs/ntp-wait.txt
@@ -1,6 +1,6 @@
= `{ntpwait}` - wait until {ntpd} is in synchronized state =
-include::ntp-wait-body.txt[]
+include::includes/ntp-wait-body.txt[]
'''''
diff --git a/docs/ntpd.txt b/docs/ntpd.txt
index 120a325..3320cd2 100644
--- a/docs/ntpd.txt
+++ b/docs/ntpd.txt
@@ -25,7 +25,7 @@ include::includes/command.txt[]
'''''
-include::ntpd-body.txt[]
+include::includes/ntpd-body.txt[]
'''''
diff --git a/docs/ntpq.txt b/docs/ntpq.txt
index fd7882f..ba4279c 100644
--- a/docs/ntpq.txt
+++ b/docs/ntpq.txt
@@ -15,7 +15,7 @@ include::includes/manual.txt[]
'''''
-includes::ntpq-body.txt[]
+include::includes/ntpq-body.txt[]
'''''
diff --git a/docs/ntptickadj.txt b/docs/ntptickadj.txt
index 5edd13f..3ddc1f9 100644
--- a/docs/ntptickadj.txt
+++ b/docs/ntptickadj.txt
@@ -1,6 +1,6 @@
= `ntptickadj` - set time-related kernel variables =
-include::ntptickadj-body.txt
+include::includes/ntptickadj-body.txt
'''''
diff --git a/docs/ntptime.txt b/docs/ntptime.txt
index 88afe0f..b7b5eef 100644
--- a/docs/ntptime.txt
+++ b/docs/ntptime.txt
@@ -11,7 +11,7 @@ The turtle has been swimming in the kernel.
'''''
-include::ntptime-body.txt
+include::includes/ntptime-body.txt
'''''
diff --git a/docs/ntptrace.txt b/docs/ntptrace.txt
index 2d3b1d6..ad0c68c 100644
--- a/docs/ntptrace.txt
+++ b/docs/ntptrace.txt
@@ -11,7 +11,7 @@ The rabbit knows the way back.
'''''
-include::ntptrace-body.txt
+include::includes/ntptrace-body.txt
== Bugs ==
diff --git a/docs/sntp.txt b/docs/sntp.txt
index 810d858..8dfbb49 100644
--- a/docs/sntp.txt
+++ b/docs/sntp.txt
@@ -11,7 +11,7 @@ S is for snakeoil.
'''''
-include::sntp-body.txt[]
+include::includes/sntp-body.txt[]
'''''
diff --git a/ntp-keygen/ntp-keygen-man.txt.in b/ntp-keygen/ntp-keygen-man.txt.in
index b93016a..6e8f618 100644
--- a/ntp-keygen/ntp-keygen-man.txt.in
+++ b/ntp-keygen/ntp-keygen-man.txt.in
@@ -4,7 +4,7 @@
== NAME ==
{ntpkeygen} - create and manage NTP host keys
- at ../docs/keygen-body.txt@
+ at ../docs/includes/keygen-body.txt@
== EXIT STATUS ==
diff --git a/ntpd/ntp.conf.txt b/ntpd/ntp.conf.txt
index 370acbc..374ac36 100644
--- a/ntpd/ntp.conf.txt
+++ b/ntpd/ntp.conf.txt
@@ -82,19 +82,19 @@ namespace, while a `-6` or `--ipv6' qualifier forces DNS resolution to
the IPv6 namespace. See IPv6 references for the equivalent classes for
that address family.
-include::../docs/assoc-commands.txt[]
+include::../docs/includes/assoc-commands.txt[]
=== Association Options ===
-include::../docs/assoc-options.txt[]
+include::../docs/includes/assoc-options.txt[]
=== Association Auxiliary Commands ===
-include::../docs/assoc-auxcommands.txt[]
+include::../docs/includes/assoc-auxcommands.txt[]
== Authentication Commands ==
-include::../docs/auth-commands.txt[]
+include::../docs/includes/auth-commands.txt[]
== Monitoring Support ==
@@ -109,7 +109,7 @@ analysis.
=== Monitoring Commands ===
-include::../docs/mon-commands.txt[]
+include::../docs/includes/mon-commands.txt[]
== Access Control Support ==
@@ -172,7 +172,7 @@ server operator cooperates.
== Access Control Commands ==
-include::../docs/access-commands.txt[]
+include::../docs/includes/access-commands.txt[]
== Automatic NTP Configuration Options ==
diff --git a/ntpd/ntpd-man.txt.in b/ntpd/ntpd-man.txt.in
index 6329cb1..687268d 100644
--- a/ntpd/ntpd-man.txt.in
+++ b/ntpd/ntpd-man.txt.in
@@ -4,7 +4,7 @@
== NAME ==
ntpd - Network Time Protocol service daemon
- at ../doc/ntpd-body.txt@
+ at ../docs/includes/ntpd-body.txt@
== EXIT STATUS ==
diff --git a/ntpq/ntpq-man.txt.in b/ntpq/ntpq-man.txt.in
index 08c25db..2ca1387 100644
--- a/ntpq/ntpq-man.txt.in
+++ b/ntpq/ntpq-man.txt.in
@@ -4,7 +4,7 @@
== NAME ==
{ntpq} - standard NTP query program
- at ../docs/ntpq-body.txt@
+ at ../docs/includes/ntpq-body.txt@
== EXIT STATUS ==
diff --git a/scripts/ntp-wait/ntp-wait.txt.in b/scripts/ntp-wait/ntp-wait.txt.in
index a8453a1..873b59e 100644
--- a/scripts/ntp-wait/ntp-wait.txt.in
+++ b/scripts/ntp-wait/ntp-wait.txt.in
@@ -4,7 +4,7 @@
== NAME ==
{ntpwait} - Wait for {ntpd} to stabilize the system clock
- at ../../docs/ntp-wait-body.txt@
+ at ../../docs/includes/ntp-wait-body.txt@
== EXIT STATUS ==
diff --git a/scripts/ntptrace/ntptrace-man.txt.in b/scripts/ntptrace/ntptrace-man.txt.in
index 22fe577..12310c0 100644
--- a/scripts/ntptrace/ntptrace-man.txt.in
+++ b/scripts/ntptrace/ntptrace-man.txt.in
@@ -4,7 +4,7 @@
== NAME ==
ntptrace - trace peers of an NTP server
- at ../../docs/ntptrace-body.txt@
+ at ../../docs/includes/ntptrace-body.txt@
== EXIT STATUS ==
diff --git a/sntp/sntp.txt b/sntp/sntp.txt.in
similarity index 90%
rename from sntp/sntp.txt
rename to sntp/sntp.txt.in
index 3710630..ec388e9 100644
--- a/sntp/sntp.txt
+++ b/sntp/sntp.txt.in
@@ -4,7 +4,7 @@
== NAME ==
{sntp} - standard Simple Network Time Protocol client program
- at ../docs/sntp-body.txt@
+ at ../docs/includes/sntp-body.txt@
== EXIT STATUS ==
diff --git a/util/ntptickadj-man.txt.in b/util/ntptickadj-man.txt.in
index 4d78ab6..905a1fa 100644
--- a/util/ntptickadj-man.txt.in
+++ b/util/ntptickadj-man.txt.in
@@ -4,7 +4,7 @@
== NAME ==
{ntptickadj} - read and set kernel ticlk and tickadj variables
- at ../docs/ntptickadj-body.txt@
+ at ../docs/includes/ntptickadj-body.txt@
== EXIT STATUS ==
diff --git a/util/ntptime-man.txt.in b/util/ntptime-man.txt.in
index 64ae1c2..606ab02 100644
--- a/util/ntptime-man.txt.in
+++ b/util/ntptime-man.txt.in
@@ -4,7 +4,7 @@
== NAME ==
{ntptime} - read and set kernel time variables
- at ../docs/ntptime-body.txt@
+ at ../docs/includes/ntptime-body.txt@
== EXIT STATUS ==
More information about the vc
mailing list