Merge remote-tracking branch 'tor-gitlab/merge-requests/48'

6 files changed, 22 insertions, 22 deletions

diff --git a/doc/include.am b/doc/include.am
index 5e0c90b0cd..d3e757f3bb 100644
--- a/doc/include.am
+++ b/doc/include.am
@@ -12,7 +12,7 @@
 # part of the source distribution, so that people without asciidoc can
 # just use the .1 and .html files.
 
-all_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify doc/tor-print-ed-signing-cert
+all_mans = doc/man/tor doc/man/tor-gencert doc/man/tor-resolve doc/man/torify doc/man/tor-print-ed-signing-cert
 
 if USE_ASCIIDOC
 txt_in = $(all_mans:=.1.txt)
@@ -76,17 +76,17 @@ $(html_in) :
 $(man_in) :
 	$(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/$@
 
-doc/tor.1.in: doc/tor.1.txt
-doc/torify.1.in: doc/torify.1.txt
-doc/tor-gencert.1.in: doc/tor-gencert.1.txt
-doc/tor-resolve.1.in: doc/tor-resolve.1.txt
-doc/tor-print-ed-signing-cert.1.in: doc/tor-print-ed-signing-cert.1.txt
+doc/man/tor.1.in: doc/man/tor.1.txt
+doc/man/torify.1.in: doc/man/torify.1.txt
+doc/man/tor-gencert.1.in: doc/man/tor-gencert.1.txt
+doc/man/tor-resolve.1.in: doc/man/tor-resolve.1.txt
+doc/man/tor-print-ed-signing-cert.1.in: doc/man/tor-print-ed-signing-cert.1.txt
 
-doc/tor.html.in: doc/tor.1.txt
-doc/torify.html.in: doc/torify.1.txt
-doc/tor-gencert.html.in: doc/tor-gencert.1.txt
-doc/tor-resolve.html.in: doc/tor-resolve.1.txt
-doc/tor-print-ed-signing-cert.html.in: doc/tor-print-ed-signing-cert.1.txt
+doc/man/tor.html.in: doc/man/tor.1.txt
+doc/man/torify.html.in: doc/man/torify.1.txt
+doc/man/tor-gencert.html.in: doc/man/tor-gencert.1.txt
+doc/man/tor-resolve.html.in: doc/man/tor-resolve.1.txt
+doc/man/tor-print-ed-signing-cert.html.in: doc/man/tor-print-ed-signing-cert.1.txt
 
 # use config.status to swap all machine-specific magic strings
 # in the asciidoc with their replacements.
@@ -97,17 +97,17 @@ $(asciidoc_product) :
 	fi
 	$(AM_V_at)$(top_builddir)/config.status -q --file=$@;
 
-doc/tor.html: doc/tor.html.in
-doc/tor-gencert.html: doc/tor-gencert.html.in
-doc/tor-resolve.html: doc/tor-resolve.html.in
-doc/tor-print-ed-signing-cert.html: doc/tor-print-ed-signing-cert.html.in
-doc/torify.html: doc/torify.html.in
-
-doc/tor.1: doc/tor.1.in
-doc/tor-gencert.1: doc/tor-gencert.1.in
-doc/tor-resolve.1: doc/tor-resolve.1.in
-doc/tor-print-ed-signing-cert.1: doc/tor-print-ed-signing-cert.1.in
-doc/torify.1: doc/torify.1.in
+doc/man/tor.html: doc/man/tor.html.in
+doc/man/tor-gencert.html: doc/man/tor-gencert.html.in
+doc/man/tor-resolve.html: doc/man/tor-resolve.html.in
+doc/man/tor-print-ed-signing-cert.html: doc/man/tor-print-ed-signing-cert.html.in
+doc/man/torify.html: doc/man/torify.html.in
+
+doc/man/tor.1: doc/man/tor.1.in
+doc/man/tor-gencert.1: doc/man/tor-gencert.1.in
+doc/man/tor-resolve.1: doc/man/tor-resolve.1.in
+doc/man/tor-print-ed-signing-cert.1: doc/man/tor-print-ed-signing-cert.1.in
+doc/man/torify.1: doc/man/torify.1.in
 
 CLEANFILES+= $(asciidoc_product)
 DISTCLEANFILES+= $(html_in) $(man_in)
diff --git a/doc/tor-gencert.1.txt b/doc/man/tor-gencert.1.txt
index 26f68b29c0..26f68b29c0 100644
--- a/doc/tor-gencert.1.txt
+++ b/doc/man/tor-gencert.1.txt
diff --git a/doc/tor-print-ed-signing-cert.1.txt b/doc/man/tor-print-ed-signing-cert.1.txt
index 71c8b67ec4..71c8b67ec4 100644
--- a/doc/tor-print-ed-signing-cert.1.txt
+++ b/doc/man/tor-print-ed-signing-cert.1.txt
diff --git a/doc/tor-resolve.1.txt b/doc/man/tor-resolve.1.txt
index 17a77e482f..17a77e482f 100644
--- a/doc/tor-resolve.1.txt
+++ b/doc/man/tor-resolve.1.txt
diff --git a/doc/tor.1.txt b/doc/man/tor.1.txt
index ca54fa125b..ca54fa125b 100644
--- a/doc/tor.1.txt
+++ b/doc/man/tor.1.txt
diff --git a/doc/torify.1.txt b/doc/man/torify.1.txt
index 716625f92d..716625f92d 100644
--- a/doc/torify.1.txt
+++ b/doc/man/torify.1.txt