Improve the apt-cdrom output when no CD-ROM can be auto-detected

[apt.git] / doc / apt-mark.8.xml

diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml
index f56115635e0325f578661a0f77bd98b4199e446a..3503ece8fe47da095edf7b0a45b01cf210778ec2 100644 (file)
--- a/doc/apt-mark.8.xml
+++ b/doc/apt-mark.8.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <?xml version="1.0" encoding="utf-8" standalone="no"?>

-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [

 
 <!ENTITY % aptent SYSTEM "apt.ent">
 %aptent;
 
 <!ENTITY % aptent SYSTEM "apt.ent">
 %aptent;


@@ -18,7 +18,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
    &apt-email;
    &apt-product;
    <!-- The last update date -->

-   <date>21 April 2011</date>
+   <date>2012-06-09T00:00:00Z</date>

  </refentryinfo>
  
  <refmeta>
  </refentryinfo>
  
  <refmeta>


@@ -66,11 +66,11 @@
 
        <varlistentry><term><option>hold</option></term>
         <listitem><para><literal>hold</literal> is used to mark a
 
        <varlistentry><term><option>hold</option></term>
         <listitem><para><literal>hold</literal> is used to mark a

-       package as hold back, which will prevent the package from being
+       package as held back, which will prevent the package from being

        automatically installed, upgraded or removed.
        The command is only a wrapper around <command>dpkg --set-selections</command>
        automatically installed, upgraded or removed.
        The command is only a wrapper around <command>dpkg --set-selections</command>

-       and the state is therefore maintained by &dpkg; and not effected
-       by the <option>--filename</option> option.
+       and the state is therefore maintained by &dpkg; and not affected
+       by the <option>--file</option> option.

        </para></listitem>
        </varlistentry>
 
        </para></listitem>
        </varlistentry>
 


@@ -109,12 +109,11 @@
    
    <variablelist>
        <varlistentry>
    
    <variablelist>
        <varlistentry>

-               <term><option>-f=<filename><replaceable>&synopsis-filename;</replaceable></filename></option></term>
-               <term><option>--file=<filename><replaceable>&synopsis-filename;</replaceable></filename></option></term>
+          <term><option>-f=&synopsis-param-filename;</option></term>
+          <term><option>--file=&synopsis-param-filename;</option></term>

      <listitem><para>
      Read/Write package stats from the filename given with the parameter
      <listitem><para>
      Read/Write package stats from the filename given with the parameter

-     <filename><replaceable>&synopsis-filename;</replaceable></filename>
-     instead of from the default location, which
+     &synopsis-param-filename; instead of from the default location, which

      is <filename>extended_status</filename> in the directory defined
      by the Configuration Item: <literal>Dir::State</literal>.</para></listitem>
      </varlistentry>
      is <filename>extended_status</filename> in the directory defined
      by the Configuration Item: <literal>Dir::State</literal>.</para></listitem>
      </varlistentry>


@@ -130,7 +129,7 @@
  </refsect1>
 
  <refsect1><title>See Also</title>
  </refsect1>
 
  <refsect1><title>See Also</title>

-   <para>&apt-get;,&aptitude;,&apt-conf;</para>
+    <para><phrase>&apt-get;,&aptitude;,&apt-conf;</phrase></para>

  </refsect1>
 
  <refsect1><title>Diagnostics</title>
  </refsect1>
 
  <refsect1><title>Diagnostics</title>