diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2010-01-18 22:28:56 +0100 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2010-01-27 11:36:39 +0100 |
| commit | 3efadcd0d5373cc38986cdf93d03a1d99ec8aee0 (patch) | |
| tree | e170dcaef666eda053829476ca0a6e48e508214d | |
| parent | f6a673490f295ea8dee24ebdb857dd9949657820 (diff) | |
| download | tor-3efadcd0d5373cc38986cdf93d03a1d99ec8aee0.tar.gz tor-3efadcd0d5373cc38986cdf93d03a1d99ec8aee0.zip | |
Move the torify manpage into the doc dir
| -rw-r--r-- | contrib/Makefile.am | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 4 | ||||
| -rw-r--r-- | doc/torify.1 (renamed from contrib/torify.1) | 0 |
3 files changed, 3 insertions, 5 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index c42892a85d..d42e91ec97 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -3,10 +3,8 @@ DIST_SUBDIRS = osx suse confdir = $(sysconfdir)/tor -EXTRA_DIST = exitlist tor-tsocks.conf torify.1 tor.nsi.in tor.sh torctl rc.subr cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico tor-ctrl.sh linux-tor-prio.sh tor-exit-notice.html +EXTRA_DIST = exitlist tor-tsocks.conf tor.nsi.in tor.sh torctl rc.subr cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico tor-ctrl.sh linux-tor-prio.sh tor-exit-notice.html conf_DATA = tor-tsocks.conf bin_SCRIPTS = torify - -man_MANS = torify.1 diff --git a/doc/Makefile.am b/doc/Makefile.am index 79123d81d5..f8e17ecd3e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,9 +2,9 @@ EXTRA_DIST = HACKING \ tor-resolve.1 tor-gencert.1 \ tor-osx-dmg-creation.txt tor-rpm-creation.txt \ - tor-win32-mingw-creation.txt + tor-win32-mingw-creation.txt torify.1 -man_MANS = tor.1 tor-resolve.1 tor-gencert.1 +man_MANS = tor.1 tor-resolve.1 tor-gencert.1 torify.1 SUBDIRS = design-paper spec diff --git a/contrib/torify.1 b/doc/torify.1 index 9ae4e40d9d..9ae4e40d9d 100644 --- a/contrib/torify.1 +++ b/doc/torify.1 |