Philippe Batailler's man page patches.

Author: jgg
Date: 2001-03-24 22:44:43 GMT
Philippe Batailler's man page patches.

diff --git a/debian/changelog b/debian/changelog
index 83a44df1ed96fef9c96448fa20c9e0905c7d817b..4b780f3b3e708911406ea254cfa8cfdbceec54e2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ apt (0.5.4) unstable; urgency=low
   * Fix for AJ's 'desire to remove perl-5.005' and possibly other
     similar situations. Closes: #56708, #59432
   * no_proxy and ftp. Closes: #89671
   * Fix for AJ's 'desire to remove perl-5.005' and possibly other
     similar situations. Closes: #56708, #59432
   * no_proxy and ftp. Closes: #89671

+  * Philippe Batailler's man page patches.

   
  -- Jason Gunthorpe <jgg@debian.org>  Thu,  8 Mar 2001 22:48:06 -0700
 
   
  -- Jason Gunthorpe <jgg@debian.org>  Thu,  8 Mar 2001 22:48:06 -0700
 

diff --git a/doc/apt-get.8.sgml b/doc/apt-get.8.sgml
index b505df89c31360d25b0cb24a8c837c362e150989..74bd881ef45b815dfb9bd833acf81c47af648843 100644 (file)
--- a/doc/apt-get.8.sgml
+++ b/doc/apt-get.8.sgml
@@ -110,7 +110,7 @@
      the desired packages. If a hyphen is appended to the package name (with 
      no intervening space), the identified package will be removed if it is 
      installed. Similarly a plus sign can be used to designate a package to 
      the desired packages. If a hyphen is appended to the package name (with 
      no intervening space), the identified package will be removed if it is 
      installed. Similarly a plus sign can be used to designate a package to 

-     isntall. These latter feature may be used to override decisions made by 
+     install. These latter features may be used to override decisions made by 

      apt-get's conflict resolution  system.
      <para>
      A specific version of a package can be selected for installation by 
      apt-get's conflict resolution  system.
      <para>
      A specific version of a package can be selected for installation by 


@@ -120,7 +120,7 @@
      following the package name with a slash and the version of the 
      distribution or the Archive name (stable, frozen, unstable).
      <para>
      following the package name with a slash and the version of the 
      distribution or the Archive name (stable, frozen, unstable).
      <para>

-     Both of the version selection mechansims can downgrade packages and must
+     Both of the version selection mechanisms can downgrade packages and must

      be used with care.
      <para>
      If no package matches the given expression and the expression contains one
      be used with care.
      <para>
      If no package matches the given expression and the expression contains one


@@ -132,7 +132,7 @@
 
      <VarListEntry><Term>remove</Term>
      <ListItem><Para>   
 
      <VarListEntry><Term>remove</Term>
      <ListItem><Para>   

-     <literal/remove/ is identical to bf(install) except that packages are 
+     <literal/remove/ is identical to <literal/install/ except that packages are 

      removed instead of installed. If a plus sign is appended to the package 
      name (with no intervening space), the identified package will be 
      installed.
      removed instead of installed. If a plus sign is appended to the package 
      name (with no intervening space), the identified package will be 
      installed.


@@ -363,14 +363,14 @@
      a default pin at priority 990 using the specified release string. The
      preferences file may further override this setting. In short, this option
      lets you have simple control over which distribution packages will be
      a default pin at priority 990 using the specified release string. The
      preferences file may further override this setting. In short, this option
      lets you have simple control over which distribution packages will be

-     retrieved from. Some common examples might me 
+     retrieved from. Some common examples might be 

      <option>-t '2.1*'</> or <option>-t unstable</>.
      Configuration Item: <literal/APT::Default-Release/
      </VarListEntry>
 
      <VarListEntry><term><option/--trivial-only/</>
      <ListItem><Para>
      <option>-t '2.1*'</> or <option>-t unstable</>.
      Configuration Item: <literal/APT::Default-Release/
      </VarListEntry>
 
      <VarListEntry><term><option/--trivial-only/</>
      <ListItem><Para>

-     Only perform operations are 'trivial'. Logically this can be considered
+     Only perform operations that are 'trivial'. Logically this can be considered

      related to <option/--assume-yes/, where <option/--assume-yes/ will answer 
      yes to any prompt, <option/--trivial-only/ will answer no. 
      Configuration Item: <literal/APT::Get::Trivial-Only/.
      related to <option/--assume-yes/, where <option/--assume-yes/ will answer 
      yes to any prompt, <option/--trivial-only/ will answer no. 
      Configuration Item: <literal/APT::Get::Trivial-Only/.


@@ -412,13 +412,13 @@
      
      <VarListEntry><term><filename>&cachedir;/archives/</></term>
      <ListItem><Para>
      
      <VarListEntry><term><filename>&cachedir;/archives/</></term>
      <ListItem><Para>

-     storage area for retrieved package files
+     storage area for retrieved package files.

      Configuration Item: <literal/Dir::Cache::Archives/.
      </VarListEntry>
      
      <VarListEntry><term><filename>&cachedir;/archives/partial/</></term>
      <ListItem><Para>
      Configuration Item: <literal/Dir::Cache::Archives/.
      </VarListEntry>
      
      <VarListEntry><term><filename>&cachedir;/archives/partial/</></term>
      <ListItem><Para>

-     storage area for package files in transit
+     storage area for package files in transit.

      Configuration Item: <literal/Dir::Cache::Archives/ (implicit partial). 
      </VarListEntry>
      
      Configuration Item: <literal/Dir::Cache::Archives/ (implicit partial). 
      </VarListEntry>
      

diff --git a/doc/apt.conf.5.sgml b/doc/apt.conf.5.sgml
index 4c79e4cc09a90b291d68bb67609da956c9d503bf..8ed0485b29520b1697d712318333c99d950a07ae 100644 (file)
--- a/doc/apt.conf.5.sgml
+++ b/doc/apt.conf.5.sgml
@@ -17,7 +17,7 @@
  <!-- Man page title -->
  <refnamediv>
     <refname>apt.conf</>
  <!-- Man page title -->
  <refnamediv>
     <refname>apt.conf</>

-    <refpurpose>Configuratoin file for APT</>
+    <refpurpose>Configuration file for APT</>

  </refnamediv>
  
  <RefSect1><Title>Description</>
  </refnamediv>
  
  <RefSect1><Title>Description</>


@@ -89,7 +89,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      
      <VarListEntry><Term>Ignore-Hold</Term>
      <ListItem><Para>
      
      <VarListEntry><Term>Ignore-Hold</Term>
      <ListItem><Para>

-     Ignore Held packages; This global options causes the problem resolver to
+     Ignore Held packages; This global option causes the problem resolver to

      ignore held packages in its decision making. 
      </VarListEntry>
 
      ignore held packages in its decision making. 
      </VarListEntry>
 


@@ -155,7 +155,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      <VarListEntry><Term>Queue-Mode</Term>
      <ListItem><Para>
      Queuing mode; <literal/Queue-Mode/ can be one of <literal/host/ or 
      <VarListEntry><Term>Queue-Mode</Term>
      <ListItem><Para>
      Queuing mode; <literal/Queue-Mode/ can be one of <literal/host/ or 

-     <literal/access/ which determins how APT parallelizes outgoing 
+     <literal/access/ which determines how  APT parallelizes outgoing 

      connections. <literal/host/ means that one connection per target host 
      will be opened, <literal/access/ means that one connection per URI type 
      will be opened.
      connections. <literal/host/ means that one connection per target host 
      will be opened, <literal/access/ means that one connection per URI type 
      will be opened.


@@ -200,13 +200,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      <literal/Acquire::http::Pipeline-Depth/ can be a value from 0 to 5 
      indicating how many outstanding requests APT should send. A value of
      zero MUST be specified if the remote host does not properly linger
      <literal/Acquire::http::Pipeline-Depth/ can be a value from 0 to 5 
      indicating how many outstanding requests APT should send. A value of
      zero MUST be specified if the remote host does not properly linger

-     on TCP connections - otherwise data corruption will occure. Hosts which
+     on TCP connections - otherwise data corruption will occur. Hosts which

      require this are in violation of RFC 2068.     
      </VarListEntry>
 
      <VarListEntry><Term>ftp</Term>
      <ListItem><Para>
      require this are in violation of RFC 2068.     
      </VarListEntry>
 
      <VarListEntry><Term>ftp</Term>
      <ListItem><Para>

-     FTP URis; ftp::Proxy is the default proxy server to use. It is in the 
+     FTP URIs; ftp::Proxy is the default proxy server to use. It is in the 

      standard form of <literal>ftp://[[user][:pass]@]host[:port]/</> and is 
      overriden by the <envar/ftp_proxy/ environment variable. To use a ftp 
      proxy you will have to set the <literal/ftp::ProxyLogin/ script in the 
      standard form of <literal>ftp://[[user][:pass]@]host[:port]/</> and is 
      overriden by the <envar/ftp_proxy/ environment variable. To use a ftp 
      proxy you will have to set the <literal/ftp::ProxyLogin/ script in the 


@@ -259,7 +259,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
    The <literal/Dir::State/ section has directories that pertain to local 
    state information. <literal/lists/ is the directory to place downloaded 
    package lists in and <literal/status/ is the name of the dpkg status file.
    The <literal/Dir::State/ section has directories that pertain to local 
    state information. <literal/lists/ is the directory to place downloaded 
    package lists in and <literal/status/ is the name of the dpkg status file.

-   <literal/preferences/ is the name of the APT preferencse file.
+   <literal/preferences/ is the name of the APT preferences file.

    <literal/Dir::State/ contains the default directory to prefix on all sub 
    items if they do not start with <filename>/</> or <filename>./</>. 
    <para>
    <literal/Dir::State/ contains the default directory to prefix on all sub 
    items if they do not start with <filename>/</> or <filename>./</>. 
    <para>


@@ -292,7 +292,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
  <RefSect1><Title>APT in DSelect</>
    <para>   
    When APT is used as a &dselect; method several configuration directives
  <RefSect1><Title>APT in DSelect</>
    <para>   
    When APT is used as a &dselect; method several configuration directives

-   control the default behavoir. These are in the <literal/DSelect/ section.
+   control the default behaviour. These are in the <literal/DSelect/ section.

    
    <VariableList>
      <VarListEntry><Term>Clean</Term>
    
    <VariableList>
      <VarListEntry><Term>Clean</Term>


@@ -334,7 +334,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      <VarListEntry><Term>Options</Term>
      <ListItem><Para>
      This is a list of options to pass to dpkg. The options must be specified
      <VarListEntry><Term>Options</Term>
      <ListItem><Para>
      This is a list of options to pass to dpkg. The options must be specified

-     using the list notation and each list item is passed as a single arugment
+     using the list notation and each list item is passed as a single argument

      to &dpkg;.
      </VarListEntry>
      
      to &dpkg;.
      </VarListEntry>
      


@@ -400,7 +400,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
  
  <RefSect1><Title>See Also</>
    <para>
  
  <RefSect1><Title>See Also</>
    <para>

-   &apt-cache;, &apt-conf;, &apt-preferences;.
+   &apt-cache;, &apt-config;<!-- ? reading apt.conf -->, &apt-preferences;.

  </RefSect1>
 
  &manbugs;
  </RefSect1>
 
  &manbugs;

diff --git a/doc/apt_preferences.5.sgml b/doc/apt_preferences.5.sgml
index fdac01d37d66cef1b9c2c8a8ecda768ced3cce5d..44fffabf01bccbeba199df593d16f982f37900af 100644 (file)
--- a/doc/apt_preferences.5.sgml
+++ b/doc/apt_preferences.5.sgml
@@ -99,13 +99,13 @@ a=stable
    The final selection method is by origin. This is simply the site name
    of the originating package files. The empty string is used for file URIs.
    <para>
    The final selection method is by origin. This is simply the site name
    of the originating package files. The empty string is used for file URIs.
    <para>

-   Version selection, particularly the latter two methods, are used in may
-   different part of APT, not just the preferences file.
+   Version selection, particularly the latter two methods, are used in many
+   different parts of APT, not just the preferences file.

  </RefSect1>
  
  <RefSect1><Title>Candidate Version Policy</>
    <para>
  </RefSect1>
  
  <RefSect1><Title>Candidate Version Policy</>
    <para>

-   Interaly APT maintains a list of all available versions for all packages.
+   Internally APT maintains a list of all available versions for all packages.

    If you place multiple releases or vendors in your &sources-list; file then
    these features are available. By default APT selects the highest version
    from all automatic sources. Some sources, such as 
    If you place multiple releases or vendors in your &sources-list; file then
    these features are available. By default APT selects the highest version
    from all automatic sources. Some sources, such as 


@@ -160,7 +160,7 @@ a=stable
    Giving a pin a priority greater than 1000 will allow APT to downgrade
    in order to get to that version.   
    <para>
    Giving a pin a priority greater than 1000 will allow APT to downgrade
    in order to get to that version.   
    <para>

-   Each package may be pinned to a specific version and each Package file
+   Each package may be pinned to a specific version and each Packages file

    has a priority for every package inside. The highest priority assigned
    to a package is the one that is used.
    <para>
    has a priority for every package inside. The highest priority assigned
    to a package is the one that is used.
    <para>


@@ -173,26 +173,26 @@ Pin-Priority: 1001
    The first line specifies the package, the second gives the Pin specification
    and the last gives the priority of this pin. The first word of the pin
    specification may be version, release or origin, the remainder of the field
    The first line specifies the package, the second gives the Pin specification
    and the last gives the priority of this pin. The first word of the pin
    specification may be version, release or origin, the remainder of the field

-   is described in the Versioning sectin above.
+   is described in the Versioning section above.

    <para>
    A default pin is how the priorities of package files are set. Any number
    of default pins may be specified, the first matching default will select
    the priority of the package file. Only release or origin may be used in 
    <para>
    A default pin is how the priorities of package files are set. Any number
    of default pins may be specified, the first matching default will select
    the priority of the package file. Only release or origin may be used in 

-   the Pin specification since they match Package files.
+   the Pin specification since they match Packages files.

 <informalexample><programlisting>
 Package: *
 Pin: release v=2.1*
 Pin-Priority: 998
 </programlisting></informalexample>
    <para>
 <informalexample><programlisting>
 Package: *
 Pin: release v=2.1*
 Pin-Priority: 998
 </programlisting></informalexample>
    <para>

-   If the Pin-Priorty field is omitted then the priority defaults to 989 for
+   If the Pin-Priority field is omitted then the priority defaults to 989 for

    both cases.
    
    <RefSect2><title>Interesting Effects</>
    <para>
    Due to the downgrade prevention barrier at priority 1000 it is possible
    that a lower priority version  will be selected if the higher priority 
    both cases.
    
    <RefSect2><title>Interesting Effects</>
    <para>
    Due to the downgrade prevention barrier at priority 1000 it is possible
    that a lower priority version  will be selected if the higher priority 

-   would casue a downgrade. For instance, if package foo has versions
+   would cause a downgrade. For instance, if package foo has versions

    <literal/1.2/, <literal/1.1/ and <literal/1.0/ installed, with 
    <literal/1.1/ being the currently installed version and the priorities of 
    each version being 900, 100 and 950 repectively the winning version will be 
    <literal/1.2/, <literal/1.1/ and <literal/1.0/ installed, with 
    <literal/1.1/ being the currently installed version and the priorities of 
    each version being 900, 100 and 950 repectively the winning version will be