apt-pkg/acquire-method.cc: fix copy/paste error

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

diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml
index 5af27a337a493e0878c5db252eb68d676ce0b016..ec50d6f765400d1824b667138f15408be5bb8daf 100644 (file)
--- a/doc/apt-mark.8.xml
+++ b/doc/apt-mark.8.xml
@@ -5,6 +5,9 @@
 <!ENTITY % aptent SYSTEM "apt.ent">
 %aptent;
 
+<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
+%aptverbatiment;
+
 ]>
 
 <refentry>
@@ -15,28 +18,37 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2 November 2007</date>
+   <date>9 August 2009</date>
  </refentryinfo>
  
  <refmeta>
    <refentrytitle>apt-mark</refentrytitle>
    <manvolnum>8</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
  </refmeta>
  
  <!-- Man page title -->
  <refnamediv>
     <refname>apt-mark</refname>
-    <refpurpose>Utility to sort package index files</refpurpose>
+    <refpurpose>mark/unmark a package as being automatically-installed</refpurpose>
  </refnamediv>
 
  <!-- Arguments -->
  <refsynopsisdiv>
    <cmdsynopsis>
-      <command>apt-mark</command>
-      <arg><option>-hv</option></arg>
-      <arg><option>-f=<replaceable>FILENAME</replaceable></option></arg>
-      <group choice="req"><arg>markauto</arg><arg>unmarkauto</arg></group>
-      <arg choice="plain" rep="repeat"><replaceable>package</replaceable></arg>
+       <command>apt-mark</command>
+       <arg><option>-hv</option></arg>
+       <arg><option>-f=<replaceable>FILENAME</replaceable></option></arg>
+       <group choice="plain">
+               <arg choice="plain">
+                       <group choice="req">
+                               <arg choice="plain">markauto</arg>
+                               <arg choice="plain">unmarkauto</arg>
+                       </group>
+                       <arg choice="plain" rep="repeat"><replaceable>package</replaceable></arg>
+               </arg>
+               <arg choice="plain">showauto</arg>
+       </group>
    </cmdsynopsis>
  </refsynopsisdiv>
  
@@ -47,9 +59,10 @@
    <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.
+     by any manually installed packages, they will be removed by e.g.
+     <command>apt-get</command> or <command>aptitude</command>.
    </para>
      <variablelist>
        <varlistentry><term>markauto</term>
@@ -67,16 +80,24 @@
      depend on it.
        </para></listitem>
        </varlistentry>
+
+       <varlistentry><term>showauto</term>
+        <listitem><para><literal>showauto</literal> is used to print a
+     list of automatically installed packages with each package on a new line.
+       </para></listitem>
+       </varlistentry>
      </variablelist>
  </refsect1>
  
  <refsect1><title>options</title>
    
    <variablelist>
-     <varlistentry><term><option>-f=<filename>FILENAME</filename></option></term><term><option>--file=<filename>FILENAME</filename></option></term>
+       <varlistentry>
+               <term><option>-f=<filename><replaceable>FILENAME</replaceable></filename></option></term>
+               <term><option>--file=<filename><replaceable>FILENAME</replaceable></filename></option></term>
      <listitem><para>
       
-     Read/Write package stats from <filename>FILENAME</filename>
+     Read/Write package stats from <filename><replaceable>FILENAME</replaceable></filename>
      instead of the default location, which
      is <filename>extended_status</filename> in the directory defined
      by the Configuration Item: <literal>Dir::State</literal>.</para></listitem>
@@ -101,8 +122,14 @@
    </variablelist>
  </refsect1>
 
+ <refsect1><title>Files</title>
+   <variablelist>
+       &file-extended_states;
+   </variablelist>
+ </refsect1>
+
  <refsect1><title>See Also</title>
-   <para>&apt-conf;</para>
+   <para>&apt-get;,&aptitude;,&apt-conf;</para>
  </refsect1>
 
  <refsect1><title>Diagnostics</title>