diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-cache.8.xml | 9 | ||||
| -rw-r--r-- | doc/apt-get.8.xml | 6 | ||||
| -rw-r--r-- | doc/apt-key.8.xml | 23 | ||||
| -rw-r--r-- | doc/apt-mark.8.xml | 2 | ||||
| -rw-r--r-- | doc/apt.8 | 8 | ||||
| -rw-r--r-- | doc/apt.ent | 2 | ||||
| -rw-r--r-- | doc/apt_preferences.5.xml | 3 | ||||
| -rw-r--r-- | doc/ja/apt-secure.ja.8.xml | 2 | ||||
| -rw-r--r-- | doc/ja/apt.ent.ja | 2 | ||||
| -rw-r--r-- | doc/offline.sgml | 18 |
10 files changed, 57 insertions, 18 deletions
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index c1e65332d..6416f4edf 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -197,9 +197,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> diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 329a46c51..2ea6ea1d4 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -371,8 +371,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>. 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 --> @@ -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 diff --git a/doc/apt.ent b/doc/apt.ent index 44e303495..b7d03b585 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -259,6 +259,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/ja/apt-secure.ja.8.xml b/doc/ja/apt-secure.ja.8.xml index 5b9612a7f..e20b86561 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> 既にこれが存在しているのでなければ、 diff --git a/doc/ja/apt.ent.ja b/doc/ja/apt.ent.ja index 3fa931ae5..d63342461 100644 --- a/doc/ja/apt.ent.ja +++ b/doc/ja/apt.ent.ja @@ -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/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" |