Rename 'manuals' to 'manual'

Makefile

@@ -4,7 +4,7 @@ WEBSITE_HTML_DIST_DIR=dist/html
 WEBSITE_ARCHIVE=cdist-www.tar.gz
 WEBSITE_REMOTE_HOST=staticweb.ungleich.ch
 WEBSITE_REMOTE_DIR=/home/services/www/nico/www.cdi.st/www/
-WEBSITE_MANUALS_DIR="$(WEBSITE_SRC_DIR)/extra/manuals"
+WEBSITE_MANUALS_DIR="$(WEBSITE_SRC_DIR)/extra/manual"
 
 CDIST_DIR=../cdist
 CDIST_DOCS_DIR="$(CDIST_DIR)/docs"
@@ -49,12 +49,12 @@ release-prepare:
 	@rsync -a "$(CDIST_DOCS_HTML_DIST_DIR)/" "$(WEBSITE_MANUALS_DIR)/$(CDIST_CHANGELOG_VERSION)/"
 
 release-prepare-latest: release-prepare
-	@grep '$(CDIST_CHANGELOG_VERSION)' "$(WEBSITE_MAN_PAGE)" || awk 'BEGIN { print_new = 0; } /All versions/ { print; print_new = 1; next; } print_new == 1 { print; print "* `$(CDIST_CHANGELOG_VERSION) <manuals/$(CDIST_CHANGELOG_VERSION)>`_"; print_new = 0; next; } { print; }' "$(WEBSITE_MAN_PAGE)" > "$(WEBSITE_MAN_PAGE)-new" && mv "$(WEBSITE_MAN_PAGE)-new" "$(WEBSITE_MAN_PAGE)" || exit 0
+	@grep '$(CDIST_CHANGELOG_VERSION)' "$(WEBSITE_MAN_PAGE)" || awk 'BEGIN { print_new = 0; } /All versions/ { print; print_new = 1; next; } print_new == 1 { print; print "* `$(CDIST_CHANGELOG_VERSION) <manual/$(CDIST_CHANGELOG_VERSION)>`_"; print_new = 0; next; } { print; }' "$(WEBSITE_MAN_PAGE)" > "$(WEBSITE_MAN_PAGE)-new" && mv "$(WEBSITE_MAN_PAGE)-new" "$(WEBSITE_MAN_PAGE)" || exit 0
 
 # Build website.
 build:
 	$(SPHINXH)
-	@cd "$(WEBSITE_HTML_DIST_DIR)/manuals" && rm -f latest && ln -s "$(CDIST_CHANGELOG_VERSION)" latest
+	@cd "$(WEBSITE_HTML_DIST_DIR)/manual" && rm -f latest && ln -s "$(CDIST_CHANGELOG_VERSION)" latest
 
 release: release-prepare-latest build
 
@@ -70,7 +70,7 @@ publish:
 # Publish static website.
 # Update latest symlink.
 release-publish: release publish
-	@ssh "$(WEBSITE_REMOTE_HOST)" "cd '$(WEBSITE_REMOTE_DIR)/manuals' && rm -f latest && ln -s '$(CDIST_CHANGELOG_VERSION)' latest"
+	@ssh "$(WEBSITE_REMOTE_HOST)" "cd '$(WEBSITE_REMOTE_DIR)/manual' && rm -f latest && ln -s '$(CDIST_CHANGELOG_VERSION)' latest"
  
 release-publish-no-latest: release-no-latest publish
 

src/cdist-manual.rst

@@ -1,111 +1,111 @@
 cdist manual
 ============
 
-* `Latest manual <manuals/latest>`_
+* `Latest manual <manual/latest>`_
 
 * Checking out **beta** branch, i.e. cdist **trigger** and **preos** functionality?
-  Find the manual `here <manuals/beta>`_.
+  Find the manual `here <manual/beta>`_.
 
 **All versions**
 
-* `5.0.0 <manuals/5.0.0>`_
+* `5.0.0 <manual/5.0.0>`_
-* `4.11.1 <manuals/4.11.1>`_
+* `4.11.1 <manual/4.11.1>`_
-* `4.11.0 <manuals/4.11.0>`_
+* `4.11.0 <manual/4.11.0>`_
-* `4.10.11 <manuals/4.10.11>`_
+* `4.10.11 <manual/4.10.11>`_
-* `4.10.10 <manuals/4.10.10>`_
+* `4.10.10 <manual/4.10.10>`_
-* `4.10.9 <manuals/4.10.9>`_
+* `4.10.9 <manual/4.10.9>`_
-* `4.10.8 <manuals/4.10.8>`_
+* `4.10.8 <manual/4.10.8>`_
-* `4.10.7 <manuals/4.10.7>`_
+* `4.10.7 <manual/4.10.7>`_
-* `4.10.6 <manuals/4.10.6>`_
+* `4.10.6 <manual/4.10.6>`_
-* `4.10.5 <manuals/4.10.5>`_
+* `4.10.5 <manual/4.10.5>`_
-* `4.10.4 <manuals/4.10.4>`_
+* `4.10.4 <manual/4.10.4>`_
-* `4.10.3 <manuals/4.10.3>`_
+* `4.10.3 <manual/4.10.3>`_
-* `4.10.2 <manuals/4.10.2>`_
+* `4.10.2 <manual/4.10.2>`_
-* `4.10.1 <manuals/4.10.1>`_
+* `4.10.1 <manual/4.10.1>`_
-* `4.10.0 <manuals/4.10.0>`_
+* `4.10.0 <manual/4.10.0>`_
-* `4.9.1 <manuals/4.9.1>`_
+* `4.9.1 <manual/4.9.1>`_
-* `4.9.0 <manuals/4.9.0>`_
+* `4.9.0 <manual/4.9.0>`_
-* `4.8.4 <manuals/4.8.4>`_
+* `4.8.4 <manual/4.8.4>`_
-* `4.8.3 <manuals/4.8.3>`_
+* `4.8.3 <manual/4.8.3>`_
-* `4.8.2 <manuals/4.8.2>`_
+* `4.8.2 <manual/4.8.2>`_
-* `4.8.1 <manuals/4.8.1>`_
+* `4.8.1 <manual/4.8.1>`_
-* `4.8.0 <manuals/4.8.0>`_
+* `4.8.0 <manual/4.8.0>`_
-* `4.7.3 <manuals/4.7.3>`_
+* `4.7.3 <manual/4.7.3>`_
-* `4.7.2 <manuals/4.7.2>`_
+* `4.7.2 <manual/4.7.2>`_
-* `4.7.1 <manuals/4.7.1>`_
+* `4.7.1 <manual/4.7.1>`_
-* `4.7.0 <manuals/4.7.0>`_
+* `4.7.0 <manual/4.7.0>`_
-* `4.6.1 <manuals/4.6.1>`_
+* `4.6.1 <manual/4.6.1>`_
-* `4.6.0 <manuals/4.6.0>`_
+* `4.6.0 <manual/4.6.0>`_
-* `4.5.0 <manuals/4.5.0>`_
+* `4.5.0 <manual/4.5.0>`_
-* `4.4.4 <manuals/4.4.4>`_
+* `4.4.4 <manual/4.4.4>`_
-* `4.4.3 <manuals/4.4.3>`_
+* `4.4.3 <manual/4.4.3>`_
-* `4.4.2 <manuals/4.4.2>`_
+* `4.4.2 <manual/4.4.2>`_
-* `4.4.1 <manuals/4.4.1>`_
+* `4.4.1 <manual/4.4.1>`_
-* `4.4.0 <manuals/4.4.0>`_
+* `4.4.0 <manual/4.4.0>`_
-* `4.3.2 <manuals/4.3.2>`_
+* `4.3.2 <manual/4.3.2>`_
-* `4.3.1 <manuals/4.3.1>`_
+* `4.3.1 <manual/4.3.1>`_
-* `4.3.0 <manuals/4.3.0>`_
+* `4.3.0 <manual/4.3.0>`_
-* `4.2.2 <manuals/4.2.2>`_
+* `4.2.2 <manual/4.2.2>`_
-* `4.2.1 <manuals/4.2.1>`_
+* `4.2.1 <manual/4.2.1>`_
-* `4.2.0 <manuals/4.2.0>`_
+* `4.2.0 <manual/4.2.0>`_
-* `4.1.0 <manuals/4.1.0>`_
+* `4.1.0 <manual/4.1.0>`_
-* `4.0.0 <manuals/4.0.0>`_
+* `4.0.0 <manual/4.0.0>`_
-* `4.0.0pre3 <manuals/4.0.0pre3>`_
+* `4.0.0pre3 <manual/4.0.0pre3>`_
-* `4.0.0pre2 <manuals/4.0.0pre2>`_
+* `4.0.0pre2 <manual/4.0.0pre2>`_
-* `4.0.0pre1 <manuals/4.0.0pre1>`_
+* `4.0.0pre1 <manual/4.0.0pre1>`_
-* `3.1.13 <manuals/3.1.13>`_
+* `3.1.13 <manual/3.1.13>`_
-* `3.1.12 <manuals/3.1.12>`_
+* `3.1.12 <manual/3.1.12>`_
-* `3.1.11 <manuals/3.1.11>`_
+* `3.1.11 <manual/3.1.11>`_
-* `3.1.10 <manuals/3.1.10>`_
+* `3.1.10 <manual/3.1.10>`_
-* `3.1.9 <manuals/3.1.9>`_
+* `3.1.9 <manual/3.1.9>`_
-* `3.1.8 <manuals/3.1.8>`_
+* `3.1.8 <manual/3.1.8>`_
-* `3.1.7 <manuals/3.1.7>`_
+* `3.1.7 <manual/3.1.7>`_
-* `3.1.6 <manuals/3.1.6>`_
+* `3.1.6 <manual/3.1.6>`_
-* `3.1.5 <manuals/3.1.5>`_
+* `3.1.5 <manual/3.1.5>`_
-* `3.1.4 <manuals/3.1.4>`_
+* `3.1.4 <manual/3.1.4>`_
-* `3.1.3 <manuals/3.1.3>`_
+* `3.1.3 <manual/3.1.3>`_
-* `3.1.2 <manuals/3.1.2>`_
+* `3.1.2 <manual/3.1.2>`_
-* `3.1.1 <manuals/3.1.1>`_
+* `3.1.1 <manual/3.1.1>`_
-* `3.1.0 <manuals/3.1.0>`_
+* `3.1.0 <manual/3.1.0>`_
-* `3.0.9 <manuals/3.0.9>`_
+* `3.0.9 <manual/3.0.9>`_
-* `3.0.8 <manuals/3.0.8>`_
+* `3.0.8 <manual/3.0.8>`_
-* `3.0.7 <manuals/3.0.7>`_
+* `3.0.7 <manual/3.0.7>`_
-* `3.0.6 <manuals/3.0.6>`_
+* `3.0.6 <manual/3.0.6>`_
-* `3.0.5 <manuals/3.0.5>`_
+* `3.0.5 <manual/3.0.5>`_
-* `3.0.4 <manuals/3.0.4>`_
+* `3.0.4 <manual/3.0.4>`_
-* `3.0.3 <manuals/3.0.3>`_
+* `3.0.3 <manual/3.0.3>`_
-* `3.0.2 <manuals/3.0.2>`_
+* `3.0.2 <manual/3.0.2>`_
-* `3.0.1 <manuals/3.0.1>`_
+* `3.0.1 <manual/3.0.1>`_
-* `3.0.0 <manuals/3.0.0>`_
+* `3.0.0 <manual/3.0.0>`_
-* `2.3.7 <manuals/2.3.7>`_
+* `2.3.7 <manual/2.3.7>`_
-* `2.3.6 <manuals/2.3.6>`_
+* `2.3.6 <manual/2.3.6>`_
-* `2.3.5 <manuals/2.3.5>`_
+* `2.3.5 <manual/2.3.5>`_
-* `2.3.4 <manuals/2.3.4>`_
+* `2.3.4 <manual/2.3.4>`_
-* `2.3.3 <manuals/2.3.3>`_
+* `2.3.3 <manual/2.3.3>`_
-* `2.3.2 <manuals/2.3.2>`_
+* `2.3.2 <manual/2.3.2>`_
-* `2.3.1 <manuals/2.3.1>`_
+* `2.3.1 <manual/2.3.1>`_
-* `2.3.0 <manuals/2.3.0>`_
+* `2.3.0 <manual/2.3.0>`_
-* `2.2.0 <manuals/2.2.0>`_
+* `2.2.0 <manual/2.2.0>`_
-* `2.1.2 <manuals/2.1.2>`_
+* `2.1.2 <manual/2.1.2>`_
-* `2.1.1 <manuals/2.1.1>`_
+* `2.1.1 <manual/2.1.1>`_
-* `2.1.0 <manuals/2.1.0>`_
+* `2.1.0 <manual/2.1.0>`_
-* `2.1.0pre8 <manuals/2.1.0pre8>`_
+* `2.1.0pre8 <manual/2.1.0pre8>`_
-* `2.1.0pre7 <manuals/2.1.0pre7>`_
+* `2.1.0pre7 <manual/2.1.0pre7>`_
-* `2.1.0pre6 <manuals/2.1.0pre6>`_
+* `2.1.0pre6 <manual/2.1.0pre6>`_
-* `2.1.0pre5 <manuals/2.1.0pre5>`_
+* `2.1.0pre5 <manual/2.1.0pre5>`_
-* `2.1.0pre4 <manuals/2.1.0pre4>`_
+* `2.1.0pre4 <manual/2.1.0pre4>`_
-* `2.1.0pre3 <manuals/2.1.0pre3>`_
+* `2.1.0pre3 <manual/2.1.0pre3>`_
-* `2.1.0pre2 <manuals/2.1.0pre2>`_
+* `2.1.0pre2 <manual/2.1.0pre2>`_
-* `2.1.0pre1 <manuals/2.1.0pre1>`_
+* `2.1.0pre1 <manual/2.1.0pre1>`_
-* `2.0.15 <manuals/2.0.15>`_
+* `2.0.15 <manual/2.0.15>`_
-* `2.0.14 <manuals/2.0.14>`_
+* `2.0.14 <manual/2.0.14>`_
-* `2.0.13 <manuals/2.0.13>`_
+* `2.0.13 <manual/2.0.13>`_
-* `2.0.12 <manuals/2.0.12>`_
+* `2.0.12 <manual/2.0.12>`_
-* `2.0.11 <manuals/2.0.11>`_
+* `2.0.11 <manual/2.0.11>`_
-* `2.0.10 <manuals/2.0.10>`_
+* `2.0.10 <manual/2.0.10>`_
-* `2.0.9 <manuals/2.0.9>`_
+* `2.0.9 <manual/2.0.9>`_
-* `2.0.8 <manuals/2.0.8>`_
+* `2.0.8 <manual/2.0.8>`_
-* `2.0.7 <manuals/2.0.7>`_
+* `2.0.7 <manual/2.0.7>`_
-* `2.0.6 <manuals/2.0.6>`_
+* `2.0.6 <manual/2.0.6>`_
-* `2.0.5 <manuals/2.0.5>`_
+* `2.0.5 <manual/2.0.5>`_
-* `2.0.4 <manuals/2.0.4>`_
+* `2.0.4 <manual/2.0.4>`_