merge Julians changes from lp:~mvo/apt/debian-sid

[apt.git] / doc / sources.list.5.xml

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index e47418b27fe016dfb97f92838f089f991648b89d..379112c8377fd5e38b48ad4b4c8e4fae0767f99c 100644 (file)
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -21,6 +21,7 @@
  <refmeta>
    <refentrytitle>sources.list</refentrytitle>
    <manvolnum>5</manvolnum>
  <refmeta>
    <refentrytitle>sources.list</refentrytitle>
    <manvolnum>5</manvolnum>

+   <refmiscinfo class="manual">APT</refmiscinfo>

  </refmeta>
  
  <!-- Man page title -->
  </refmeta>
  
  <!-- Man page title -->


@@ -48,9 +49,12 @@
  
  <refsect1><title>sources.list.d</title>
    <para>The <filename>/etc/apt/sources.list.d</filename> directory provides
  
  <refsect1><title>sources.list.d</title>
    <para>The <filename>/etc/apt/sources.list.d</filename> directory provides

-   a way to add sources.list entries in seperate files that end with 
-   <literal>.list</literal>. The format is the same as for the regular
-   <filename>sources.list</filename> file. </para>
+   a way to add sources.list entries in separate files.
+   The format is the same as for the regular <filename>sources.list</filename> file.
+   File names need to end with
+   <filename>.list</filename> and may only contain letters (a-z and A-Z),
+   digits (0-9), underscore (_), hyphen (-) and period (.) characters.
+   Otherwise they will be silently ignored.</para>

  </refsect1>
 
  <refsect1><title>The deb and deb-src types</title>
  </refsect1>
 
  <refsect1><title>The deb and deb-src types</title>


@@ -115,7 +119,8 @@ deb http://http.us.debian.org/debian dists/stable-updates/
 
  <refsect1><title>URI specification</title>
 
 
  <refsect1><title>URI specification</title>
 

-   <para>The currently recognized URI types are cdrom, file, http, and ftp.
+   <para>The currently recognized URI types are cdrom, file, http, ftp, copy,
+   ssh, rsh.

    <variablelist>
     <varlistentry><term>file</term>
     <listitem><para>
    <variablelist>
     <varlistentry><term>file</term>
     <listitem><para>


@@ -163,12 +168,24 @@ deb http://http.us.debian.org/debian dists/stable-updates/
     <varlistentry><term>rsh</term><term>ssh</term>
     <listitem><para>
     The rsh/ssh method invokes rsh/ssh to connect to a remote host
     <varlistentry><term>rsh</term><term>ssh</term>
     <listitem><para>
     The rsh/ssh method invokes rsh/ssh to connect to a remote host

-    as a given user and access the files. No password authentication is 
-    possible, prior arrangements with RSA keys or rhosts must have been made.
+       as a given user and access the files. It is a good idea to do prior
+       arrangements with RSA keys or rhosts.

     Access to files on the remote uses standard <command>find</command> and
     <command>dd</command> 
     commands to perform the file transfers from the remote.</para></listitem>
     </varlistentry>
     Access to files on the remote uses standard <command>find</command> and
     <command>dd</command> 
     commands to perform the file transfers from the remote.</para></listitem>
     </varlistentry>

+
+    <varlistentry><term>more recongnizable URI types</term>
+    <listitem><para>
+    APT can be extended with more methods shipped in other optional packages which should
+    follow the nameing scheme <literal>apt-transport-<replaceable>method</replaceable></literal>.
+    The APT team e.g. maintain also the <literal>apt-transport-https</literal> package which
+    provides access methods for https-URIs with features similiar to the http method, but other
+    methods for using e.g. debtorrent are also available, see <citerefentry>
+    <refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle>
+    <manvolnum>1</manvolnum></citerefentry>.
+    </para></listitem>
+    </varlistentry>

   </variablelist>
  </para>
  </refsect1>
   </variablelist>
  </para>
  </refsect1>