[or-cvs] Forward port patches/02_add_debian_files_in_manpage and pat...

[weasel@xxxxxxxx (Peter Palfrader)]

Update of /home/or/cvsroot/tor/debian/patches
In directory moria:/tmp/cvs-serv6376/patches

Modified Files:
	02_add_debian_files_in_manpage.dpatch 
	03_tor_manpage_in_section_8.dpatch 
Log Message:
Forward port patches/02_add_debian_files_in_manpage and patches/03_tor_manpage_in_section_8.

Index: 02_add_debian_files_in_manpage.dpatch
===================================================================
RCS file: /home/or/cvsroot/tor/debian/patches/02_add_debian_files_in_manpage.dpatch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- 02_add_debian_files_in_manpage.dpatch	12 Jan 2006 02:05:11 -0000	1.6
+++ 02_add_debian_files_in_manpage.dpatch	12 Jan 2006 02:19:40 -0000	1.7
@@ -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

Index: 03_tor_manpage_in_section_8.dpatch
===================================================================
RCS file: /home/or/cvsroot/tor/debian/patches/03_tor_manpage_in_section_8.dpatch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -d -r1.8 -r1.9
--- 03_tor_manpage_in_section_8.dpatch	14 Sep 2005 16:38:46 -0000	1.8
+++ 03_tor_manpage_in_section_8.dpatch	12 Jan 2006 02:19:40 -0000	1.9
@@ -38,8 +38,8 @@ diff -urNad tor-0.1.1.5/doc/tor.1.in /tm
 --- 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