summaryrefslogtreecommitdiff
path: root/doc/sources.list.5.xml
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-12-10 20:48:36 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-12-10 20:48:36 +0100
commit3e2f480d7ad43f565bf2253fc598c2b80a22560f (patch)
tree9328c276084c60db8bcea258b35c9d69e9da4a3b /doc/sources.list.5.xml
parentfb3dc57975989a6514577569af9171732b7c5403 (diff)
parent944b2fffc4a54fbf9329faa579592cc758915a99 (diff)
merged -r1887..1901 from lp:~donkult/apt/sid
Diffstat (limited to 'doc/sources.list.5.xml')
-rw-r--r--doc/sources.list.5.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 379112c83..0f788aca1 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -34,13 +34,13 @@
<para>The package resource list is used to locate archives of the package
distribution system in use on the system. At this time, this manual page
documents only the packaging system used by the Debian GNU/Linux system.
- This control file is located in <filename>/etc/apt/sources.list</filename></para>
+ This control file is <filename>/etc/apt/sources.list</filename>.</para>
<para>The source list is designed to support any number of active sources and a
variety of source media. The file lists one source per line, with the
most preferred source listed first. The format of each line is:
<literal>type uri args</literal> The first item, <literal>type</literal>
- determines the format for <literal>args</literal> <literal>uri</literal> is
+ determines the format for <literal>args</literal>. <literal>uri</literal> is
a Universal Resource Identifier
(URI), which is a superset of the more specific and well-known Universal
Resource Locator, or URL. The rest of the line can be marked as a comment
@@ -64,14 +64,14 @@
<literal>stable</literal> <literal>unstable</literal> or
<literal>testing</literal> while component is one of <literal>main</literal>
<literal>contrib</literal> <literal>non-free</literal> or
- <literal>non-us</literal> The
+ <literal>non-us</literal>. The
<literal>deb-src</literal> type describes a debian distribution's source
code in the same form as the <literal>deb</literal> type.
A <literal>deb-src</literal> line is required to fetch source indexes.</para>
<para>The format for a <filename>sources.list</filename> entry using the
- <literal>deb</literal> and <literal>deb-src</literal> types are:</para>
+ <literal>deb</literal> and <literal>deb-src</literal> types is:</para>
<literallayout>deb uri distribution [component1] [component2] [...]</literallayout>
@@ -79,7 +79,7 @@
Debian distribution, from which APT will find the information it needs.
<literal>distribution</literal> can specify an exact path, in which case the
components must be omitted and <literal>distribution</literal> must end with
- a slash (/). This is useful for when only a particular sub-section of the
+ a slash (/). This is useful for when the case only a particular sub-section of the
archive denoted by the URI is of interest.
If <literal>distribution</literal> does not specify an exact path, at least
one <literal>component</literal> must be present.</para>
@@ -143,7 +143,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/
http://server:port/, the proxy server specified in
<envar>http_proxy</envar> will be used. Users of authenticated
HTTP/1.1 proxies may use a string of the format
- http://user:pass@server:port/
+ http://user:pass@server:port/.
Note that this is an insecure method of authentication.</para></listitem>
</varlistentry>
@@ -211,7 +211,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/
<para>Uses FTP to access the archive at ftp.debian.org, under the debian
directory, and uses only the unstable/contrib area. If this line appears as
- well as the one in the previous example in <filename>sources.list</filename>.
+ well as the one in the previous example in <filename>sources.list</filename>
a single FTP session will be used for both resource lines.</para>
<literallayout>deb ftp://ftp.debian.org/debian unstable contrib</literallayout>