diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-21 11:29:05 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-21 11:29:05 +0200 |
commit | 6c1f5d2c3c8df164e78dda8f24d28667634403e1 (patch) | |
tree | d711a52cf5a92a13b87f248307f5521846a7dbcf /doc/apt-verbatim.ent | |
parent | aa2218b25cb29e8c0677f0f3ede098583c7ae49f (diff) | |
parent | 0baf849d81814fce59d86eecccbe624c8aaf0456 (diff) |
merged from David, uncommited the previous i18n commit first as its part of the merge from David already but for some reason bzr is confused and gives a gazillion of conflicts in doc/po/de.po without the uncommit first
Diffstat (limited to 'doc/apt-verbatim.ent')
-rw-r--r-- | doc/apt-verbatim.ent | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 3846c17e3..926a0712e 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -177,6 +177,12 @@ </author> "> +<!ENTITY apt-name.dburrows " + <firstname>Daniel</firstname> + <surname>Burrows</surname> + <email>dburrows@debian.org</email> +"> + <!ENTITY apt-copyright " <copyright> <holder>Jason Gunthorpe</holder> @@ -249,10 +255,10 @@ <arg choice='plain'>show &synopsis-arg-pkgver;</arg> <arg choice='plain'>depends &synopsis-arg-pkgver;</arg> <arg choice='plain'>rdepends &synopsis-arg-pkgver;</arg> - <arg choice='plain'>pkgnames <arg choice='plain'><replaceable>&synopsis-prefix;</replaceable></arg></arg> + <arg choice='plain'>pkgnames <arg><replaceable>&synopsis-prefix;</replaceable></arg></arg> <arg choice='plain'>dotty &synopsis-arg-pkgver;</arg> <arg choice='plain'>xvcg &synopsis-arg-pkgver;</arg> - <arg choice='plain'>policy &synopsis-arg-pkg;</arg> + <arg choice='plain'>policy <arg rep='repeat'><replaceable>&synopsis-pkg;</replaceable></arg></arg> <arg choice='plain'>madison &synopsis-arg-pkg;</arg> &synopsis-help; </group> |