diff options
| author | Michael Vogt <mvo@debian.org> | 2015-08-18 11:54:05 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-08-18 11:54:05 +0200 |
| commit | 21248c0f00ee71412dbadc6ebf84011cf974346d (patch) | |
| tree | 7dc1f5904399482d2128765b5b86d57a4ac5b3e1 /doc/apt.8.xml | |
| parent | e5f34ad3b043abf033c1626eb8449b75955d6760 (diff) | |
| parent | 4fc6b7570c3e97b65c118b58cdf6729fa94c9b03 (diff) | |
Merge branch 'debian/experimental' into feature/srv-records
Conflicts:
cmdline/apt-helper.cc
cmdline/makefile
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> |