Merge remote-tracking branch 'upstream/debian/sid' into debian/sid

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

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 2a6b69f2c04a180115267962b6307935ac43fe09..f2b3a1cb15c9e8172944aeca039b7f05280e5edc 100644 (file)
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -39,6 +39,12 @@
   </citerefentry>"
 >
 
+<!ENTITY apt "<citerefentry>
+    <refentrytitle><command>apt</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
 <!ENTITY apt-preferences "<citerefentry>
     <refentrytitle><command>apt_preferences</command></refentrytitle>
     <manvolnum>5</manvolnum>
@@ -124,6 +130,12 @@
   </citerefentry>"
 >
 
+<!ENTITY squid-deb-proxy-client "<citerefentry>
+    <refentrytitle><command>squid-deb-proxy-client</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
 <!ENTITY debsign "<citerefentry>
     <refentrytitle><command>debsign</command></refentrytitle>
     <manvolnum>1</manvolnum>
@@ -213,14 +225,14 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.7.3">
+<!ENTITY apt-product-version "1.0.2">
 
-<!-- Codenames for debian releases -->
+<!-- (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.0">
-<!ENTITY ubuntu-codename "precise">
+<!ENTITY stable-version "7">
+<!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.
@@ -241,6 +253,26 @@
 <!ENTITY synopsis-param-filename "<filename><replaceable>&synopsis-filename;</replaceable></filename>">
 <!ENTITY synopsis-help "<arg choice='plain'><group choice='req'><arg choice='plain'>-v</arg><arg choice='plain'>--version</arg></group></arg>
        <arg choice='plain'><group choice='req'><arg choice='plain'>-h</arg><arg choice='plain'>--help</arg></group></arg>">
+<!ENTITY synopsis-command-apt "<refsynopsisdiv><cmdsynopsis>
+       <command>apt</command>
+       <arg><option>-h</option></arg>
+       &synopsis-arg-option;
+       &synopsis-arg-config;
+       &synopsis-arg-target-release;
+       &synopsis-arg-architecture;
+       <group choice='req'>
+               <arg choice='plain'>list</arg>
+               <arg choice='plain'>search</arg>
+               <arg choice='plain'>show</arg>
+               <arg choice='plain'>update</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>">
 <!ENTITY synopsis-command-apt-get "<refsynopsisdiv><cmdsynopsis>
        <command>apt-get</command>
        <arg><option>-asqdyfmubV</option></arg>