doc: move files cmdline_options.xx.adoc and man.xx.adoc into "includes" directory

7 files changed, 21 insertions, 22 deletions

diff --git a/doc/it/CMakeLists.txt b/doc/it/CMakeLists.txt
index 044f93675..93408c353 100644
--- a/doc/it/CMakeLists.txt
+++ b/doc/it/CMakeLists.txt
@@ -24,8 +24,8 @@ if(ENABLE_MAN)
     COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.it.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.it.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.it.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/man.it.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.it.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.it.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat.1 (it)"
   )
@@ -38,8 +38,8 @@ if(ENABLE_MAN)
     COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.it.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.it.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.it.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/man.it.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.it.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.it.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat-headless.1 (it)"
   )
@@ -59,7 +59,7 @@ if(ENABLE_DOC)
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
     ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.it.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.it.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.it.adoc
     ${AUTOGEN_USER}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_user.it.html"
diff --git a/doc/it/Makefile.am b/doc/it/Makefile.am
index 11a86b4b9..1ef8cda21 100644
--- a/doc/it/Makefile.am
+++ b/doc/it/Makefile.am
@@ -23,14 +23,13 @@ EXTRA_DIST = CMakeLists.txt \
              docinfo.html \
              weechat.1.it.adoc \
              weechat-headless.1.it.adoc \
-             cmdline_options.it.adoc \
-             man.it.adoc \
              weechat_user.it.adoc \
              weechat_plugin_api.it.adoc \
              weechat_scripting.it.adoc \
              weechat_faq.it.adoc \
              weechat_quickstart.it.adoc \
              weechat_tester.it.adoc \
+             $(wildcard includes/*.adoc) \
              $(wildcard autogen/user/*.adoc) \
              $(wildcard autogen/plugin_api/*.adoc)
 
@@ -53,13 +52,13 @@ endif
 all-local: $(man_targets) $(doc_targets)
 
 # man pages
-weechat.1: weechat.1.it.adoc cmdline_options.it.adoc man.it.adoc
+weechat.1: weechat.1.it.adoc includes/cmdline_options.it.adoc includes/man.it.adoc
 	$(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/it/weechat.1.it.adoc
-weechat-headless.1: weechat-headless.1.it.adoc cmdline_options.it.adoc man.it.adoc
+weechat-headless.1: weechat-headless.1.it.adoc includes/cmdline_options.it.adoc includes/man.it.adoc
 	$(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat-headless.1 $(abs_top_srcdir)/doc/it/weechat-headless.1.it.adoc
 
 # user's guide
-weechat_user.it.html: weechat_user.it.adoc cmdline_options.it.adoc $(wildcard autogen/user/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
+weechat_user.it.html: weechat_user.it.adoc includes/cmdline_options.it.adoc $(wildcard autogen/user/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
 	$(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -o weechat_user.it.html $(abs_top_srcdir)/doc/it/weechat_user.it.adoc
 
 # plugin API reference
diff --git a/doc/it/cmdline_options.it.adoc b/doc/it/includes/cmdline_options.it.adoc
index 7be2504b4..7be2504b4 100644
--- a/doc/it/cmdline_options.it.adoc
+++ b/doc/it/includes/cmdline_options.it.adoc
diff --git a/doc/it/man.it.adoc b/doc/it/includes/man.it.adoc
index 44f8f1929..44f8f1929 100644
--- a/doc/it/man.it.adoc
+++ b/doc/it/includes/man.it.adoc
diff --git a/doc/it/weechat-headless.1.it.adoc b/doc/it/weechat-headless.1.it.adoc
index 6d08d0564..559d30186 100644
--- a/doc/it/weechat-headless.1.it.adoc
+++ b/doc/it/weechat-headless.1.it.adoc
@@ -35,23 +35,23 @@ It can be used for tests or to daemonize WeeChat with the option "--daemon".
 
 == OPTIONS
 
-include::cmdline_options.it.adoc[tag=standard]
+include::includes/cmdline_options.it.adoc[tag=standard]
 
 // TRANSLATION MISSING
 == DEBUG OPTIONS
 
 *WARNING:* these options are for debug purposes only, *DO NOT USE IN PRODUCTION!*
 
-include::cmdline_options.it.adoc[tag=debug]
+include::includes/cmdline_options.it.adoc[tag=debug]
 
 == PLUGIN OPTIONS
 
-include::man.it.adoc[tag=plugin_options]
+include::includes/man.it.adoc[tag=plugin_options]
 
 // TRANSLATION MISSING
 == FILES
 
-include::man.it.adoc[tag=files]
+include::includes/man.it.adoc[tag=files]
 
 // TRANSLATION MISSING
 == SEE ALSO
@@ -67,7 +67,7 @@ This manpage was written by {author}.
 
 == COPYRIGHT
 
-include::man.it.adoc[tag=copyright]
+include::includes/man.it.adoc[tag=copyright]
 
 // TRANSLATION MISSING
 == SUPPORT / REPORTING BUGS
diff --git a/doc/it/weechat.1.it.adoc b/doc/it/weechat.1.it.adoc
index 391e0057c..b69124f9d 100644
--- a/doc/it/weechat.1.it.adoc
+++ b/doc/it/weechat.1.it.adoc
@@ -31,23 +31,23 @@ It is highly customizable and extensible with scripts.
 
 == OPTIONS
 
-include::cmdline_options.it.adoc[tag=standard]
+include::includes/cmdline_options.it.adoc[tag=standard]
 
 // TRANSLATION MISSING
 == DEBUG OPTIONS
 
 *WARNING:* these options are for debug purposes only, *DO NOT USE IN PRODUCTION!*
 
-include::cmdline_options.it.adoc[tag=debug]
+include::includes/cmdline_options.it.adoc[tag=debug]
 
 == PLUGIN OPTIONS
 
-include::man.it.adoc[tag=plugin_options]
+include::includes/man.it.adoc[tag=plugin_options]
 
 // TRANSLATION MISSING
 == FILES
 
-include::man.it.adoc[tag=files]
+include::includes/man.it.adoc[tag=files]
 
 // TRANSLATION MISSING
 == SEE ALSO
@@ -63,7 +63,7 @@ This manpage was written by {author}.
 
 == COPYRIGHT
 
-include::man.it.adoc[tag=copyright]
+include::includes/man.it.adoc[tag=copyright]
 
 // TRANSLATION MISSING
 == SUPPORT / REPORTING BUGS
diff --git a/doc/it/weechat_user.it.adoc b/doc/it/weechat_user.it.adoc
index 1601d1695..8712f094a 100644
--- a/doc/it/weechat_user.it.adoc
+++ b/doc/it/weechat_user.it.adoc
@@ -550,7 +550,7 @@ created in _~/.weechat_ with default options and values
 // TRANSLATION MISSING
 ==== Command line options
 
-include::cmdline_options.it.adoc[tag=standard]
+include::includes/cmdline_options.it.adoc[tag=standard]
 
 // TRANSLATION MISSING
 ==== Extra debug options
@@ -558,7 +558,7 @@ include::cmdline_options.it.adoc[tag=standard]
 [WARNING]
 These options are for debug purposes only, *DO NOT USE IN PRODUCTION!*
 
-include::cmdline_options.it.adoc[tag=debug]
+include::includes/cmdline_options.it.adoc[tag=debug]
 
 // TRANSLATION MISSING
 [[environment_variables]]