Package: aptitude
Version: 0.4.10-1+b2
Severity: important
Tags: patch
Source: aptitude

Some of the DocBook markup in list items in the doc/en/manpage.xml
source file is not valid and can't be processed properly by the
DocBook XSL stylesheets, resulting in broken display of those
parts of the aptitude.8 man page.

The problem in the DocBook source is that there are instances
where a <listitem> instance has text child content. That's not
valid. The patch below fixes the problems by wrapping the text in
<simpara> instances. <para> could also be used if you prefer.

diff -r 9050a3ecc8ec doc/en/manpage.xml
--- a/doc/en/manpage.xml        Sun Mar 30 13:23:49 2008 -0700
+++ b/doc/en/manpage.xml        Tue Apr 01 16:53:01 2008 +0900
@@ -952,14 +952,14 @@ i A texlive-latex-extra Conflicts textop
        <term><literal>--allow-new-upgrades</literal></term>
 
        <listitem>
-         When the safe resolver is being used (i.e., <link
+         <simpara>When the safe resolver is being used (i.e., <link
          
linkend='cmdlineSafeResolver'><literal>--safe-resolver</literal></link>
          was passed or <link
          
linkend='configAlways-Use-Safe-Resolver'><literal>Aptitude::Always-Use-Safe-Resolver</literal></link>
          is set to <literal>true</literal>), allow the dependency
          resolver to install upgrades for packages even if <link
          
linkend='configSafe-Resolver-No-New-Upgrades'><literal>Aptitude::Safe-Resolver::No-New-Upgrades</literal></link>
-         is set.
+         is set.</simpara>
        </listitem>
       </varlistentry>
 
@@ -967,7 +967,7 @@ i A texlive-latex-extra Conflicts textop
        <term><literal>--allow-new-installs</literal></term>
 
        <listitem>
-         Allow the <link
+         <simpara>Allow the <link
          linkend='manpageSafeUpgrade'><literal>safe-upgrade</literal></link>
          command to install new packages; when the safe resolver is
          being used (i.e., <link
@@ -978,7 +978,7 @@ i A texlive-latex-extra Conflicts textop
          resolver to install new packages.  This option takes effect
          even if <link
          
linkend='configSafe-Resolver-No-New-Installs'><literal>Aptitude::Safe-Resolver::No-New-Installs</literal></link>
-         is true.
+         is true.</simpara>
        </listitem>
       </varlistentry>
 
@@ -986,9 +986,9 @@ i A texlive-latex-extra Conflicts textop
        <term><literal>--allow-untrusted</literal></term>
 
        <listitem>
-         Install packages from untrusted sources without prompting.
+         <simpara>Install packages from untrusted sources without prompting.
          You should only use this if you know what you are doing, as
-         it could easily compromise your system's security.
+         it could easily compromise your system's security.</simpara>
        </listitem>
       </varlistentry>
 
@@ -1108,14 +1108,14 @@ i A texlive-latex-extra Conflicts textop
        <term><literal>--no-new-upgrades</literal></term>
 
        <listitem>
-         When the safe resolver is being used (i.e., <link
+         <simpara>When the safe resolver is being used (i.e., <link
          
linkend='cmdlineSafeResolver'><literal>--safe-resolver</literal></link>
          was passed or <link
          
linkend='configAlways-Use-Safe-Resolver'><literal>Aptitude::Always-Use-Safe-Resolver</literal></link>
          is set to <literal>true</literal>), allow the dependency
          resolver to install new packages even if <link
          
linkend='configSafe-Resolver-No-New-Upgrades'><literal>Aptitude::Safe-Resolver::No-New-Installs</literal></link>
-         is set.
+         is set.</simpara>
        </listitem>
       </varlistentry>
 
@@ -2131,4 +2131,4 @@ The following packages will be REMOVED:
       
<citerefentry><refentrytitle>apt</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     </para>
   </refsect1>
-</refentry>
\ No newline at end of file
+</refentry>

-- Package-specific info:
Terminal: xterm
$DISPLAY is set.

-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'stable'), (70, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-3-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages aptitude depends on:
ii  apt [libapt-pkg-libc6.7-6 0.7.11         Advanced front-end for dpkg
ii  libc6                     2.7-6          GNU C Library: Shared libraries
ii  libcwidget1               0.5.6.1-3      high-level terminal interface libr
ii  libgcc1                   1:4.3.0-1      GCC support library
ii  libncursesw5              5.6+20080203-1 Shared libraries for terminal hand
ii  libsigc++-2.0-0c2a        2.0.18-2       type-safe Signal Framework for C++
ii  libstdc++6                4.3.0-1        The GNU Standard C++ Library v3

Versions of packages aptitude recommends:
pn  aptitude-doc-en | aptitude-do <none>     (no description available)
pn  libparse-debianchangelog-perl <none>     (no description available)

-- no debconf information

-- 
Michael(tm) Smith
http://people.w3.org/mike/
http://sideshowbarker.net/



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to