diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-10-27 15:57:12 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-10-27 15:57:12 +0100 |
| commit | e29a7a394cfd41e8bad81535e0a8c07654f34bf6 (patch) | |
| tree | c317e2f45aa1c96300028fb830555f248db5771e /doc/apt.8.xml | |
| parent | bc5095b7d708c7e376f98be6edc2ad7cceca57ed (diff) | |
| parent | 28460cb27846b2437010b08adf10bde18e370974 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
Diffstat (limited to 'doc/apt.8.xml')
| -rw-r--r-- | doc/apt.8.xml | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/doc/apt.8.xml b/doc/apt.8.xml index bcad5ee7f..29bf96751 100644 --- a/doc/apt.8.xml +++ b/doc/apt.8.xml @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="no"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ - -<!ENTITY % aptent SYSTEM "apt.ent"> -%aptent; - -<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> -%aptverbatiment; - +<!ENTITY % aptent SYSTEM "apt.ent"> %aptent; +<!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment; +<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> %aptvendor; ]> <refentry> @@ -105,8 +101,8 @@ <listitem><para><literal>upgrade</literal> is used to install the newest versions of all packages currently installed on the system from the sources enumerated in - <filename>/etc/apt/sources.list</filename>. New package will be - installed, but existing package will never removed. + <filename>/etc/apt/sources.list</filename>. New packages will be + installed, but existing packages will never be removed. </para></listitem> </varlistentry> |