diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-02-21 16:46:31 +0100 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-02-21 16:46:31 +0100 |
commit | 7810fc042d4d3dda6b2c721d09d3eb7eadc12e2d (patch) | |
tree | 243a6de124c8a38e106015bf78dd3e5c70e22bc4 /doc | |
parent | bd668fbb93a536135f8a001f98a7485158a5075f (diff) | |
parent | e3a1f08d41bf6ef6a42bbc6e5f8e20f7b4aa37a0 (diff) |
* Fix typos in manpages. Thanks to Daniel Leidert for the fixes
Closes: #444922
[ Raise urgency to critical since it fixes a critical but for Debian
Installer Lenny Beta1 release ]
- Vietnamese updated. Closes: #460825
- Basque updated. Closes: #461166
- Galician updated. Closes: #461468
- Portuguese updated. Closes: #464575
- Korean updated. Closes: #448430
- Simplified Chinese updated. Closes: #465866
* Applied patch from Robert Millan <rmh@aybabtu.com> to fix the error
message when gpgv isn't installed, closes: #452640.
* Fix regression about APT::Get::List-Cleanup setting being ignored,
closes: #466052.
* Fix compilation warnings in apt-pkg/cdrom.cc and
apt-pkg/contrib/configuration.cc.
* Fix typo in debian/copyright file ("licened" instead of "licensed"),
closes: #458966.
- Vietnamese updated. Closes: #453774, #459013
- Simplified Chinese updated. Closes: #458039
- Norwegian Bokmål updated. Closes: #457917
* Fix wording for "After unpacking...". Thanks to Michael Gilbert
Diffstat (limited to 'doc')
-rw-r--r-- | doc/apt-ftparchive.1.xml | 2 | ||||
-rw-r--r-- | doc/apt-get.8.xml | 2 | ||||
-rw-r--r-- | doc/apt-mark.8.xml | 2 | ||||
-rw-r--r-- | doc/apt-secure.8.xml | 4 | ||||
-rw-r--r-- | doc/apt.conf.5.xml | 8 | ||||
-rw-r--r-- | doc/apt.ent | 2 | ||||
-rw-r--r-- | doc/apt_preferences.5.xml | 2 | ||||
-rw-r--r-- | doc/examples/configure-index | 6 |
8 files changed, 14 insertions, 14 deletions
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 8cfbc72e9..de7e5f7a3 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -327,7 +327,7 @@ Specifies that instead of walking the directory tree, <command>apt-ftparchive</command> should read the list of files from the given file. Relative files names are prefixed with the archive directory. - This is used when processing source indexs.</para></listitem> + This is used when processing source indexes.</para></listitem> </varlistentry> </variablelist> </refsect2> diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 1bd21a5df..329a46c51 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -425,7 +425,7 @@ <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. + This is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::AllowUnauthenticated</literal>.</para></listitem> </varlistentry> diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index 5af27a337..812fc406a 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -47,7 +47,7 @@ <para> When you request that a package is installed, and as a result other packages are installed to satisfy its dependencies, the - depedencies are marked as being automatically installed. Once + dependencies are marked as being automatically installed. Once these automatically installed packages are no longer depended on by any manually installed packages, they will be removed. </para> diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index fa13ddc0f..01b157789 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -159,7 +159,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 apt-utils).</para></listitem> <listitem><para><literal>Sign it</literal>. You can do this by running <command>gpg -abs -o Release.gpg Release</command>.</para></listitem> @@ -183,7 +183,7 @@ &debsign; &debsig-verify;, &gpg; </para> -<para>For more backgound information you might want to review the +<para>For more background information you might want to review the <ulink url="http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html">Debian Security Infrastructure</ulink> chapter of the Securing Debian Manual diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 5bc6c55db..64724f211 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -46,7 +46,7 @@ the APT tool group, for the Get tool. options do not inherit from their parent groups.</para> - <para>Syntacticly the configuration language is modeled after what the ISC tools + <para>Syntactically the configuration language is modeled after what the ISC tools such as bind and dhcp use. Lines starting with <literal>//</literal> are treated as comments (ignored). Each line is of the form @@ -214,7 +214,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; configuration file. This entry specifies the commands to send to tell the proxy server what to connect to. Please see &configureindex; for an example of - how to do this. The subsitution variables available are + how to do this. The substitution variables available are <literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's respective URI component.</para> @@ -235,7 +235,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; not recommended to use FTP over HTTP due to its low efficiency.</para> <para>The setting <literal>ForceExtended</literal> controls the use of RFC2428 - <literal>EPSV</literal> and <literal>EPRT</literal> commands. The defaut is false, which means + <literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is false, which means these commands are only used if the control connection is IPv6. Setting this to true forces their use even on IPv4 connections. Note that most FTP servers do not support RFC2428.</para></listitem> @@ -276,7 +276,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <literal>pkgcache</literal> as well as the location to place downloaded archives, <literal>Dir::Cache::archives</literal>. Generation of caches can be turned off by setting their names to be blank. This will slow down startup but - save disk space. It is probably prefered to turn off the pkgcache rather + save disk space. It is probably preferred to turn off the pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the default directory is contained in <literal>Dir::Cache</literal></para> diff --git a/doc/apt.ent b/doc/apt.ent index 99fe443cf..44e303495 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -257,7 +257,7 @@ <varlistentry> <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> </listitem> diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index ab0107d36..3f8d4568d 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -422,7 +422,7 @@ one or more lines beginning with the word <literal>Explanation:</literal>. This provides a place for comments.</para> <para>The <literal>Pin-Priority:</literal> line in each APT preferences record is -optional. If omitted, APT assigs a priority of 1 less than the last value +optional. If omitted, APT assigns a priority of 1 less than the last value specified on a line beginning with <literal>Pin-Priority: release ...</literal>.</para> </refsect2> </refsect1> diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 8893b5b74..c20011c9c 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -2,7 +2,7 @@ /* 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 - values, unless you have specific needs you should NOT include arbitary + values, unless you have specific needs you should NOT include arbitrary items in a custom configuration. In some instances involving filenames it is possible to set the default @@ -170,7 +170,7 @@ Acquire Timeout "120"; /* Passive mode control, proxy, non-proxy and per-host. Pasv mode - is prefered if possible */ + is preferred if possible */ Passive "true"; Proxy::Passive "true"; Passive::http.us.debian.org "true"; // Specific per-host setting @@ -190,7 +190,7 @@ Acquire gpgv { - Options {"--ignore-time-conflict";} // not very usefull on a normal system + Options {"--ignore-time-conflict";} // not very useful on a normal system }; }; |