summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2006-01-12 02:19:40 +0000
committerPeter Palfrader <peter@palfrader.org>2006-01-12 02:19:40 +0000
commit4eb9dc7bc3c2ccde80f870f6958e88c29bd90805 (patch)
tree26b45b7bd4b15af9a01b123a521dd128ef1ff452 /debian/patches
parentfdbd0791e239dc676be2dbdc71e56af2ff464b69 (diff)
downloadtor-4eb9dc7bc3c2ccde80f870f6958e88c29bd90805.tar.gz
tor-4eb9dc7bc3c2ccde80f870f6958e88c29bd90805.zip
Forward port patches/02_add_debian_files_in_manpage and patches/03_tor_manpage_in_section_8.
svn:r5822
Diffstat (limited to 'debian/patches')
-rwxr-xr-xdebian/patches/02_add_debian_files_in_manpage.dpatch18
-rwxr-xr-xdebian/patches/03_tor_manpage_in_section_8.dpatch4
2 files changed, 13 insertions, 9 deletions
diff --git a/debian/patches/02_add_debian_files_in_manpage.dpatch b/debian/patches/02_add_debian_files_in_manpage.dpatch
index 277a2fb584..69f8c8a535 100755
--- a/debian/patches/02_add_debian_files_in_manpage.dpatch
+++ b/debian/patches/02_add_debian_files_in_manpage.dpatch
@@ -26,16 +26,20 @@ exit 0
diff -urNad tor-0.1.1.5/doc/tor.1.in /tmp/dpep.E9VjWB/tor-0.1.1.5/doc/tor.1.in
--- tor-0.1.1.12/doc/tor.1.in
+++ /tmp/dpep.E9VjWB/tor-0.1.1.12/doc/tor.1.in
-@@ -710,6 +710,12 @@
- (fingerprint) are rejected by the authoritative directory server. If
- it is \fB!invalid\fP then descriptors are accepted but marked in the
- directory as not valid (not recommended).
+@@ -700,9 +700,15 @@
+ .TP
+ .B @LOCALSTATEDIR@/lib/tor/
+ The tor process stores keys and other data here.
+.TP
+.B /var/log/tor/
+The tor server logs to this directory.
+.TP
+.B /var/run/tor/tor.pid
+The PID of the tor (master) process is stored in this file.
- .SH SEE ALSO
- .BR privoxy (1),
- .BR tsocks (1),
+ .LP
+ .TP
+-.B \fIDataDirectory\fP/approved-routers
++.B /var/lib/tor/approved-routers
+ Only for naming authoritative directory servers
+ (see \fBNamingAuthoritativeDirectory\fP).
+ This file lists nickname to identity bindings. Each line lists a
diff --git a/debian/patches/03_tor_manpage_in_section_8.dpatch b/debian/patches/03_tor_manpage_in_section_8.dpatch
index 75e342c189..fe8a399968 100755
--- a/debian/patches/03_tor_manpage_in_section_8.dpatch
+++ b/debian/patches/03_tor_manpage_in_section_8.dpatch
@@ -38,8 +38,8 @@ diff -urNad tor-0.1.1.5/doc/tor.1.in /tmp/dpep.fOA3Mm/tor-0.1.1.5/doc/tor.1.in
--- tor-0.1.1.5/doc/tor.1.in
+++ /tmp/dpep.fOA3Mm/tor-0.1.1.5/doc/tor.1.in
@@ -1,4 +1,4 @@
--.TH TOR 1 "September 2005" "TOR"
-+.TH TOR 8 "September 2005" "TOR"
+-.TH TOR 1 "January 2006" "TOR"
++.TH TOR 8 "January 2006" "TOR"
.SH NAME
tor \- The second-generation onion router
.SH SYNOPSIS