diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-get.8.xml | 11 | ||||
| -rw-r--r-- | doc/apt-key.8.xml | 87 | ||||
| -rw-r--r-- | doc/es/makefile | 3 | ||||
| -rw-r--r-- | doc/fr/makefile | 3 | ||||
| -rw-r--r-- | doc/makefile | 4 | ||||
| -rw-r--r-- | doc/vendors.list.5.xml | 115 |
6 files changed, 100 insertions, 123 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 24083aeb8..ac84f342a 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -279,8 +279,8 @@ <term><option>--assume-yes</option></term> <listitem><para>Automatic yes to prompts; assume "yes" as answer to all prompts and run non-interactively. If an undesirable situation, such as changing a held - package or removing an essential package occurs then <literal>apt-get</literal> - will abort. + package, trying to install a unauthenticated package or removing an essential package + occurs then <literal>apt-get</literal> will abort. Configuration Item: <literal>APT::Get::Assume-Yes</literal>.</para></listitem> </varlistentry> @@ -403,7 +403,14 @@ <listitem><para>Only process architecture-dependent build-dependencies. Configuration Item: <literal>APT::Get::Arch-Only</literal>.</para></listitem> </varlistentry> + + <varlistentry><term><option>--allow-unauthenticated</option></term> + <listitem><para>Ignore if packages can't be authenticated and don't prompt about it. + This is usefull for tools like pbuilder. + Configuration Item: <literal>APT::Get::AllowUnauthenticated</literal>.</para></listitem> + </varlistentry> + &apt-commonoptions; </variablelist> diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml new file mode 100644 index 000000000..62686618a --- /dev/null +++ b/doc/apt-key.8.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent"> +%aptent; + +]> + +<refentry> + &apt-docinfo; + + <refmeta> + <refentrytitle>apt-key</refentrytitle> + <manvolnum>8</manvolnum> + </refmeta> + + <!-- Man page title --> + <refnamediv> + <refname>apt-key</refname> + <refpurpose>APT key management utility</refpurpose> + </refnamediv> + + <!-- Arguments --> + <refsynopsisdiv> + <cmdsynopsis> + <command>apt-key</command> + <arg><replaceable>command</replaceable>/</arg> + <arg rep="repeat"><option><replaceable>arguments</replaceable></option></arg> + </cmdsynopsis> + </refsynopsisdiv> + + <refsect1><title>Description</title> + <para> + <command>apt-key</command> is used to manage the list of keys used + by apt to authenticate packages. Packages which have been + authenticated using these keys will be considered trusted. + </para> +</refsect1> + +<refsect1><title>Commands</title> + <variablelist> + <varlistentry><term>add <replaceable>filename</replaceable></term> + <listitem> + <para> + + Add a new key to the list of trusted keys. The key is read + from <replaceable>filename</replaceable>, or standard input if + <replaceable>filename</replaceable> is <literal>-</literal>. + </para> + + </listitem> + </varlistentry> + + <varlistentry><term>del <replaceable>keyid</replaceable></term> + <listitem> + <para> + + Remove a key from the list of trusted keys. + + </para> + + </listitem> + </varlistentry> + + <varlistentry><term>list</term> + <listitem> + <para> + + List trusted keys. + </para> + + </listitem> + </varlistentry> + </variablelist> +</refsect1> + +<!-- <refsect1><title>See Also</title> --> +<!-- <para> --> +<!-- &apt-conf;, &apt-get;, &sources-list; --> +<!-- </refsect1> --> + + &manbugs; + &manauthor; + +</refentry> + diff --git a/doc/es/makefile b/doc/es/makefile index 579a60fcc..81a410c5c 100644 --- a/doc/es/makefile +++ b/doc/es/makefile @@ -7,7 +7,6 @@ include ../../buildlib/defaults.mak # Man pages SOURCE = apt-cache.es.8 apt-get.es.8 apt-cdrom.es.8 apt.conf.es.5 \ - sources.list.es.5 apt-config.es.8 apt_preferences.es.5 \ - vendors.list.es.5 + sources.list.es.5 apt-config.es.8 apt_preferences.es.5 INCLUDES = apt.ent.es include $(SGML_MANPAGE_H) diff --git a/doc/fr/makefile b/doc/fr/makefile index e0dd31c1f..2b9278457 100644 --- a/doc/fr/makefile +++ b/doc/fr/makefile @@ -8,7 +8,6 @@ include ../../buildlib/defaults.mak # Man pages SOURCE = apt-cache.fr.8 apt-get.fr.8 apt-cdrom.fr.8 apt.conf.fr.5 \ sources.list.fr.5 apt-config.fr.8 apt-sortpkgs.fr.1 \ - apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1 \ - vendors.list.fr.5 + apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1 INCLUDES = apt.ent.fr include $(SGML_MANPAGE_H) diff --git a/doc/makefile b/doc/makefile index ace9010df..f34b3f6e5 100644 --- a/doc/makefile +++ b/doc/makefile @@ -13,8 +13,8 @@ include $(DEBIANDOC_H) # XML man pages SOURCE = apt-cache.8 apt-get.8 apt-cdrom.8 apt.conf.5 sources.list.5 \ - apt-config.8 apt_preferences.5 vendors.list.5 \ - apt-sortpkgs.1 apt-ftparchive.1 apt-extracttemplates.1 + apt-config.8 apt_preferences.5 \ + apt-sortpkgs.1 apt-ftparchive.1 apt-extracttemplates.1 apt-key.8 INCLUDES = apt.ent include $(XML_MANPAGE_H) diff --git a/doc/vendors.list.5.xml b/doc/vendors.list.5.xml deleted file mode 100644 index 7e03eefc7..000000000 --- a/doc/vendors.list.5.xml +++ /dev/null @@ -1,115 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="no"?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ - -<!ENTITY % aptent SYSTEM "apt.ent"> -%aptent; - -]> - -<refentry> - - <refentryinfo> - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - <!-- The last update date --> - <date>29 February 2004</date> - </refentryinfo> - - <refmeta> - <refentrytitle>vendors.list</refentrytitle> - <manvolnum>5</manvolnum> - </refmeta> - - <!-- Man page title --> - <refnamediv> - <refname>vendors.list</refname> - <refpurpose>Security key configuration for APT</refpurpose> - </refnamediv> - - <refsect1><title>Description</title> - - <para>The package vendor list contains a list of all vendors - from whom you wish to authenticate downloaded packages. - For each vendor listed, it must contain the corresponding - PGP key fingerprint, so that APT can perform signature - verification of the release file and subsequent checking - of the checksums of each downloaded package. - To have authentication enabled, you must add the - vendor identification string (see below) enclosed in - square braces to the sources.list line for all sites that mirror - the repository provided by that vendor.</para> - - <para>The format of this file is similar to the one used by - apt.conf. It consists of an arbitrary number of blocks of - vendors, where each block starts with a string telling the - <replaceable>key_type</replaceable> and the - <replaceable>vendor_id</replaceable></para> - - <para>Some vendors may have multiple blocks that define different - security policies for their distributions. Debian for instance - uses a different signing methodology for stable and unstable releases.</para> - <para><replaceable>key_type</replaceable> is the type of the check required. - Currently, there is only one type available which is - <literal>simple-key</literal>.</para> - - <para><replaceable>vendor_id</replaceable> is the vendor identification - string. It is an arbitrary string you must supply to uniquely identifify a - vendor that's listed in this file. - - Example: - </para> -<informalexample><programlisting> -simple-key "joe" -{ - Fingerprint "0987AB4378FSD872343298787ACC"; - Name "Joe Shmoe <joe@shmoe.com>"; -} -</programlisting></informalexample> - </refsect1> - - <refsect1><title>The simple-key type</title> - - <para>This type of verification is used when the vendor has a single - secured key that must be used to sign the Release file. The - following items should be present</para> - - <variablelist> - <varlistentry><term>Fingerprint</term> - <listitem><para> - The PGP fingerprint for the key. The fingerprint should be - expressed in the standard notion with or without spaces. - The <option>--fingerprint</option> option for - <citerefentry><refentrytitle><command>gpg</command></refentrytitle><manvolnum>1</manvolnum></citerefentry> - will show the fingerprint for the selected keys(s). - </para> - </listitem> - </varlistentry> - - <varlistentry><term>Name</term> - <listitem><para> - A string containing a description of the owner of - the key or vendor. You may put the vendor name and it's - email. The string must be quoted with ". - </para> - </listitem> - </varlistentry> - - </variablelist> - </refsect1> - - <refsect1><title>Files</title> - <para><filename>/etc/apt/vendors.list</filename></para> - </refsect1> - - <refsect1><title>See Also</title> - <para>&sources-list; - </para> - </refsect1> - - &manbugs; - -</refentry> - |