Fix various typos in the documentation

2 years ago · 9a702b150c
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -989,7 +989,7 @@ static time_t timegm(struct tm *t)
 }
 #endif
 									/*}}}*/
 // RFC1123StrToTime - Converts a HTTP1.1 full date strings into a time_t	/*{{{*/
 // RFC1123StrToTime - Converts an HTTP1.1 full date strings into a time_t	/*{{{*/
 // ---------------------------------------------------------------------
 /* tries to parses a full date as specified in RFC7231 §7.1.1.1
   with one exception: HTTP/1.1 valid dates need to have GMT as timezone.
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -356,7 +356,7 @@
                   <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, trying to install a unauthenticated package or removing an essential package 
     package, trying to install an 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>
@@ -413,7 +413,7 @@
     <varlistentry><term><option>--with-new-pkgs</option></term>
     <listitem><para>Allow installing new packages when used in
     conjunction with <literal>upgrade</literal>.  This is useful if
     the update of a installed package requires new dependencies to be
     the update of an installed package requires new dependencies to be
     installed. Instead of holding the package back <literal>upgrade</literal>
     will upgrade the package and install the new dependencies. Note that
     <literal>upgrade</literal> with this option will never remove packages,
--- a/doc/design.dbk
+++ b/doc/design.dbk
@@ -262,7 +262,7 @@ dependencies)
 <para>
 Build a list of events. Simple topological sorting gives order of packages
 in dependency order. At certain points in this ordering,
 predependencies/immediate configure directives cause an break in normal
 predependencies/immediate configure directives cause a break in normal
 ordering. We need to insert the uninstall/purge directive in the stream
 (default: as early as possible).
 </para>
--- a/doc/dpkg-tech.dbk
+++ b/doc/dpkg-tech.dbk
@@ -271,7 +271,7 @@ successful.
 <term>half-installed</term>
 <listitem>
 <para>
 An attempt was made to remove the packagem but there was a failure in the
 An attempt was made to remove the package but there was a failure in the
 prerm script.
 </para>
 </listitem>
@@ -803,7 +803,7 @@ These files are created internally by dpkg's "checkpoint" function, and are
 cleaned up when dpkg exits cleanly.
 </para>
 <para>
 Juding by the use of the updates directory I would call it a Journal. Inorder
 Judging by the use of the updates directory I would call it a Journal. Inorder
 to efficiently ensure the complete integrity of the status file dpkg will
 "checkpoint" or journal all of it's activities in the updates directory. By
 merging the contents of the updates directory (in order!!) against the original
--- a/doc/guide.dbk
+++ b/doc/guide.dbk
@@ -231,7 +231,7 @@ use packages on your CD-ROM before downloading from the Internet.
 </screen>
 <para>
 The <emphasis>Sources</emphasis> setup starts by asking for the base of the
 Debian archive, defaulting to a HTTP mirror. Next it asks for the distribution
 Debian archive, defaulting to an HTTP mirror. Next it asks for the distribution
 to get.
 </para>
 <screen>
--- a/doc/libapt-pkg2_to_3.txt
+++ b/doc/libapt-pkg2_to_3.txt
@@ -1,5 +1,5 @@
 libapt-pkg v2 to v3 incorporates several source-incompatible changes
 that people need to be aware of.. Many of this changes are done so that
 that people need to be aware of.. Many of these changes are done so that
 most old source will continue to function, but perhaps at reduced
 functionality.

@@ -34,12 +34,12 @@ functionality.
  by the Cache or _system structures.
 * Initialization is now two stage (define APT_COMPATIBILITY..) The first
  stage, pkgInitConfig is called before commandline parsing, and
  pkgInitSystem is called after. This gives the user the oppertunity to
  pkgInitSystem is called after. This gives the user the opportunity to
  override default settings from the config files before startup has been
  finalized.
 * pkgSourceList has been gutted. All the junk that was in there before is
  cleaned up and put in the pkgIndexFile class. There is very little API
  corrispondence here.. 
  correspondence here..
 * pkgMakeStatusCacheMem is gone, pkgMakeStatusCache does the same thing if
  you set the AllowMem flag. Also, you can get a copy of the map used to
  store the cache to advoid having to remap it in the calling code. A bunch
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -1162,7 +1162,7 @@ msgstr ""
 msgid ""
 "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, trying to install a unauthenticated package or removing an "
 "package, trying to install an unauthenticated package or removing an "
 "essential package occurs then <literal>apt-get</literal> will abort.  "
 "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
 msgstr ""
@@ -1229,7 +1229,7 @@ msgstr ""
 #: apt-get.8.xml
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
 "<literal>upgrade</literal>.  This is useful if the update of an installed "
 "package requires new dependencies to be installed. Instead of holding the "
 "package back <literal>upgrade</literal> will upgrade the package and install "
 "the new dependencies. Note that <literal>upgrade</literal> with this option "
@@ -8003,7 +8003,7 @@ msgstr ""
 #: guide.dbk
 msgid ""
 "The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
 "Debian archive, defaulting to a HTTP mirror. Next it asks for the "
 "Debian archive, defaulting to an HTTP mirror. Next it asks for the "
 "distribution to get."
 msgstr ""

--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -1593,7 +1593,7 @@ msgstr ""
 msgid ""
 "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, trying to install a unauthenticated package or removing an "
 "package, trying to install an unauthenticated package or removing an "
 "essential package occurs then <literal>apt-get</literal> will abort.  "
 "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
 msgstr ""
@@ -1692,7 +1692,7 @@ msgstr ""
 #: apt-get.8.xml
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
 "<literal>upgrade</literal>.  This is useful if the update of an installed "
 "package requires new dependencies to be installed. Instead of holding the "
 "package back <literal>upgrade</literal> will upgrade the package and install "
 "the new dependencies. Note that <literal>upgrade</literal> with this option "
@@ -11523,7 +11523,7 @@ msgstr ""
 #: guide.dbk
 msgid ""
 "The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
 "Debian archive, defaulting to a HTTP mirror. Next it asks for the "
 "Debian archive, defaulting to an HTTP mirror. Next it asks for the "
 "distribution to get."
 msgstr ""
 "Das Einrichten der <emphasis>Quellen</emphasis> beginnt durch das Erfragen "
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -1634,7 +1634,7 @@ msgstr ""
 msgid ""
 "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, trying to install a unauthenticated package or removing an "
 "package, trying to install an unauthenticated package or removing an "
 "essential package occurs then <literal>apt-get</literal> will abort.  "
 "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
 msgstr ""
@@ -1752,7 +1752,7 @@ msgstr ""
 #: apt-get.8.xml
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
 "<literal>upgrade</literal>.  This is useful if the update of an installed "
 "package requires new dependencies to be installed. Instead of holding the "
 "package back <literal>upgrade</literal> will upgrade the package and install "
 "the new dependencies. Note that <literal>upgrade</literal> with this option "
@@ -9991,7 +9991,7 @@ msgid ""
 "from polluting its cache with (big) .deb files."
 msgstr ""
 "Se proporcionan tres opciones de configuración para el control de la caché "
 "con proxy cachés conformes a HTTP/1.1. <literal>No-Cache</literal> indica al "
 "con proxy cachés conformes an HTTP/1.1. <literal>No-Cache</literal> indica al "
 "proxy que nunca utilice la respuesta cacheada. <literal>Max-Age</literal> "
 "define la máxima antigüedad permitida (en segundos) de un fichero de índice "
 "en la caché de un proxy. <literal>No-Store</literal> define que el proxy no "
@@ -11008,7 +11008,7 @@ msgstr ""
 #: guide.dbk
 msgid ""
 "The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
 "Debian archive, defaulting to a HTTP mirror. Next it asks for the "
 "Debian archive, defaulting to an HTTP mirror. Next it asks for the "
 "distribution to get."
 msgstr ""
 "La configuración de las <emphasis>fuentes</emphasis> comienza preguntando la "
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -1594,7 +1594,7 @@ msgstr ""
 msgid ""
 "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, trying to install a unauthenticated package or removing an "
 "package, trying to install an unauthenticated package or removing an "
 "essential package occurs then <literal>apt-get</literal> will abort.  "
 "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
 msgstr ""
@@ -1693,7 +1693,7 @@ msgstr ""
 #: apt-get.8.xml
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
 "<literal>upgrade</literal>.  This is useful if the update of an installed "
 "package requires new dependencies to be installed. Instead of holding the "
 "package back <literal>upgrade</literal> will upgrade the package and install "
 "the new dependencies. Note that <literal>upgrade</literal> with this option "
@@ -11480,7 +11480,7 @@ msgstr ""
 #: guide.dbk
 msgid ""
 "The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
 "Debian archive, defaulting to a HTTP mirror. Next it asks for the "
 "Debian archive, defaulting to an HTTP mirror. Next it asks for the "
 "distribution to get."
 msgstr ""
 "La configuration des <emphasis>Sources</emphasis> débute par l'indication de "
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -1634,7 +1634,7 @@ msgstr ""
 msgid ""
 "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, trying to install a unauthenticated package or removing an "
 "package, trying to install an unauthenticated package or removing an "
 "essential package occurs then <literal>apt-get</literal> will abort.  "
 "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
 msgstr ""
@@ -1732,7 +1732,7 @@ msgstr ""
 #: apt-get.8.xml
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
 "<literal>upgrade</literal>.  This is useful if the update of an installed "
 "package requires new dependencies to be installed. Instead of holding the "
 "package back <literal>upgrade</literal> will upgrade the package and install "
 "the new dependencies. Note that <literal>upgrade</literal> with this option "
@@ -10135,7 +10135,7 @@ msgid ""
 "from polluting its cache with (big) .deb files."
 msgstr ""
 "Sono fornite tre impostazioni per il controllo della cache in proxy con "
 "cache conformi a HTTP/1.1. <literal>No-Cache</literal> indica al proxy di "
 "cache conformi an HTTP/1.1. <literal>No-Cache</literal> indica al proxy di "
 "non usare la sua risposta in cache in nessuna circostanza. <literal>Max-Age</"
 "literal> imposta l'età massima consentita (in secondi) di un file indice "
 "nella cache del proxy. <literal>No-Store</literal> specifica che il proxy "
@@ -11188,7 +11188,7 @@ msgstr ""
 #: guide.dbk
 msgid ""
 "The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
 "Debian archive, defaulting to a HTTP mirror. Next it asks for the "
 "Debian archive, defaulting to an HTTP mirror. Next it asks for the "
 "distribution to get."
 msgstr ""
 "La configurazione delle <emphasis>fonti</emphasis> inizia chiedendo la base "
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -1584,7 +1584,7 @@ msgstr ""
 msgid ""
 "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, trying to install a unauthenticated package or removing an "
 "package, trying to install an unauthenticated package or removing an "
 "essential package occurs then <literal>apt-get</literal> will abort.  "
 "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
 msgstr ""
@@ -1677,7 +1677,7 @@ msgstr ""
 #: apt-get.8.xml
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
 "<literal>upgrade</literal>.  This is useful if the update of an installed "
 "package requires new dependencies to be installed. Instead of holding the "
 "package back <literal>upgrade</literal> will upgrade the package and install "
 "the new dependencies. Note that <literal>upgrade</literal> with this option "
@@ -10782,7 +10782,7 @@ msgstr ""
 #: guide.dbk
 msgid ""
 "The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
 "Debian archive, defaulting to a HTTP mirror. Next it asks for the "
 "Debian archive, defaulting to an HTTP mirror. Next it asks for the "
 "distribution to get."
 msgstr ""
 "<emphasis>ソース</emphasis>の準備は基礎となる Debian アーカイブの質問から始ま"
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -1664,7 +1664,7 @@ msgstr ""
 msgid ""
 "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, trying to install a unauthenticated package or removing an "
 "package, trying to install an unauthenticated package or removing an "
 "essential package occurs then <literal>apt-get</literal> will abort.  "
 "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
 msgstr ""
@@ -1765,7 +1765,7 @@ msgstr ""
 #: apt-get.8.xml
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
 "<literal>upgrade</literal>.  This is useful if the update of an installed "
 "package requires new dependencies to be installed. Instead of holding the "
 "package back <literal>upgrade</literal> will upgrade the package and install "
 "the new dependencies. Note that <literal>upgrade</literal> with this option "
@@ -11673,7 +11673,7 @@ msgstr ""
 #: guide.dbk
 msgid ""
 "The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
 "Debian archive, defaulting to a HTTP mirror. Next it asks for the "
 "Debian archive, defaulting to an HTTP mirror. Next it asks for the "
 "distribution to get."
 msgstr ""
 "Het instellen van de <emphasis>Sources</emphasis> (pakketbronnen) begint met "
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -1620,7 +1620,7 @@ msgstr ""
 msgid ""
 "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, trying to install a unauthenticated package or removing an "
 "package, trying to install an unauthenticated package or removing an "
 "essential package occurs then <literal>apt-get</literal> will abort.  "
 "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
 msgstr ""
@@ -1745,7 +1745,7 @@ msgstr ""
 #: apt-get.8.xml
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
 "<literal>upgrade</literal>.  This is useful if the update of an installed "
 "package requires new dependencies to be installed. Instead of holding the "
 "package back <literal>upgrade</literal> will upgrade the package and install "
 "the new dependencies. Note that <literal>upgrade</literal> with this option "
@@ -10169,7 +10169,7 @@ msgstr ""
 #: guide.dbk
 msgid ""
 "The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
 "Debian archive, defaulting to a HTTP mirror. Next it asks for the "
 "Debian archive, defaulting to an HTTP mirror. Next it asks for the "
 "distribution to get."
 msgstr ""
 "Ustawianie źródeł zaczyna się od pytania o bazową lokalizację Debiana. "
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -1600,7 +1600,7 @@ msgstr ""
 msgid ""
 "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, trying to install a unauthenticated package or removing an "
 "package, trying to install an unauthenticated package or removing an "
 "essential package occurs then <literal>apt-get</literal> will abort.  "
 "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
 msgstr ""
@@ -1702,7 +1702,7 @@ msgstr ""
 #: apt-get.8.xml
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
 "<literal>upgrade</literal>.  This is useful if the update of an installed "
 "package requires new dependencies to be installed. Instead of holding the "
 "package back <literal>upgrade</literal> will upgrade the package and install "
 "the new dependencies. Note that <literal>upgrade</literal> with this option "
@@ -10948,7 +10948,7 @@ msgstr ""
 #: guide.dbk
 msgid ""
 "The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
 "Debian archive, defaulting to a HTTP mirror. Next it asks for the "
 "Debian archive, defaulting to an HTTP mirror. Next it asks for the "
 "distribution to get."
 msgstr ""
 "A configuração de <emphasis>Sources</emphasis> começa por perguntar pela "
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -1143,7 +1143,7 @@ msgstr ""
 msgid ""
 "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, trying to install a unauthenticated package or removing an "
 "package, trying to install an unauthenticated package or removing an "
 "essential package occurs then <literal>apt-get</literal> will abort.  "
 "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
 msgstr ""
@@ -1210,7 +1210,7 @@ msgstr ""
 #: apt-get.8.xml
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
 "<literal>upgrade</literal>.  This is useful if the update of an installed "
 "package requires new dependencies to be installed. Instead of holding the "
 "package back <literal>upgrade</literal> will upgrade the package and install "
 "the new dependencies. Note that <literal>upgrade</literal> with this option "
@@ -8334,7 +8334,7 @@ msgstr ""
 #: guide.dbk
 msgid ""
 "The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
 "Debian archive, defaulting to a HTTP mirror. Next it asks for the "
 "Debian archive, defaulting to an HTTP mirror. Next it asks for the "
 "distribution to get."
 msgstr ""

--- a/test/integration/test-apt-get-source-authenticated
+++ b/test/integration/test-apt-get-source-authenticated
@@ -2,7 +2,7 @@
 #
 # Regression test for debian bug #749795. Ensure that we fail with
 # an error if apt-get source foo will download a source that comes
 # from a unauthenticated repository
 # from an unauthenticated repository
 #
 set -e

--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -464,7 +464,7 @@ static bool parseFirstLine(std::ostream &log, int const client, std::string cons
      closeConnection = strcasecmp(LookupTag(request, "Connection", "Keep-Alive").c_str(), "close") == 0;
   else
   {
      sendError(log, client, 500, request, sendContent, "Not a HTTP/1.{0,1} request", headers);
      sendError(log, client, 500, request, sendContent, "Not an HTTP/1.{0,1} request", headers);
      return false;
   }