diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-patterns.7.xml | 46 | ||||
| -rw-r--r-- | doc/apt_auth.conf.5.xml | 14 |
2 files changed, 55 insertions, 5 deletions
diff --git a/doc/apt-patterns.7.xml b/doc/apt-patterns.7.xml index efd4293dc..219d2c209 100644 --- a/doc/apt-patterns.7.xml +++ b/doc/apt-patterns.7.xml @@ -61,6 +61,23 @@ </variablelist> </refsect1> <refsect1> + <title>Narrowing patterns</title> + <para> + </para> + <variablelist> + <varlistentry><term><code>?all-versions(PATTERN)</code></term> + <listitem><para>Selects packages where all versions match PATTERN. When matching versions instead, same as PATTERN.</para></listitem> + </varlistentry> + <varlistentry><term><code>?any-version(PATTERN)</code></term> + <listitem><para>Selects any version where the pattern matches on the version.</para> + <para>For example, while <code>?and(?version(1),?version(2))</code> matches a package which has one version containing 1 and one version containing 2, <code>?any-version(?and(?version(1),?version(2)))</code> restricts the <code>?and</code> to act on the same version.</para></listitem> + </varlistentry> + <varlistentry><term><code>?narrow(PATTERN...)</code></term> + <listitem><para>Selects any version matching all PATTERNs, short for<code>?any-version(?and(PATTERN...))</code>.</para></listitem> + </varlistentry> + </variablelist> + </refsect1> + <refsect1> <title>Package patterns</title> <para> These patterns select specific packages. @@ -106,6 +123,32 @@ </varlistentry> </variablelist> </refsect1> + <refsect1> + <title>Version patterns</title> + <para> + These patterns select specific versions of a package. + </para> + <variablelist> + <varlistentry><term><code>?archive(REGEX)</code></term> + <listitem><para>Selects versions that come from the archive that matches the specified regular expression. Archive, here, means the values after <code>a=</code> in <command>apt-cache policy</command>.</para></listitem> + </varlistentry> + <varlistentry><term><code>?origin(REGEX)</code></term> + <listitem><para>Selects versions that come from the origin that matches the specified regular expression. Origin, here, means the values after <code>o=</code> in <command>apt-cache policy</command>.</para></listitem> + </varlistentry> + <varlistentry><term><code>?section(REGEX)</code></term> + <listitem><para>Selects versions where the section matches the specified regular expression.</para></listitem> + </varlistentry> + <varlistentry><term><code>?source-package(REGEX)</code></term> + <listitem><para>Selects versions where the source package name matches the specified regular expression.</para></listitem> + </varlistentry> + <varlistentry><term><code>?source-version(REGEX)</code></term> + <listitem><para>Selects versions where the source package version matches the specified regular expression.</para></listitem> + </varlistentry> + <varlistentry><term><code>?version(REGEX)</code></term> + <listitem><para>Selects versions where the version string matching the specified regular expression.</para></listitem> + </varlistentry> + </variablelist> + </refsect1> <refsect1><title>Examples</title> @@ -147,6 +190,9 @@ <listitem> <para>A trailing comma is allowed in argument lists</para> </listitem> + <listitem> + <para>?narrow accepts infinite arguments</para> + </listitem> </itemizedlist> </refsect1> diff --git a/doc/apt_auth.conf.5.xml b/doc/apt_auth.conf.5.xml index e7961ef81..99394be00 100644 --- a/doc/apt_auth.conf.5.xml +++ b/doc/apt_auth.conf.5.xml @@ -50,7 +50,7 @@ Unknown tokens will be ignored. Tokens may be separated by spaces, tabs or newli <variablelist> <varlistentry> -<term><literal>machine</literal> <replaceable>hostname</replaceable>[:<replaceable>port</replaceable>][/<replaceable>path</replaceable>]</term> +<term><literal>machine</literal> <replaceable>[protocol://]</replaceable><replaceable>hostname</replaceable>[:<replaceable>port</replaceable>][/<replaceable>path</replaceable>]</term> <listitem><para>Entries are looked up by searching for the <emphasis><literal>machine</literal></emphasis> token matching the hostname of the URI apt needs login information for. Extending the netrc-format @@ -60,7 +60,8 @@ different login information reside on the same server. A machine token with a pa matches if the path in the URI starts with the path given in the token. Once a match is made, the subsequent tokens are processed, stopping when the end of file is reached or another <emphasis><literal>machine</literal></emphasis> -token is encountered.</para></listitem> +token is encountered.</para> +<para>If protocol is not specified, the entry only matches https and tor+https.</para></listitem> </varlistentry> <varlistentry> @@ -80,9 +81,9 @@ token is encountered.</para></listitem> <refsect1><title>Example</title> <para>Supplying login information for a user named <literal>apt</literal> with the password <literal>debian</literal> for the &sources-list; entry -<literallayout>deb http://example.org/debian &debian-stable-codename; main</literallayout> +<literallayout>deb https://example.org/debian &debian-stable-codename; main</literallayout> could be done in the entry directly: -<literallayout>deb http://apt:debian@example.org/debian &debian-stable-codename; main</literallayout> +<literallayout>deb https://apt:debian@example.org/debian &debian-stable-codename; main</literallayout> Alternatively an entry like the following in the auth.conf file could be used: <literallayout>machine example.org login apt @@ -95,7 +96,7 @@ machine example.org/debian login apt password debian machine example.org/debian/ login apt password debian </literallayout> On the other hand neither of the following lines apply: -<literallayout>machine example.org:80 login apt password debian +<literallayout>machine example.org:443 login apt password debian machine example.org/deb/ login apt password debian machine example.org/ubuntu login apt password debian machine example.orga login apt password debian @@ -111,6 +112,9 @@ also the implementation slightly. For maximum backward compatibility you should avoid multiple <literal>machine</literal> tokens with the same hostname, but if you need multiple they should all have a path specified in the <literal>machine</literal> token.</para> +<para>Login information in auth.conf are more flexible than those in sources.list. For +example, login information can be specified for parts of a repository only, or if the +sources.list entry redirects elsewhere, login information for the redirect destination can be supplied.</para> </refsect1> <refsect1> |