From: Justin B Rye Date: Thu, 7 Jun 2012 22:17:06 +0000 (+0200) Subject: * sources.list.5.xml: X-Git-Tag: 0.9.6~1^2~15 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/0ca491a75ef0579dcc8d7b3654fe9ec8cce1c529 * sources.list.5.xml: - review and fix typo, grammar and style issues --- diff --git a/debian/changelog b/debian/changelog index 518ec999e..e4cdc3a28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,7 +28,7 @@ apt (0.9.5.2) UNRELEASED; urgency=low * doc/apt-ftparchive.8.xml, doc/apt-config.8.xml, doc/apt-key.8.xml, doc/apt-mark.8.xml, doc/apt_preferences.5.xml, doc/apt-secure.8.xml, - doc/apt-sortpkgs.1.xml: + doc/apt-sortpkgs.1.xml, sources.list.5.xml: - review and fix typo, grammar and style issues [ Robert Luberda ] diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 13a0db54c..d8ebf4d60 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -74,7 +74,7 @@ as filename extension and only contain alphanumeric, hyphen (-), underscore (_) and period (.) characters. Otherwise APT will print a notice that it has ignored a file, unless that file matches a pattern in the Dir::Ignore-Files-Silently -configuration list - in this case it will be silently ignored. +configuration list - in which case it will be silently ignored. APT's Default Priority Assignments diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 931e96b79..20aade9eb 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -34,20 +34,20 @@ Description - 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 system. - This control file is /etc/apt/sources.list. - - 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: - type uri args The first item, type - determines the format for args. uri 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 - by using a #. + + The source list /etc/apt/sources.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 information available + from the configured sources is acquired by apt-get update + (or by an equivalent command from another APT front-end). + + + Each line specifying a source starts with type (e.g. deb-src) + followed by options and arguments for this type. + Individual entries cannot be continued onto a following line. Empty lines + are ignored, and a # character anywhere on a line marks + the remainder of that line as a comment. + sources.list.d @@ -59,18 +59,18 @@ digits (0-9), underscore (_), hyphen (-) and period (.) characters. Otherwise APT will print a notice that it has ignored a file, unless that file matches a pattern in the Dir::Ignore-Files-Silently - configuration list - in this case it will be silently ignored. + configuration list - in which case it will be silently ignored. The deb and deb-src types - The deb type describes a typical two-level Debian - archive, distribution/component. Typically, - distribution is generally an archivename like + The deb type references a typical two-level Debian + archive, distribution/component. The + distribution is generally an archive name like stable or testing or a codename like &stable-codename; or &testing-codename; - while component is one of main contrib or + while component is one of main, contrib or non-free. The - deb-src type describes a debian distribution's source + deb-src type references a Debian distribution's source code in the same form as the deb type. A deb-src line is required to fetch source indexes. @@ -84,15 +84,15 @@ Debian distribution, from which APT will find the information it needs. distribution can specify an exact path, in which case the components must be omitted and distribution must end with - a slash (/). This is useful for when the case only a particular sub-section of the - archive denoted by the URI is of interest. + a slash (/). This is useful for the case when only a + particular sub-section of the archive denoted by the URI is of interest. If distribution does not specify an exact path, at least one component must be present. distribution may also contain a variable, $(ARCH) - which expands to the Debian architecture (i386, m68k, powerpc, ...) - used on the system. This permits architecture-independent + which expands to the Debian architecture (such as amd64 or + armel) used on the system. This permits architecture-independent sources.list files to be used. In general this is only of interest when specifying an exact path, APT will automatically generate a URI with the current architecture otherwise. @@ -109,13 +109,13 @@ simultaneous anonymous users. APT also parallelizes connections to different hosts to more effectively deal with sites with low bandwidth. - options is always optional and needs to be surounded by + options is always optional and needs to be surrounded by square brackets. It can consist of multiple settings in the form setting=value. - Multiple settings are separated by spaces. The following settings are supported by APT, - note though that unsupported settings will be ignored silently: + Multiple settings are separated by spaces. The following settings are supported by APT + (note however that unsupported settings will be ignored silently): arch=arch1,arch2,… - can be used to specify for which architectures packages information should + can be used to specify for which architectures information should be downloaded. If this option is not set all architectures defined by the APT::Architectures option will be downloaded. trusted=yes can be set to indicate that packages @@ -171,10 +171,11 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free The ftp scheme specifies an FTP server for the archive. APT's FTP behavior is highly configurable; for more information see the - &apt-conf; manual page. Please note that a ftp proxy can be specified + &apt-conf; manual page. Please note that an FTP proxy can be specified by using the ftp_proxy environment variable. It is possible - to specify a http proxy (http proxy servers often understand ftp urls) - using this method and ONLY this method. ftp proxies using http specified in + to specify an HTTP proxy (HTTP proxy servers often understand FTP URLs) + using this environment variable and ONLY this + environment variable. Proxies using HTTP specified in the configuration file will be ignored. @@ -182,26 +183,25 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free The copy scheme is identical to the file scheme except that packages are copied into the cache directory instead of used directly at their location. - This is useful for people using a zip disk to copy files around with APT. + This is useful for people using removable media to copy files around with APT. rshssh - The rsh/ssh method invokes rsh/ssh to connect to a remote host - 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 find and - dd - commands to perform the file transfers from the remote. + The rsh/ssh method invokes RSH/SSH to connect to a remote host and + access the files as a given user. Prior configuration of rhosts or RSA keys + is recommended. The standard find and dd + commands are used to perform the file transfers from the remote host. + adding more recognizable URI types - APT can be extended with more methods shipped in other optional packages which should - follow the nameing scheme apt-transport-method. - The APT team e.g. maintains also the apt-transport-https package which - provides access methods for https-URIs with features similar to the http method, but other - methods for using e.g. debtorrent are also available, see &apt-transport-debtorrent;. + APT can be extended with more methods shipped in other optional packages, which should + follow the naming scheme apt-transport-method. + For instance, the APT team also maintains the package apt-transport-https, + which provides access methods for HTTPS URIs with features similar to the http method. + Methods for using e.g. debtorrent are also available - see &apt-transport-debtorrent;.