diff options
| author | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
| commit | 38d2959ffb8c6f5f291b2910014a67b1b352ab4c (patch) | |
| tree | c5977b8f34aaf973ed3956952ec3ff43ac59f143 /doc/apt-verbatim.ent | |
| parent | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (diff) | |
| parent | 3fa4e98f62e469f4292d2811b4e15f4afb678fbd (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/cachefilter.h
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/netrc.h
apt-pkg/deb/debsrcrecords.cc
apt-pkg/init.h
apt-pkg/pkgcache.cc
debian/apt.install.in
debian/changelog
Diffstat (limited to 'doc/apt-verbatim.ent')
| -rw-r--r-- | doc/apt-verbatim.ent | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index b9e6a881a..b25cd7375 100644 --- 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> @@ -219,14 +225,13 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.15.4"> +<!ENTITY apt-product-version "1.0.3"> <!-- (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 +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> |