Restructure includes for ARM chapters 1 (Intro) and 2 (Requirements)

We have had perpetual problem with Sphinx implicitly double-including
files. To avoid that problem all files with name suffix .inc.rst are now
ignored by Sphinx, and writter can conveniently include them without
modifying conf.py for each and every file.

doc/arm/Makefile.am

@@ -2,29 +2,32 @@ include $(top_srcdir)/Makefile.top
 include $(top_srcdir)/Makefile.docs
 
 EXTRA_DIST =					\
-	conf.py					\
-	isc-logo.pdf				\
 	advanced.rst				\
-	build.rst				\
+	build.inc.rst				\
-	catz.rst				\
+	catz.inc.rst				\
+	chapter1.rst				\
+	chapter2.rst				\
 	configuration.rst			\
-	dlz.rst					\
+	conf.py					\
+	dlz.inc.rst				\
 	dnssec-guide.rst			\
-	dnssec.rst				\
+	dnssec.inc.rst				\
-	dyndb.rst				\
+	dyndb.inc.rst				\
 	general.rst				\
 	history.rst				\
 	index.rst				\
-	introduction.rst			\
+	introduction.inc.rst			\
-	logging-categories.rst			\
+	isc-logo.pdf				\
-	managed-keys.rst			\
+	logging-categories.inc.rst		\
+	managed-keys.inc.rst			\
 	manpages.rst				\
 	notes.rst				\
-	pkcs11.rst				\
+	pkcs11.inc.rst				\
-	platforms.rst				\
+	platforms.inc.rst			\
-	plugins.rst				\
+	plugins.inc.rst				\
 	reference.rst				\
-	requirements.rst			\
+	requirements.inc.rst			\
+	requirements.txt			\
 	security.rst				\
 	troubleshooting.rst			\
 	../dnssec-guide				\

doc/arm/advanced.rst

@@ -779,12 +779,12 @@ according to its parent, should have been secure.
    response; parent indicates it should be secure."
 
 
-.. include:: dnssec.rst
+.. include:: dnssec.inc.rst
-.. include:: managed-keys.rst
+.. include:: managed-keys.inc.rst
-.. include:: pkcs11.rst
+.. include:: pkcs11.inc.rst
-.. include:: dlz.rst
+.. include:: dlz.inc.rst
-.. include:: dyndb.rst
+.. include:: dyndb.inc.rst
-.. include:: catz.rst
+.. include:: catz.inc.rst
 
 .. _ipv6:
 

doc/arm/chapter1.rst

@@ -0,0 +1,12 @@
+.. Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+..
+.. SPDX-License-Identifier: MPL-2.0
+..
+.. This Source Code Form is subject to the terms of the Mozilla Public
+.. License, v. 2.0.  If a copy of the MPL was not distributed with this
+.. file, you can obtain one at https://mozilla.org/MPL/2.0/.
+..
+.. See the COPYRIGHT file distributed with this work for additional
+.. information regarding copyright ownership.
+
+.. include:: introduction.inc.rst

doc/arm/chapter2.rst

@@ -0,0 +1,14 @@
+.. Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+..
+.. SPDX-License-Identifier: MPL-2.0
+..
+.. This Source Code Form is subject to the terms of the Mozilla Public
+.. License, v. 2.0.  If a copy of the MPL was not distributed with this
+.. file, you can obtain one at https://mozilla.org/MPL/2.0/.
+..
+.. See the COPYRIGHT file distributed with this work for additional
+.. information regarding copyright ownership.
+
+.. include:: requirements.inc.rst
+.. include:: platforms.inc.rst
+.. include:: build.inc.rst

doc/arm/conf.py

@@ -142,18 +142,7 @@ exclude_patterns = [
     '_build',
     'Thumbs.db',
     '.DS_Store',
-    '*.grammar.rst',
+    '*.inc.rst'
-    '*.zoneopts.rst',
-    'build.rst',
-    'catz.rst',
-    'dlz.rst',
-    'dnssec.rst',
-    'dyndb.rst',
-    'logging-categories.rst',
-    'managed-keys.rst',
-    'pkcs11.rst',
-    'platforms.rst',
-    'plugins.rst'
     ]
 
 # The master toctree document.

doc/arm/configuration.rst

@@ -312,4 +312,4 @@ described in the following table. These signals can be sent using the
 | ``SIGINT``   | Causes the server to clean up and exit.                     |
 +--------------+-------------------------------------------------------------+
 
-.. include:: plugins.rst
+.. include:: plugins.inc.rst

doc/arm/index.rst

@@ -17,8 +17,8 @@ BIND 9 Administrator Reference Manual
    :numbered:
    :maxdepth: 2
 
-   introduction
+   chapter1
-   requirements
+   chapter2
    configuration
    reference
    advanced

doc/arm/reference.rst

@@ -760,7 +760,7 @@ The following are the available categories and brief descriptions of the
 types of log information they contain. More categories may be added in
 future BIND releases.
 
-.. include:: logging-categories.rst
+.. include:: logging-categories.inc.rst
 
 .. _query_errors:
 

doc/arm/requirements.inc.rst

@@ -70,5 +70,3 @@ much memory or CPU power as in the first alternative, but this has the
 disadvantage of making many more external queries, as none of the name
 servers share their cached data.
 
-.. include:: platforms.rst
-.. include:: build.rst

util/check-categories.sh

@@ -19,7 +19,7 @@ list1=$(
 	sort -u
 )
 list2=$(
-	sed -ne 's/^``\(.*\)``/\1/p' doc/arm/logging-categories.rst |
+	sed -ne 's/^``\(.*\)``/\1/p' doc/arm/logging-categories.inc.rst |
 	sort -u
 )
 status=0