Commit 1b212065 authored by Nick Mathewson's avatar Nick Mathewson 🦞
Browse files

Merge remote branch 'sebastian/fw-helper-manpage'

parents 5b766913 82641662

.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -98,6 +98,11 @@ 
/doc/tor.html

/doc/tor.html.in

/doc/tor.1.xml

/doc/tor-fw-helper.1

/doc/tor-fw-helper.1.in

/doc/tor-fw-helper.html

/doc/tor-fw-helper.html.in

/doc/tor-fw-helper.1.xml

/doc/tor-gencert.1

/doc/tor-gencert.1.in

/doc/tor-gencert.html

doc/Makefile.am

+8 −0
Original line number Diff line number Diff line
@@ -14,7 +14,11 @@ 
# just use the .1 and .html files.



if USE_ASCIIDOC

if USE_FW_HELPER

asciidoc_files = tor tor-gencert tor-resolve torify tor-fw-helper

else

asciidoc_files = tor tor-gencert tor-resolve torify

endif

html_in = $(asciidoc_files:=.html.in)

man_in = $(asciidoc_files:=.1.in)

txt_in = $(asciidoc_files:=.1.txt)
@@ -51,6 +55,7 @@ tor.html.in : tor.1.txt 
torify.html.in : torify.1.txt

tor-gencert.html.in : tor-gencert.1.txt

tor-resolve.html.in : tor-resolve.1.txt

tor-fw-helper.html.in : tor-fw-helper.1.txt



# Generate the manpage from asciidoc, but don't do

# machine-specific replacements yet
@@ -61,6 +66,7 @@ tor.1.in : tor.1.txt 
torify.1.in : torify.1.txt

tor-gencert.1.in : tor-gencert.1.txt

tor-resolve.1.in : tor-resolve.1.txt

tor-fw-helper.1.in : tor-fw-helper.1.txt



# use ../config.status to swap all machine-specific magic strings

# in the asciidoc with their replacements.
@@ -74,10 +80,12 @@ tor.1 : tor.1.in 
torify.1 : torify.1.in

tor-gencert.1 : tor-gencert.1.in

tor-resolve.1 : tor-resolve.1.in

tor-fw-helper.1 : tor-fw-helper.1.in

tor.html : tor.html.in

torify.html : torify.html.in

tor-gencert.html : tor-gencert.html.in

tor-resolve.html : tor-resolve.html.in

tor-fw-helper.html : tor-fw-helper.html.in



CLEANFILES = $(asciidoc_product) config.log

DISTCLEANFILES = $(html_in) $(man_in)

doc/asciidoc-helper.sh

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ output=$3 
if [ "$1" = "html" ]; then

    input=${output%%.html.in}.1.txt

    base=${output%%.html.in}



    if [ "$2" != none ]; then

      "$2" -d manpage -o $output $input;

    else

doc/tor-fw-helper.1.txt

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
// This is an asciidoc file used to generate the manpage/html reference.

// Learn asciidoc on http://www.methods.co.nz/asciidoc/userguide.html

tor-fw-helper(1)

==============

================

Jacob Appelbaum



NAME