Forward port patches/02_add_debian_files_in_manpage and patches/03_tor_manpage_in_section_8.

svn:r5822
This commit is contained in:
Peter Palfrader 2006-01-12 02:19:40 +00:00
parent fdbd0791e2
commit 4eb9dc7bc3
3 changed files with 22 additions and 10 deletions

10
debian/changelog vendored
View File

@ -1,3 +1,11 @@
tor (0.1.1.12-alpha-2XXXXXX) unreleased; urgency=low
* CVS SNAPSHOT
* Forward port patches/02_add_debian_files_in_manpage.
* Forward port patches/03_tor_manpage_in_section_8.
-- Peter Palfrader <weasel@debian.org> Thu, 12 Jan 2006 03:18:59 +0100
tor (0.1.1.12-alpha-1) experimental; urgency=low
* New upstream version, that was a quick one. :)
@ -8,7 +16,7 @@ tor (0.1.1.12-alpha-1) experimental; urgency=low
tor (0.1.1.11-alpha-1) experimental; urgency=low
* New upstream version.
* forward port patches/07_log_to_file_by_default.
* Forward port patches/07_log_to_file_by_default.
* Forward port 0.1.0.16 changelog and change to copyright file.
-- Peter Palfrader <weasel@debian.org> Wed, 11 Jan 2006 12:08:25 +0100

View File

@ -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

View File

@ -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