mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-23 14:40:51 +01:00
Code Issues Projects Releases Wiki Activity

Convert the Tor manpage to asciidoc.

Browse source 
This should be a very faithful conversion, preserving as much of the layout
of the old manpage as possible. This wasn't possible for the nt-service
and the DataDirectory/state parts. See a later commit for some small
cleanups.

Tiago Faria helped with the asciidoc conversion, big thanks!
This commit is contained in:
Sebastian Hahn 2010-01-19 14:53:38 +01:00
parent ce860d8efd
commit a330cdc6fb
5 changed files with 1414 additions and 1646 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -93,6 +93,10 @@
/doc/Makefile.in /doc/Makefile.in
/doc/tor.1 /doc/tor.1
/doc/doxygen /doc/doxygen
/doc/tor.1
/doc/tor.1.in
/doc/tor.html
/doc/tor.html.in
/doc/tor-gencert.1 /doc/tor-gencert.1
/doc/tor-gencert.1.in /doc/tor-gencert.1.in
/doc/tor-gencert.html /doc/tor-gencert.html

2
configure.in
View file

@ -876,7 +876,7 @@ fi
CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib" CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample src/Makefile doc/Makefile doc/design-paper/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
AC_OUTPUT AC_OUTPUT
if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then

8
doc/Makefile.am
View file

@ -1,4 +1,4 @@
asciidoc_files = tor-gencert tor-resolve torify asciidoc_files = tor tor-gencert tor-resolve torify
html_in = $(asciidoc_files:=.html.in) html_in = $(asciidoc_files:=.html.in)
@ -9,7 +9,7 @@ EXTRA_DIST = HACKING \
tor-osx-dmg-creation.txt tor-rpm-creation.txt \ tor-osx-dmg-creation.txt tor-rpm-creation.txt \
tor-win32-mingw-creation.txt tor-win32-mingw-creation.txt
nodist_man_MANS = tor.1 $(asciidoc_files:=.1) nodist_man_MANS = $(asciidoc_files:=.1)
doc_DATA = $(asciidoc_files:=.html) doc_DATA = $(asciidoc_files:=.html)
@ -24,6 +24,7 @@ DIST_SUBDIRS = design-paper spec
$(html_in) : $(html_in) :
$(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ @SED@ $@ $(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ @SED@ $@
tor.html.in : tor.1.txt
torify.html.in : torify.1.txt torify.html.in : torify.1.txt
tor-gencert.html.in : tor-gencert.1.txt tor-gencert.html.in : tor-gencert.1.txt
tor-resolve.html.in : tor-resolve.1.txt tor-resolve.html.in : tor-resolve.1.txt
@ -33,6 +34,7 @@ tor-resolve.html.in : tor-resolve.1.txt
$(man_in) : $(man_in) :
$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ @SED@ $@ $(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ @SED@ $@
tor.1.in : tor.1.txt
torify.1.in : torify.1.txt torify.1.in : torify.1.txt
tor-gencert.1.in : tor-gencert.1.txt tor-gencert.1.in : tor-gencert.1.txt
tor-resolve.1.in : tor-resolve.1.txt tor-resolve.1.in : tor-resolve.1.txt
@ -42,9 +44,11 @@ tor-resolve.1.in : tor-resolve.1.txt
$(asciidoc_product) : $(asciidoc_product) :
../config.status --file=$@; ../config.status --file=$@;
tor.1 : tor.1.in
torify.1 : torify.1.in torify.1 : torify.1.in
tor-gencert.1 : tor-gencert.1.in tor-gencert.1 : tor-gencert.1.in
tor-resolve.1 : tor-resolve.1.in tor-resolve.1 : tor-resolve.1.in
tor.html : tor.html.in
torify.html : torify.html.in torify.html : torify.html.in
tor-gencert.html : tor-gencert.html.in tor-gencert.html : tor-gencert.html.in
tor-resolve.html : tor-resolve.html.in tor-resolve.html : tor-resolve.html.in

1643
doc/tor.1.in
View file

File diff suppressed because it is too large Load diff

1403
doc/tor.1.txt Normal file
View file

File diff suppressed because it is too large Load diff