diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-cache.8.xml | 15 | ||||
| -rw-r--r-- | doc/apt-get.8.xml | 163 | ||||
| -rw-r--r-- | doc/apt-key.8.xml | 23 | ||||
| -rw-r--r-- | doc/apt-mark.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt-secure.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt.8 | 9 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 14 | ||||
| -rw-r--r-- | doc/apt.ent | 28 | ||||
| -rw-r--r-- | doc/apt_preferences.5.xml | 3 | ||||
| -rw-r--r-- | doc/examples/configure-index | 6 | ||||
| -rw-r--r-- | doc/fr/apt-secure.fr.8.xml | 2 | ||||
| -rw-r--r-- | doc/fr/apt.ent.fr | 4 | ||||
| -rw-r--r-- | doc/ja/apt-secure.ja.8.xml | 4 | ||||
| -rw-r--r-- | doc/ja/apt.ent.ja | 6 | ||||
| -rw-r--r-- | doc/makefile | 2 | ||||
| -rw-r--r-- | doc/offline.sgml | 18 | ||||
| -rw-r--r-- | doc/sources.list.5.xml | 16 |
17 files changed, 243 insertions, 74 deletions
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index c359ac3d8..6c8938d8c 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -51,6 +51,7 @@ <arg>rdepends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="plain"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> + <arg>xvcg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg> </group> @@ -197,9 +198,14 @@ Reverse Provides: <varlistentry><term>search <replaceable>regex [ regex ... ]</replaceable></term> <listitem><para><literal>search</literal> performs a full text search on all available package - lists for the regex pattern given. It searches the package names and the + lists for the POSIX regex pattern given, see + <citerefentry><refentrytitle><command>regex</command></refentrytitle> + <manvolnum>7</manvolnum></citerefentry>. + It searches the package names and the descriptions for an occurrence of the regular expression and prints out - the package name and the short description. If <option>--full</option> is given + the package name and the short description, including virtual package + names. + If <option>--full</option> is given then output identical to <literal>show</literal> is produced for each matched package, and if <option>--names-only</option> is given then the long description is not searched, only the package name is.</para> @@ -244,6 +250,11 @@ Reverse Provides: <para>Caution, dotty cannot graph larger sets of packages.</para></listitem> </varlistentry> + <varlistentry><term>xvcg <replaceable>pkg(s)</replaceable></term> + <listitem><para>The same as <literal>dotty</literal>, only for xvcg from the + <ulink url="http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html">VCG tool</ulink>. + </para></listitem></varlistentry> + <varlistentry><term>policy <replaceable>[ pkg(s) ]</replaceable></term> <listitem><para><literal>policy</literal> is meant to help debug issues relating to the preferences file. With no arguments it will print out the diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index edb74270b..64c3a35e4 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>29 February 2004</date> + <date>08 November 2008</date> </refentryinfo> <refmeta> @@ -33,22 +33,74 @@ <refsynopsisdiv> <cmdsynopsis> <command>apt-get</command> - <arg><option>-hvs</option></arg> - <arg><option>-o=<replaceable>config string</replaceable></option></arg> - <arg><option>-c=<replaceable>file</replaceable></option></arg> + <arg><option>-sqdyfmubV</option></arg> + <arg> + <option>-o= + <replaceable>config_string</replaceable> + </option> + </arg> + <arg> + <option>-c= + <replaceable>config_file</replaceable> + </option> + </arg> + <arg> + <option>-t=</option> + <group choice='req'> + <arg choice='plain'> + <replaceable>target_release_name</replaceable> + </arg> + <arg choice='plain'> + <replaceable>target_release_number_expression</replaceable> + </arg> + </group> + </arg> + <group choice="req"> - <arg>update</arg> - <arg>upgrade</arg> - <arg>dselect-upgrade</arg> - <arg>install <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> - <arg>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> - <arg>purge <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> - <arg>source <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> - <arg>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> - <arg>check</arg> - <arg>clean</arg> - <arg>autoclean</arg> - <arg>autoremove</arg> + <arg choice='plain'>update</arg> + <arg choice='plain'>upgrade</arg> + <arg choice='plain'>dselect-upgrade</arg> + <arg choice='plain'>dist-upgrade</arg> + <arg choice='plain'>install + <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable> + <arg> + <group choice='req'> + <arg choice='plain'> + =<replaceable>pkg_version_number</replaceable> + </arg> + <arg choice='plain'> + /<replaceable>target_release_name</replaceable> + </arg> + </group> + </arg> + </arg> + </arg> + <arg choice='plain'>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> + <arg choice='plain'>purge <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> + <arg choice='plain'>source + <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable> + <arg> + =<replaceable>pkg_version_number</replaceable> + </arg> + </arg> + </arg> + <arg choice='plain'>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> + <arg choice='plain'>check</arg> + <arg choice='plain'>clean</arg> + <arg choice='plain'>autoclean</arg> + <arg choice='plain'>autoremove</arg> + <arg choice='plain'> + <group choice='req'> + <arg choice='plain'>-v</arg> + <arg choice='plain'>--version</arg> + </group> + </arg> + <arg choice='plain'> + <group choice='req'> + <arg choice='plain'>-h</arg> + <arg choice='plain'>--help</arg> + </group> + </arg> </group> </cmdsynopsis> </refsynopsisdiv> @@ -56,8 +108,8 @@ <refsect1><title>Description</title> <para><command>apt-get</command> is the command-line tool for handling packages, and may be considered the user's "back-end" to other tools using the APT - library. Several "front-end" interfaces exist, such as dselect(8), - aptitude, synaptic, gnome-apt and wajig.</para> + library. Several "front-end" interfaces exist, such as &dselect;, + &aptitude;, &synaptic;, &gnome-apt; and &wajig;.</para> <para>Unless the <option>-h</option>, or <option>--help</option> option is given, one of the commands below must be present.</para> @@ -104,6 +156,7 @@ with new versions of packages; <command>apt-get</command> has a "smart" conflict resolution system, and it will attempt to upgrade the most important packages at the expense of less important ones if necessary. + So, <literal>dist-upgrade</literal> command may remove some packages. The <filename>/etc/apt/sources.list</filename> file contains a list of locations from which to retrieve desired package files. See also &apt-preferences; for a mechanism for @@ -111,17 +164,24 @@ </varlistentry> <varlistentry><term>install</term> - <listitem><para><literal>install</literal> is followed by one or more packages desired for - installation. Each package is a package name, not a fully qualified - filename (for instance, in a Debian GNU/Linux system, libc6 would be the - argument provided, not <literal>libc6_1.9.6-2.deb</literal>) All packages required - by the package(s) specified for installation will also be retrieved and - installed. The <filename>/etc/apt/sources.list</filename> file is used to locate - the desired packages. If a hyphen is appended to the package name (with - no intervening space), the identified package will be removed if it is - installed. Similarly a plus sign can be used to designate a package to - install. These latter features may be used to override decisions made by - apt-get's conflict resolution system.</para> + <listitem> + <para><literal>install</literal> is followed by one or more + packages desired for installation or upgrading. + Each package is a package name, not a fully qualified + filename (for instance, in a Debian GNU/Linux system, + libc6 would be the argument provided, not + <literal>libc6_1.9.6-2.deb</literal>). All packages required + by the package(s) specified for installation will also + be retrieved and installed. + The <filename>/etc/apt/sources.list</filename> file is + used to locate the desired packages. If a hyphen is + appended to the package name (with no intervening space), + the identified package will be removed if it is installed. + Similarly a plus sign can be used to designate a + package to install. These latter features may be used + to override decisions made by apt-get's conflict + resolution system. + </para> <para>A specific version of a package can be selected for installation by following the package name with an equals and the version of the package @@ -133,6 +193,17 @@ <para>Both of the version selection mechanisms can downgrade packages and must be used with care.</para> + <para>This is also the target to use if you want to upgrade one or + more already-installed packages without upgrading every package + you have on your system. Unlike the "upgrade" target, which + installs the newest version of all currently installed packages, + "install" will install the newest version of only the package(s) + specified. Simply provide the name of the package(s) you wish + to upgrade, and if a newer version is available, it (and its + dependencies, as described above) will be downloaded and + installed. + </para> + <para>Finally, the &apt-preferences; mechanism allows you to create an alternative installation policy for individual packages.</para> @@ -148,14 +219,15 @@ <varlistentry><term>remove</term> <listitem><para><literal>remove</literal> is identical to <literal>install</literal> except that packages are - removed instead of installed. If a plus sign is appended to the package + removed instead of installed. Note the removing a package leaves its + configuration files in system. If a plus sign is appended to the package name (with no intervening space), the identified package will be installed instead of removed.</para></listitem> </varlistentry> <varlistentry><term>purge</term> <listitem><para><literal>purge</literal> is identical to <literal>remove</literal> except that packages are - removed and purged.</para></listitem> + removed and purged (any configuration files are deleted too).</para></listitem> </varlistentry> <varlistentry><term>source</term> @@ -222,6 +294,11 @@ &apt-cmdblurb; <variablelist> + <varlistentry><term><option>--no-install-recommends</option></term> + <listitem><para>Do not consider recommended packages as a dependency for installing. + Configuration Item: <literal>APT::Install-Recommends</literal>.</para></listitem> + </varlistentry> + <varlistentry><term><option>-d</option></term><term><option>--download-only</option></term> <listitem><para>Download only; package files are only retrieved, not unpacked or installed. Configuration Item: <literal>APT::Get::Download-Only</literal>.</para></listitem> @@ -357,7 +434,8 @@ <varlistentry><term><option>--purge</option></term> <listitem><para>Use purge instead of remove for anything that would be removed. An asterisk ("*") will be displayed next to packages which are - scheduled to be purged. + scheduled to be purged. <option>remove --purge</option> is equivalent for + <option>purge</option> command. Configuration Item: <literal>APT::Get::Purge</literal>.</para></listitem> </varlistentry> @@ -379,8 +457,10 @@ <term><option>--target-release</option></term> <term><option>--default-release</option></term> <listitem><para>This option controls the default input to the policy engine, it creates - a default pin at priority 990 using the specified release string. The - preferences file may further override this setting. In short, this option + a default pin at priority 990 using the specified release string. + This overrides the general settings in <filename>/etc/apt/preferences</filename>. + Specifically pinned packages are not affected by the value + of this option. In short, this option lets you have simple control over which distribution packages will be retrieved from. Some common examples might be <option>-t '2.1*'</option> or <option>-t unstable</option>. @@ -456,7 +536,7 @@ </varlistentry> <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term> - <listitem><para>APT configuration file fragments + <listitem><para>APT configuration file fragments. Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem> </varlistentry> @@ -501,7 +581,16 @@ <refsect1><title>Diagnostics</title> <para><command>apt-get</command> returns zero on normal operation, decimal 100 on error.</para> </refsect1> - + <refsect1> + <title>ORIGINAL AUTHORS</title> + <para>&apt-author.jgunthorpe;</para> + </refsect1> + <refsect1> + <title>CURRENT AUTHORS</title> + <para> + &apt-author.team; + &apt-qapage; + </para> + </refsect1> &manbugs; - </refentry> diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 981fa208c..4b3e7c220 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -95,6 +95,29 @@ </listitem> </varlistentry> + + <varlistentry><term>finger</term> + <listitem> + <para> + + List fingerprints of trusted keys. + + </para> + + </listitem> + </varlistentry> + + <varlistentry><term>adv</term> + <listitem> + <para> + + Pass advanced options to gpg. With adv --recv-key you can download the + public key. + + </para> + + </listitem> + </varlistentry> <varlistentry><term>update</term> <listitem> diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index 812fc406a..1b7b02812 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -26,7 +26,7 @@ <!-- Man page title --> <refnamediv> <refname>apt-mark</refname> - <refpurpose>Utility to sort package index files</refpurpose> + <refpurpose>mark/unmark a package as being automatically-installed</refpurpose> </refnamediv> <!-- Arguments --> diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index 01b157789..9696e018d 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -179,7 +179,7 @@ <refsect1><title>See Also</title> <para> -&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;, +&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, &debsign; &debsig-verify;, &gpg; </para> @@ -21,11 +21,13 @@ apt \- Advanced Package Tool .B apt .SH DESCRIPTION APT is a management system for software packages. For normal day to day -package management there are several frontends available, like +package management there are several frontends available, such as .BR aptitude (8) for the command line or -.BR synaptic (8)for X-Windows. Some options are only implemented in -.BR apt-get (8) though. +.BR synaptic (8) +for the X Window System. Some options are only implemented in +.BR apt-get (8) +though. .SH OPTIONS None. .SH FILES @@ -35,6 +37,7 @@ None. .BR apt-get (8), .BR apt.conf (5), .BR sources.list (5), +.BR apt_preferences (5), .BR apt-secure (8) .SH DIAGNOSTICS apt returns zero on normal operation, decimal 100 on error. diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 64724f211..ce7012460 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -75,6 +75,9 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <filename>&docdir;examples/apt.conf</filename> &configureindex; is a good guide for how it should look.</para> + <para>The names of the configuration items are not case-sensitive. So in the previous example + you could use <literal>dpkg::pre-install-pkgs</literal>.</para> + <para>Two specials are allowed, <literal>#include</literal> and <literal>#clear</literal> <literal>#include</literal> will include the given file, unless the filename ends in a slash, then the whole directory is included. @@ -98,6 +101,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; compiled for.</para></listitem> </varlistentry> + <varlistentry><term>Default-Release</term> + <listitem><para>Default release to install packages from if more than one + version available. Contains release name or release version. Examples: 'stable', 'testing', 'unstable', '4.0', '5.0*'. Release codenames ('etch', 'lenny' etc.) are not allowed now. See also &apt-preferences;.</para></listitem> + </varlistentry> + <varlistentry><term>Ignore-Hold</term> <listitem><para>Ignore Held packages; This global option causes the problem resolver to ignore held packages in its decision making.</para></listitem> @@ -158,6 +166,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; and the URI handlers. <variablelist> + <varlistentry><term>PDiffs</term> + <listitem><para>Try do download deltas called <literal>PDiffs</literal> for + Packages or Sources files instead of downloading whole ones. True + by default.</para></listitem> + </varlistentry> + <varlistentry><term>Queue-Mode</term> <listitem><para>Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</literal> or <literal>access</literal> which determines how APT parallelizes outgoing diff --git a/doc/apt.ent b/doc/apt.ent index 44e303495..6594ba1b3 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -57,8 +57,8 @@ </citerefentry>" > -<!ENTITY apt-archive "<citerefentry> - <refentrytitle><filename>apt-archive</filename></refentrytitle> +<!ENTITY apt-ftparchive "<citerefentry> + <refentrytitle><filename>apt-ftparchive</filename></refentrytitle> <manvolnum>1</manvolnum> </citerefentry>" > @@ -141,14 +141,26 @@ <manvolnum>1</manvolnum> </citerefentry>" > - + +<!ENTITY gnome-apt "<citerefentry> + <refentrytitle><command>gnome-apt</command></refentrytitle> + <manvolnum>1</manvolnum> + </citerefentry>" +> + +<!ENTITY wajig "<citerefentry> + <refentrytitle><command>wajig</command></refentrytitle> + <manvolnum>1</manvolnum> + </citerefentry>" +> + <!-- Boiler plate docinfo section --> <!ENTITY apt-docinfo " <refentryinfo> <address><email>apt@packages.debian.org</email></address> <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author> <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright> - <date>14 December 2003</date> + <date>28 October 2008</date> <productname>Linux</productname> </refentryinfo> @@ -207,6 +219,12 @@ <productname>Linux</productname> "> +<!ENTITY apt-qapage " + <para> + <ulink url='http://packages.qa.debian.org/a/apt.html'>QA Page</ulink> + </para> +"> + <!-- Boiler plate Bug reporting section --> <!ENTITY manbugs " <refsect1><title>Bugs</title> @@ -259,6 +277,8 @@ <term><option>--option</option></term> <listitem><para>Set a Configuration Option; This will set an arbitrary configuration option. The syntax is <option>-o Foo::Bar=bar</option>. + <option>-o</option> and <option>--option</option> can be used multiple + times to set different options. </para> </listitem> </varlistentry> diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index c55bb4ee2..162c2f00e 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -60,6 +60,9 @@ belongs. It is possible to single out a distribution, "the target release", which receives a higher priority than other distributions do by default. The target release can be set on the <command>apt-get</command> command line or in the APT configuration file <filename>/etc/apt/apt.conf</filename>. +Note that this has precedence over any general priority you set in the +<filename>/etc/apt/preferences</filename> file described later, but not +over specifically pinned packages. For example, <programlisting> diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 8e80a95a3..5cc6187a8 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -1,4 +1,3 @@ -// $Id: configure-index,v 1.10 2004/07/17 19:37:16 mdz Exp $ /* This file is an index of all APT configuration directives. It should NOT actually be used as a real config file, though it is (except for the last line) a completely valid file. Most of the options have sane default @@ -25,13 +24,14 @@ APT Architecture "i386"; Build-Essential "build-essential"; - NeverAutoRemove { "linux-kernel.*"; }; // packages that should never + NeverAutoRemove { "linux-image.*"; }; // packages that should never // considered for autoRemove // Options for apt-get Get { Arch-Only "false"; + AllowUnauthenticated "false"; AutomaticRemove "false"; HideAutoRemove "false"; Download-Only "false"; @@ -104,7 +104,7 @@ APT // consider Recommends, Suggests as important dependencies that should // be installed by default - Install-Recommends "false"; + Install-Recommends "true"; Install-Suggests "false"; // install recommends automatically for packages in this section diff --git a/doc/fr/apt-secure.fr.8.xml b/doc/fr/apt-secure.fr.8.xml index 5cec9a49d..25b5ffd09 100644 --- a/doc/fr/apt-secure.fr.8.xml +++ b/doc/fr/apt-secure.fr.8.xml @@ -188,7 +188,7 @@ les deux premires tapes. <refsect1><title>Voir aussi</title> <para> -&apt-conf;, &apt-get;,&sources-list;, &apt-key;, &apt-archive;, &debsign;, +&apt-conf;, &apt-get;,&sources-list;, &apt-key;, &apt-ftparchive;, &debsign;, &debsig-verify;, &gpg; </para> diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr index d705b9e3e..651100497 100644 --- a/doc/fr/apt.ent.fr +++ b/doc/fr/apt.ent.fr @@ -56,8 +56,8 @@ </citerefentry>" > -<!ENTITY apt-archive "<citerefentry> - <refentrytitle><filename>apt-archive</filename></refentrytitle> +<!ENTITY apt-ftparchive "<citerefentry> + <refentrytitle><filename>apt-ftparchive</filename></refentrytitle> <manvolnum>1</manvolnum> </citerefentry>" > diff --git a/doc/ja/apt-secure.ja.8.xml b/doc/ja/apt-secure.ja.8.xml index 5b9612a7f..20c57fb16 100644 --- a/doc/ja/apt-secure.ja.8.xml +++ b/doc/ja/apt-secure.ja.8.xml @@ -282,7 +282,7 @@ <listitem><para><literal>Create a toplevel Release file</literal>. if it does not exist already. You can do this by running <command>apt-ftparchive release</command> - (provided inftp apt-utils).</para></listitem> + (provided in package apt-utils).</para></listitem> --> <listitem><para><literal>上位 Release ファイルの作成</literal> 既にこれが存在しているのでなければ、 @@ -325,7 +325,7 @@ --> <refsect1><title>関連項目</title> <para> -&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;, +&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, &debsign; &debsig-verify;, &gpg; </para> diff --git a/doc/ja/apt.ent.ja b/doc/ja/apt.ent.ja index 3fa931ae5..1d1c36b1e 100644 --- a/doc/ja/apt.ent.ja +++ b/doc/ja/apt.ent.ja @@ -56,8 +56,8 @@ </citerefentry>" > -<!ENTITY apt-archive "<citerefentry> - <refentrytitle><filename>apt-archive</filename></refentrytitle> +<!ENTITY apt-ftparchive "<citerefentry> + <refentrytitle><filename>apt-ftparchive</filename></refentrytitle> <manvolnum>1</manvolnum> </citerefentry>" > @@ -296,7 +296,7 @@ <term><option>-o</option></term> <term><option>--option</option></term> <!-- - <listitem><para>Set a Configuration Option; This will set an arbitary + <listitem><para>Set a Configuration Option; This will set an arbitrary configuration option. The syntax is <option>-o Foo::Bar=bar</option>. </para> --> diff --git a/doc/makefile b/doc/makefile index 8a8a04c03..6ea1c1343 100644 --- a/doc/makefile +++ b/doc/makefile @@ -20,7 +20,7 @@ INCLUDES = apt.ent include $(XML_MANPAGE_H) # Examples -SOURCE = examples/apt.conf examples/sources.list examples/configure-index +SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf TO = $(DOC) TARGET = binary include $(COPY_H) diff --git a/doc/offline.sgml b/doc/offline.sgml index e973801ba..99e260bc3 100644 --- a/doc/offline.sgml +++ b/doc/offline.sgml @@ -44,7 +44,9 @@ archive but can easily fit a subset large enough for most users. The idea is to use APT to generate a list of packages that are required and then fetch them onto the disc using another machine with good connectivity. It is even possible to use another Debian machine with APT or to use a completely -different OS and a download tool like wget. +different OS and a download tool like wget. Let <em>remote host</em> mean the +machine downloading the packages, and <em>target host</em> the one with bad or +no connection. <p> This is achieved by creatively manipulating the APT configuration file. The @@ -87,9 +89,9 @@ download. The disk directory structure should look like: The configuration file should tell APT to store its files on the disc and to use the configuration files on the disc as well. The sources.list should contain the proper sites that you wish to use from the remote machine, and -the status file should be a copy of <em>/var/lib/dpkg/status</em>. Please note, -if you are using a local archive you must use copy URIs, the syntax is identical -to file URIs. +the status file should be a copy of <em>/var/lib/dpkg/status</em> from the +<em>target host</em>. Please note, if you are using a local archive you must use +copy URIs, the syntax is identical to file URIs. <p> <em>apt.conf</em> must contain the necessary information to make APT use the @@ -99,7 +101,7 @@ disc: APT { /* This is not necessary if the two machines are the same arch, it tells - the remote APT what architecture the Debian machine is */ + the remote APT what architecture the target machine is */ Architecture "i386"; Get::Download-Only "true"; @@ -125,7 +127,7 @@ More details can be seen by examining the apt.conf man page and the sample configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>. <p> -On the remote Debian machine the first thing to do is mount the disc and copy +On the target machine the first thing to do is mount the disc and copy <em>/var/lib/dpkg/status</em> to it. You will also need to create the directories outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</em> Then take the disc to the remote machine and configure the sources.list. @@ -136,7 +138,7 @@ On the remote machine execute the following: # apt-get update [ APT fetches the package files ] # apt-get dist-upgrade - [ APT fetches all the packages needed to upgrade your machine ] + [ APT fetches all the packages needed to upgrade the target machine ] </example> The dist-upgrade command can be replaced with any-other standard APT commands, @@ -146,7 +148,7 @@ selections back to the local computer. <p> Now the disc contains all of the index files and archives needed to upgrade -the Debian machine. Take the disc back and run: +the target machine. Take the disc back and run: <example> # export APT_CONFIG="/disc/apt.conf" diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index e47418b27..b875086ef 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -48,9 +48,12 @@ <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> @@ -115,7 +118,8 @@ deb http://http.us.debian.org/debian dists/stable-updates/ <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> @@ -163,8 +167,8 @@ 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 - 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> |