apt-private: #ifdef HAVE_STRUCT_STATFS_F_TYPE, not #if

[apt.git] / doc / apt-verbatim.ent

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 00d8eb7e9dfd968501a241379f1ae19aa1753d54..fbdc8e168b66a7dde227920a907634c53e4a4336 100644 (file)
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -39,6 +39,12 @@
   </citerefentry>"
 >
 
+<!ENTITY apt-mark "<citerefentry>
+    <refentrytitle><command>apt-mark</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
 <!ENTITY apt "<citerefentry>
     <refentrytitle><command>apt</command></refentrytitle>
     <manvolnum>8</manvolnum>
@@ -46,7 +52,7 @@
 >
 
 <!ENTITY apt-preferences "<citerefentry>
-    <refentrytitle><command>apt_preferences</command></refentrytitle>
+    <refentrytitle><filename>apt_preferences</filename></refentrytitle>
     <manvolnum>5</manvolnum>
   </citerefentry>"
 >
@@ -64,7 +70,7 @@
 >
 
 <!ENTITY apt-ftparchive "<citerefentry>
-    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
+    <refentrytitle><command>apt-ftparchive</command></refentrytitle>
     <manvolnum>1</manvolnum>
   </citerefentry>"
 >
@@ -184,6 +190,14 @@
   </citerefentry>"
 >
 
+<!ENTITY apt-file "<citerefentry>
+     <refentrytitle><command>apt-file</command></refentrytitle>
+     <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY apt-acquire-additional-files "<literal><filename>/usr/share/doc/apt-doc/acquire-additional-files.txt</filename></literal>">
+
 <!-- Boiler plate docinfo section -->
 <!ENTITY apt-email "
    <address>
@@ -225,13 +239,13 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.0.5">
+<!ENTITY apt-product-version "1.3~pre3">
 
 <!-- (Code)names for various things used all over the place -->
-<!ENTITY oldstable-codename "squeeze">
-<!ENTITY stable-codename "wheezy">
-<!ENTITY testing-codename "jessie">
-<!ENTITY stable-version "7">
+<!ENTITY debian-oldstable-codename "wheezy">
+<!ENTITY debian-stable-codename "jessie">
+<!ENTITY debian-testing-codename "stretch">
+<!ENTITY debian-stable-version "8">
 <!ENTITY ubuntu-codename "trusty">
 
 <!-- good and bad just refers to matching and not matching a pattern…
@@ -394,18 +408,47 @@
 </cmdsynopsis></refsynopsisdiv>">
 <!ENTITY synopsis-command-apt-mark "<refsynopsisdiv><cmdsynopsis>
        <command>apt-mark</command>
-       <arg><option>-f=&synopsis-param-filename;</option></arg>
+       <group choice='plain'>
+               <group choice='req'>
+                       <arg choice='plain'><option>-f=&synopsis-param-filename;</option></arg>
+                       <arg choice='plain'>
+                               <group choice='req'>
+                                       <arg choice='plain'>auto</arg>
+                                       <arg choice='plain'>manual</arg>
+                               </group>
+                               &synopsis-arg-pkg;
+                       </arg>
+                       <arg choice='plain'>
+                               <group choice='req'>
+                                       <arg choice='plain'>showauto</arg>
+                                       <arg choice='plain'>showmanual</arg>
+                               </group>
+                               <arg choice='opt' rep='repeat'><replaceable>&synopsis-pkg;</replaceable></arg>
+                       </arg>
+               </group>
+               &synopsis-help;
+       </group>
+</cmdsynopsis><cmdsynopsis><command>apt-mark</command>
        <group choice='plain'>
                <arg choice='plain'>
                        <group choice='req'>
-                               <arg choice='plain'>auto</arg>
-                               <arg choice='plain'>manual</arg>
-                               <arg choice='plain'>showauto</arg>
-                               <arg choice='plain'>showmanual</arg>
+                               <arg choice='plain'>hold</arg>
+                               <arg choice='plain'>unhold</arg>
+                               <arg choice='plain'>install</arg>
+                               <arg choice='plain'>remove</arg>
+                               <arg choice='plain'>purge</arg>
                        </group>
                        &synopsis-arg-pkg;
                </arg>
-               &synopsis-help;
+               <arg choice='plain'>
+                       <group choice='req'>
+                               <arg choice='plain'>showhold</arg>
+                               <arg choice='plain'>showinstall</arg>
+                               <arg choice='plain'>showremove</arg>
+                               <arg choice='plain'>showpurge</arg>
+                       </group>
+                       <arg choice='opt' rep='repeat'><replaceable>&synopsis-pkg;</replaceable></arg>
+               </arg>
        </group>
 </cmdsynopsis></refsynopsisdiv>">
 <!ENTITY synopsis-command-apt-sortpkgs "<refsynopsisdiv><cmdsynopsis>