summaryrefslogtreecommitdiff
path: root/doc/apt-verbatim.ent
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-04-01 13:57:22 +0200
committerMichael Vogt <mvo@debian.org>2014-04-01 13:57:22 +0200
commit8a1c9010137a8c49d9808f2db34b9ee277138986 (patch)
tree5ec5c0103cb896407d8c9542fac0ec8ab3313602 /doc/apt-verbatim.ent
parentfa55ccaa85ca8f85251300f5c5f574edc0c3ca71 (diff)
parent417e83d0d79637266e04c98189c62ce85bcdf737 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: apt-pkg/deb/dpkgpm.cc debian/apt.auto-removal.sh debian/changelog vendor/debian/sources.list.in
Diffstat (limited to 'doc/apt-verbatim.ent')
-rw-r--r--doc/apt-verbatim.ent21
1 files changed, 19 insertions, 2 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 6ff45e228..5d0d4c9f0 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,14 +219,13 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.15.5">
+<!ENTITY apt-product-version "0.9.16.1">
<!-- (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 tanglu-codename "bartholomea">
<!ENTITY ubuntu-codename "trusty">
<!-- good and bad just refers to matching and not matching a pattern…
@@ -248,6 +247,24 @@
<!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'>upgrade</arg>
+ <arg choice='plain'>install &synopsis-arg-pkgver;</arg>
+ <arg choice='plain'>remove &synopsis-arg-pkg;</arg>
+ &synopsis-help;
+ </group>
+</cmdsynopsis></refsynopsisdiv>">
<!ENTITY synopsis-command-apt-get "<refsynopsisdiv><cmdsynopsis>
<command>apt-get</command>
<arg><option>-asqdyfmubV</option></arg>