summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--doc/apt-get.8.xml26
2 files changed, 9 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index 42917aeb7..006149a60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,9 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low
- add "NotAutomatic: yes" handling, thanks Osamu Aoki (Closes: #490347)
* debian/libapt-pkg-doc.doc-base.cache:
- remove yet another reference to the removed cache.sgml
+ * doc/apt-get.8.xml:
+ - do not say explicit target_release_{name,version,codename}, it should
+ be clear by itself and 'man' can break lines again (Closes: #566166)
[ Jari Aalto ]
* debian/rules:
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 4f8c80169..fd4e89bf0 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -46,18 +46,10 @@
</option>
</arg>
<arg>
- <option>-t=</option>
- <group choice='req'>
- <arg choice='plain'>
- <replaceable>target_release_name</replaceable>
- </arg>
- <arg choice='plain'>
- <replaceable>target_release_number_expression</replaceable>
- </arg>
- <arg choice='plain'>
- <replaceable>target_release_codename</replaceable>
- </arg>
- </group>
+ <option>-t=</option>
+ <arg choice='plain'>
+ <replaceable>target_release</replaceable>
+ </arg>
</arg>
<group choice="req">
@@ -73,10 +65,7 @@
=<replaceable>pkg_version_number</replaceable>
</arg>
<arg choice='plain'>
- /<replaceable>target_release_name</replaceable>
- </arg>
- <arg choice='plain'>
- /<replaceable>target_release_codename</replaceable>
+ /<replaceable>target_release</replaceable>
</arg>
</group>
</arg>
@@ -92,10 +81,7 @@
=<replaceable>pkg_version_number</replaceable>
</arg>
<arg choice='plain'>
- /<replaceable>target_release_name</replaceable>
- </arg>
- <arg choice='plain'>
- /<replaceable>target_release_codename</replaceable>
+ /<replaceable>target_release</replaceable>
</arg>
</group>
</arg>