* merge patch that enforces stricter https server certificate

[apt.git] / doc / examples / configure-index

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index cbede198bf1926f904ec73225f9dc10d1cc0e431..a6ad56067986a83c9f5b5abc6ff4de059d74095d 100644 (file)
--- 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
 /* 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
    items in a custom configuration.
    
    In some instances involving filenames it is possible to set the default


@@ -173,7 +173,7 @@ Acquire
     Timeout "120";
     
     /* Passive mode control, proxy, non-proxy and per-host. Pasv mode
     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
     Passive "true";
     Proxy::Passive "true";
     Passive::http.us.debian.org "true"; // Specific per-host setting


@@ -193,7 +193,7 @@ Acquire
 
   gpgv
   {
 
   gpgv
   {

-   Options {"--ignore-time-conflict";} // not very usefull on a normal system
+   Options {"--ignore-time-conflict";} // not very useful on a normal system

   };
 
   mirror
   };
 
   mirror