diff options
| author | Michael Vogt <mvo@debian.org> | 2013-10-22 16:53:32 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-10-22 16:53:32 +0200 |
| commit | f62f17b489405432a3125e51471d8a00e78c5170 (patch) | |
| tree | ce2a6e077cb0846e75cbb3d583f4152608100adb /doc/apt-verbatim.ent | |
| parent | 9aa9db9c88fca3a9266427b0d5cc9ad53df7207e (diff) | |
| parent | c08cf1dc784a98a253296a51433f6de7d16d3125 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
cmdline/apt-key
configure.ac
debian/apt.auto-removal.sh
debian/changelog
debian/control
debian/rules
po/apt-all.pot
po/ar.po
po/ast.po
po/bg.po
po/bs.po
po/ca.po
po/cs.po
po/cy.po
po/da.po
po/de.po
po/dz.po
po/el.po
po/es.po
po/eu.po
po/fi.po
po/fr.po
po/gl.po
po/hu.po
po/it.po
po/ja.po
po/km.po
po/ko.po
po/ku.po
po/lt.po
po/mr.po
po/nb.po
po/ne.po
po/nl.po
po/nn.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/sk.po
po/sl.po
po/sv.po
po/th.po
po/tl.po
po/uk.po
po/vi.po
po/zh_CN.po
po/zh_TW.po
Diffstat (limited to 'doc/apt-verbatim.ent')
| -rw-r--r-- | doc/apt-verbatim.ent | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 1ab7b6056..0d0d95c7a 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -124,6 +124,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,7 +219,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.8"> +<!ENTITY apt-product-version "0.9.7.6ubuntu2"> <!-- Codenames for debian releases --> <!ENTITY oldstable-codename "squeeze"> |