Fix various documentation issues (Closes: #518590, #518549, #518548, 518550)

diff --git a/apt-p2p.conf b/apt-p2p.conf
index 6d4a00fd985ad7e31c10c555aaf85954b08cbe3d..06209796890d851bdd8e1a3768d766584da2c21f 100644 (file)
--- a/apt-p2p.conf
+++ b/apt-p2p.conf
@@ -36,7 +36,10 @@ CACHE_DIR = /var/cache/apt-p2p
 #          for everybody to download
 # OTHER_DIRS = 
     
-# Whether it's OK to use an IP address from a known local/private range
+# Whether it's OK for the application to use for sharing files an IP
+# address from a known local or private range (RFC 1918). This should
+# only be set true if you are running your own private apt-p2p network
+# that no one else will be connecting to.
 LOCAL_OK = no
 
 # Whether a remote peer can access the statistics page
@@ -106,7 +109,9 @@ MIN_PING_INTERVAL = 15m
 BUCKET_STALENESS = 1h
 
 # Whether it's OK to add nodes to the routing table that use an IP
-# address from a known local/private range.
+# address from a known local or private range (RFC 1918). This should
+# only be set true if you are running your own private apt-p2p network
+# that no one else will be connecting to.
 # If not specified here, the LOCAL_OK value in the DEFAULT section will be used.
 # LOCAL_OK = no
 

diff --git a/debian/apt-p2p.conf.sgml b/debian/apt-p2p.conf.sgml
index 288864ec17f14d1d92d50ec8f0878a4f65b7fa3a..e8938d3386d82dc74130723062afd2927f7a1475 100644 (file)
--- a/debian/apt-p2p.conf.sgml
+++ b/debian/apt-p2p.conf.sgml
@@ -52,7 +52,7 @@
       entries overriding former ones:
       <OrderedList>
         <ListItem><para>/etc/apt-p2p/apt-p2p.conf</para></ListItem>
-        <ListItem><para>${HOME}/.apt-p2p/apt-p2p.conf</para></ListItem>
+        <ListItem><para>$HOME/.apt-p2p/apt-p2p.conf</para></ListItem>
         <ListItem><para>the location specified by the config-file parameter</para></ListItem>
       </OrderedList>
     </para>
@@ -115,7 +115,7 @@
            <term><option>CACHE_DIR = <replaceable>directory</replaceable></option></term>
             <listitem>
              <para>The <replaceable>directory</replaceable> to store the downloaded files in.
-               (Default is ${HOME}/.apt-p2p/cache.)</para>
+               (Default is $HOME/.apt-p2p/cache.)</para>
            </listitem>
          </varlistentry>
          <varlistentry>
@@ -129,7 +129,9 @@
          <varlistentry>
            <term><option>LOCAL_OK = <replaceable>boolean</replaceable></option></term>
             <listitem>
-             <para>Whether it's OK to use an IP address from a known local or private range.
+             <para>Whether it's OK for the application to use for sharing files an IP address from a
+            known local or private range (RFC 1918). This should only be set true if you are running
+            your own private apt-p2p network that no one else will be connecting to.
                (Default is false)</para>
            </listitem>
          </varlistentry>
@@ -266,8 +268,9 @@
          <varlistentry>
            <term><option>LOCAL_OK = <replaceable>boolean</replaceable></option></term>
             <listitem>
-             <para>Whether it's OK to add nodes to the routing table that use an IP address
-               from a known local or private range.
+             <para>Whether it's OK to add nodes to the routing table that use an IP address from a
+            known local or private range (RFC 1918). This should only be set true if you are running
+            your own private apt-p2p network that no one else will be connecting to.
                (Default is to use the value specified in the DEFAULT section.)</para>
            </listitem>
          </varlistentry>

diff --git a/debian/apt-p2p.sgml b/debian/apt-p2p.sgml
index d8e95976c6ce2bc1294b2601676d0d8e35aa9519..d8baf39240a90aba72bc1d696ebde006a243a64f 100644 (file)
--- a/debian/apt-p2p.sgml
+++ b/debian/apt-p2p.sgml
@@ -47,7 +47,7 @@
   <refsynopsisdiv>
     <para>Normally &dhpackage; is run from init.d using <command>twistd</command>, in which case no &dhpackage;
         options can be specified on the command-line, and all configuration variables are
-        read from the default config file locations of ${HOME}/.apt-p2p/apt-p2p.conf and /etc/apt-p2p/apt-p2p.conf.
+        read from the default config file locations of $HOME/.apt-p2p/apt-p2p.conf and /etc/apt-p2p/apt-p2p.conf.
         The command is then:</para>
     <cmdsynopsis>
       <command>twistd</command> <arg choice="Req">-y /path/to/&dhpackage;</arg> <arg rep="Repeat"><option>twistd options</option></arg>
@@ -103,6 +103,17 @@
 
     <para><ulink url="http://portforward.com/"></ulink></para>
     
+      </refsect2>
+      <refsect2>
+       <title>PRIVATE NETWORKS</title>
+
+    <para>Apt-P2P is not designed to function as a downloader for multiple
+        clients on a private network. Apt-P2P checks the source of incoming
+        requests and only responds to those from the localhost. For more
+        information:</para>
+
+    <para><ulink url="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=481243"></ulink></para>
+    
       </refsect2>
    </refsect1>
   <refsect1>
@@ -118,7 +129,7 @@
         <term><option>-c <replaceable>filename</replaceable>,</option> <option>--configfile=<replaceable>filename</replaceable></option></term>
          <listitem>
           <para>the <replaceable>filename</replaceable> to use for the configuration file, options found in this
-              file are combined with those in ${HOME}/.apt-p2p/apt-p2p.conf and /etc/apt-p2p/apt-p2p.conf
+              file are combined with those in $HOME/.apt-p2p/apt-p2p.conf and /etc/apt-p2p/apt-p2p.conf
               (see <citerefentry><refentrytitle>apt-p2p.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> for the format of the file)</para>
         </listitem>
       </varlistentry>

diff --git a/debian/changelog b/debian/changelog
index 98b7ea95898cbdb12b882ad6d6c6734d910bc85d..688617b99e5978da893e34c6ded0444717b203e5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ apt-p2p (0.1.6) unstable; urgency=low
 
   * Fix a lot of lintian warnings and errors
     - Update standards version to 3.8.4 (no changes)
+  * Fix various documentation issues
+    (Closes: #518590, #518549, #518548, 518550)
 
- -- Cameron Dale <camrdale@gmail.com>  Sat, 20 Mar 2010 22:48:07 -0700
+ -- Cameron Dale <camrdale@gmail.com>  Sat, 20 Mar 2010 23:26:24 -0700
 
 apt-p2p (0.1.5) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 1b70b7ab37cb80615b547231c1ad06a2bf130a82..3e1b1de6eb590be2eff1106d27a305f2c7c6e6eb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: apt-p2p
 Section: net
 Priority: optional
 Maintainer: Cameron Dale <camrdale@gmail.com>
-Homepage: http://www.camrdale.org/apt-p2p.html
+Homepage: http://www.camrdale.org/apt-p2p/
 Standards-Version: 3.8.4
 Build-Depends: debhelper (>= 5.0.37.2)
 Build-Depends-Indep: python, python-support (>= 0.5.4), docbook-to-man