]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Mon, 21 Feb 2011 21:09:23 +0000 (16:09 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 21 Feb 2011 21:09:23 +0000 (16:09 -0500)
Conflicts:
doc/Makefile.am
doc/spec/Makefile.am
doc/spec/address-spec.txt
doc/spec/bridges-spec.txt
doc/spec/control-spec-v0.txt
doc/spec/control-spec.txt
doc/spec/dir-spec-v1.txt
doc/spec/dir-spec-v2.txt
doc/spec/dir-spec.txt
doc/spec/path-spec.txt
doc/spec/proposals/000-index.txt
doc/spec/proposals/001-process.txt
doc/spec/proposals/098-todo.txt
doc/spec/proposals/099-misc.txt
doc/spec/proposals/100-tor-spec-udp.txt
doc/spec/proposals/101-dir-voting.txt
doc/spec/proposals/102-drop-opt.txt
doc/spec/proposals/103-multilevel-keys.txt
doc/spec/proposals/104-short-descriptors.txt
doc/spec/proposals/105-handshake-revision.txt
doc/spec/proposals/106-less-tls-constraint.txt
doc/spec/proposals/107-uptime-sanity-checking.txt
doc/spec/proposals/108-mtbf-based-stability.txt
doc/spec/proposals/109-no-sharing-ips.txt
doc/spec/proposals/110-avoid-infinite-circuits.txt
doc/spec/proposals/111-local-traffic-priority.txt
doc/spec/proposals/112-bring-back-pathlencoinweight.txt
doc/spec/proposals/113-fast-authority-interface.txt
doc/spec/proposals/114-distributed-storage.txt
doc/spec/proposals/115-two-hop-paths.txt
doc/spec/proposals/116-two-hop-paths-from-guard.txt
doc/spec/proposals/117-ipv6-exits.txt
doc/spec/proposals/118-multiple-orports.txt
doc/spec/proposals/119-controlport-auth.txt
doc/spec/proposals/120-shutdown-descriptors.txt
doc/spec/proposals/121-hidden-service-authentication.txt
doc/spec/proposals/122-unnamed-flag.txt
doc/spec/proposals/123-autonaming.txt
doc/spec/proposals/124-tls-certificates.txt
doc/spec/proposals/125-bridges.txt
doc/spec/proposals/126-geoip-reporting.txt
doc/spec/proposals/127-dirport-mirrors-downloads.txt
doc/spec/proposals/128-bridge-families.txt
doc/spec/proposals/129-reject-plaintext-ports.txt
doc/spec/proposals/130-v2-conn-protocol.txt
doc/spec/proposals/131-verify-tor-usage.txt
doc/spec/proposals/132-browser-check-tor-service.txt
doc/spec/proposals/134-robust-voting.txt
doc/spec/proposals/135-private-tor-networks.txt
doc/spec/proposals/137-bootstrap-phases.txt
doc/spec/proposals/138-remove-down-routers-from-consensus.txt
doc/spec/proposals/140-consensus-diffs.txt
doc/spec/proposals/141-jit-sd-downloads.txt
doc/spec/proposals/142-combine-intro-and-rend-points.txt
doc/spec/proposals/143-distributed-storage-improvements.txt
doc/spec/proposals/145-newguard-flag.txt
doc/spec/proposals/146-long-term-stability.txt
doc/spec/proposals/147-prevoting-opinions.txt
doc/spec/proposals/148-uniform-client-end-reason.txt
doc/spec/proposals/149-using-netinfo-data.txt
doc/spec/proposals/150-exclude-exit-nodes.txt
doc/spec/proposals/151-path-selection-improvements.txt
doc/spec/proposals/152-single-hop-circuits.txt
doc/spec/proposals/153-automatic-software-update-protocol.txt
doc/spec/proposals/154-automatic-updates.txt
doc/spec/proposals/155-four-hidden-service-improvements.txt
doc/spec/proposals/156-tracking-blocked-ports.txt
doc/spec/proposals/157-specific-cert-download.txt
doc/spec/proposals/158-microdescriptors.txt
doc/spec/proposals/159-exit-scanning.txt
doc/spec/proposals/ideas/xxx-hide-platform.txt
doc/spec/proposals/ideas/xxx-port-knocking.txt
doc/spec/proposals/ideas/xxx-separate-streams-by-port.txt
doc/spec/proposals/ideas/xxx-what-uses-sha1.txt
doc/spec/proposals/reindex.py
doc/spec/rend-spec.txt
doc/spec/socks-extensions.txt
doc/spec/tor-spec.txt
doc/spec/version-spec.txt

1  2 
doc/Makefile.am

diff --cc doc/Makefile.am
index 693378c486723f71538dbe7b12eddc9ed106ea5d,29598137507de84903944f4cc311b8e035fa4bb6..bc3d8df475ccf4973dd3962890bb5744f09a9735
@@@ -1,83 -1,12 +1,78 @@@
 +# We use a two-step process to generate documentation from asciidoc files.
 +#
 +# First, we use asciidoc/a2x to process the asciidoc files into .1.in and
 +# .html.in files (see the asciidoc-helper.sh script). These are the same as
 +# the regular .1 and .html files, except that they still have some autoconf
 +# variables set in them.
 +#
 +# Second, we use config.status to turn .1.in files into .1 files and
 +# .html.in files into .html files.
 +#
 +# We do the steps in this order so that we can ship the .*.in files as
 +# part of the source distribution, so that people without asciidoc can
 +# just use the .1 and .html files.
  
 -EXTRA_DIST = HACKING                                         \
 -             tor-resolve.1 tor-gencert.1                     \
 -             tor-osx-dmg-creation.txt tor-rpm-creation.txt   \
 +if USE_ASCIIDOC
 +asciidoc_files = tor tor-gencert tor-resolve torify
 +html_in = $(asciidoc_files:=.html.in)
 +man_in = $(asciidoc_files:=.1.in)
 +txt_in = $(asciidoc_files:=.1.txt)
 +nodist_man_MANS = $(asciidoc_files:=.1)
 +doc_DATA = $(asciidoc_files:=.html)
 +else
 +asciidoc_files =
 +html_in =
 +man_in =
 +txt_in =
 +nodist_man_MANS =
 +doc_DATA =
 +endif
 +
 +EXTRA_DIST = HACKING asciidoc-helper.sh                      \
 +             $(html_in) $(man_in) $(txt_in)                  \
 +             tor-rpm-creation.txt                            \
-              tor-win32-mingw-creation.txt
+              tor-win32-mingw-creation.txt spec/README
  
 -man_MANS = tor.1 tor-resolve.1 tor-gencert.1
 +docdir = @docdir@
 +
 +asciidoc_product = $(nodist_man_MANS) $(doc_DATA)
 +
- SUBDIRS = spec
- DIST_SUBDIRS = spec
 +# Generate the html documentation from asciidoc, but don't do
 +# machine-specific replacements yet
 +$(html_in) :
 +      $(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ $(top_srcdir)/doc/$@
 +
 +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
 +
 +# Generate the manpage from asciidoc, but don't do
 +# machine-specific replacements yet
 +$(man_in) :
 +      $(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/doc/$@
 +
 +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
  
 -SUBDIRS = design-paper
 +# use ../config.status to swap all machine-specific magic strings
 +# in the asciidoc with their replacements.
 +$(asciidoc_product) :
 +      if test -e $(top_srcdir)/doc/$@.in && ! test -e ./$@.in ; then \
 +              cp $(top_srcdir)/doc/$@.in .; \
 +      fi
 +      ../config.status --file=$@;
  
 -DIST_SUBDIRS = design-paper
 +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.html : tor.html.in
 +torify.html : torify.html.in
 +tor-gencert.html : tor-gencert.html.in
 +tor-resolve.html : tor-resolve.html.in
  
 +CLEANFILES = $(asciidoc_product) config.log
 +DISTCLEANFILES = $(html_in) $(man_in)