diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-21 16:10:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-21 16:10:31 -0500 |
| commit | b99a8d54271dfd26c5c3a2d3086226974b32373e (patch) | |
| tree | d3faab523a3f23925c654005f927945b79ce95fc /doc/Makefile.am | |
| parent | 90f9caf4233c3db87f818d10c6c2b93e4fe398c9 (diff) | |
| parent | d673479ebaa29b2dc8f227c342785112c945ec18 (diff) | |
| download | tor-b99a8d54271dfd26c5c3a2d3086226974b32373e.tar.gz tor-b99a8d54271dfd26c5c3a2d3086226974b32373e.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
doc/spec/Makefile.am
doc/spec/control-spec.txt
doc/spec/dir-spec.txt
doc/spec/proposals/000-index.txt
doc/spec/proposals/001-process.txt
doc/spec/proposals/ideas/xxx-encrypted-services.txt
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index c8bffc9310..6cc0ea99fb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,3 @@ - # 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 @@ -36,16 +35,12 @@ 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 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) : |