release 1.1.3

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

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 8581ec630b3dd9329f3007ff1e740beb8ce4e4c8..85bdbf544bd17364ec00df7df088835b5899d505 100644 (file)
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -39,8 +39,20 @@
   </citerefentry>"
 >
 
   </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>
+  </citerefentry>"
+>
+

 <!ENTITY apt-preferences "<citerefentry>
 <!ENTITY apt-preferences "<citerefentry>

-    <refentrytitle><command>apt_preferences</command></refentrytitle>
+    <refentrytitle><filename>apt_preferences</filename></refentrytitle>

     <manvolnum>5</manvolnum>
   </citerefentry>"
 >
     <manvolnum>5</manvolnum>
   </citerefentry>"
 >


@@ -58,7 +70,7 @@
 >
 
 <!ENTITY apt-ftparchive "<citerefentry>
 >
 
 <!ENTITY apt-ftparchive "<citerefentry>

-    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
+    <refentrytitle><command>apt-ftparchive</command></refentrytitle>

     <manvolnum>1</manvolnum>
   </citerefentry>"
 >
     <manvolnum>1</manvolnum>
   </citerefentry>"
 >


@@ -178,6 +190,12 @@
   </citerefentry>"
 >
 
   </citerefentry>"
 >
 

+<!ENTITY apt-file "<citerefentry>
+     <refentrytitle><command>apt-file</command></refentrytitle>
+     <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+

 <!-- Boiler plate docinfo section -->
 <!ENTITY apt-email "
    <address>
 <!-- Boiler plate docinfo section -->
 <!ENTITY apt-email "
    <address>


@@ -219,14 +237,14 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
 ">
 
 <!-- this will be updated by 'prepare-release' -->

-<!ENTITY apt-product-version "0.9.7.6ubuntu2">
+<!ENTITY apt-product-version "1.1.3">

 
 

-<!-- Codenames for debian releases -->
-<!ENTITY oldstable-codename "squeeze">
-<!ENTITY stable-codename "wheezy">
-<!ENTITY testing-codename "jessie">
-<!ENTITY stable-version "7.0">
-<!ENTITY ubuntu-codename "precise">
+<!-- (Code)names for various things used all over the place -->
+<!ENTITY oldstable-codename "wheezy">
+<!ENTITY stable-codename "jessie">
+<!ENTITY testing-codename "stretch">
+<!ENTITY stable-version "8">
+<!ENTITY ubuntu-codename "trusty">

 
 <!-- good and bad just refers to matching and not matching a pattern…
      It is not a remark about the specific perl version.
 
 <!-- good and bad just refers to matching and not matching a pattern…
      It is not a remark about the specific perl version.


@@ -259,9 +277,11 @@
                <arg choice='plain'>search</arg>
                <arg choice='plain'>show</arg>
                <arg choice='plain'>update</arg>
                <arg choice='plain'>search</arg>
                <arg choice='plain'>show</arg>
                <arg choice='plain'>update</arg>

-               <arg choice='plain'>upgrade</arg>

                <arg choice='plain'>install &synopsis-arg-pkgver;</arg>
                <arg choice='plain'>remove &synopsis-arg-pkg;</arg>
                <arg choice='plain'>install &synopsis-arg-pkgver;</arg>
                <arg choice='plain'>remove &synopsis-arg-pkg;</arg>

+               <arg choice='plain'>upgrade</arg>
+               <arg choice='plain'>full-upgrade</arg>
+               <arg choice='plain'>edit-sources</arg>

                &synopsis-help;
        </group>
 </cmdsynopsis></refsynopsisdiv>">
                &synopsis-help;
        </group>
 </cmdsynopsis></refsynopsisdiv>">


@@ -386,18 +406,47 @@
 </cmdsynopsis></refsynopsisdiv>">
 <!ENTITY synopsis-command-apt-mark "<refsynopsisdiv><cmdsynopsis>
        <command>apt-mark</command>
 </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'>
        <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>
                        </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>
        </group>
 </cmdsynopsis></refsynopsisdiv>">
 <!ENTITY synopsis-command-apt-sortpkgs "<refsynopsisdiv><cmdsynopsis>