summaryrefslogtreecommitdiff
path: root/doc/examples/configure-index
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-02-21 16:46:31 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2008-02-21 16:46:31 +0100
commit7810fc042d4d3dda6b2c721d09d3eb7eadc12e2d (patch)
tree243a6de124c8a38e106015bf78dd3e5c70e22bc4 /doc/examples/configure-index
parentbd668fbb93a536135f8a001f98a7485158a5075f (diff)
parente3a1f08d41bf6ef6a42bbc6e5f8e20f7b4aa37a0 (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/examples/configure-index')
-rw-r--r--doc/examples/configure-index6
1 files changed, 3 insertions, 3 deletions
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
};
};