X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/0620365915671c718ae2cc181c161a254cbae67e..8bd823d0a1f7e08ad94a7110bb118f73348133a1:/doc/apt-verbatim.ent

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 98d864818..c1bf31bda 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -39,8 +39,20 @@
   </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>
-    <refentrytitle><command>apt_preferences</command></refentrytitle>
+    <refentrytitle><filename>apt_preferences</filename></refentrytitle>
     <manvolnum>5</manvolnum>
   </citerefentry>"
 >
@@ -58,7 +70,7 @@
 >
 
 <!ENTITY apt-ftparchive "<citerefentry>
-    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
+    <refentrytitle><command>apt-ftparchive</command></refentrytitle>
     <manvolnum>1</manvolnum>
   </citerefentry>"
 >
@@ -124,6 +136,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>
@@ -172,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>
@@ -213,14 +239,14 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.7.7">
+<!ENTITY apt-product-version "1.3~rc1">
 
-<!-- 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 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…
      It is not a remark about the specific perl version.
@@ -241,6 +267,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>
@@ -362,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>