Bug#782895: Incorrect indentation of some <screen> text

[Ben Hutchings <ben@decadent.org.uk>]

Package: release-notes
Severity: normal
Tags: patch

As the text inside the <screen> element is considered preformatted,
it should not be indented like the surrounding text.

Indenting the end-tag results in an extra blank line in the output.

Ben.

-- System Information:
Debian Release: 8.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (x86_64)
Foreign Architectures: amd64

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Index: en/issues.dbk
===================================================================
--- en/issues.dbk	(revision 10778)
+++ en/issues.dbk	(working copy)
@@ -102,7 +102,7 @@
     by using:
     <screen>
 $ echo 'openssh-server openssh-server/permit-root-login boolean true' | debconf-set-selections
-    </screen>
+</screen>
   </para>
 </section>
 
@@ -332,7 +332,7 @@
 Package: systemd-sysv
 Pin: release o=Debian
 Pin-Priority: -1
-  </screen>
+</screen>
   <caution>
     <para>
       Be advised that some packages may have degraded behavior or
@@ -408,14 +408,14 @@
   </para>
   <screen>
 debsums -c -e | grep ^/etc/init.d
-  </screen>
+</screen>
   <para>Alternatively, the following can be used in the absence of
   debsums.
   </para>
 <screen>
-  dpkg-query --show -f'${Conffiles}' | sed 's, /,\n/,g' | \
-    grep /etc/init.d | awk 'NF,OFS="  " {print $2, $1}' | \
-    md5sum --quiet -c
+dpkg-query --show -f'${Conffiles}' | sed 's, /,\n/,g' | \
+  grep /etc/init.d | awk 'NF,OFS="  " {print $2, $1}' | \
+  md5sum --quiet -c
 </screen>
   <para>
     If either command flags any files and their corresponding packages
@@ -486,10 +486,10 @@
     logind to ignore ACPI events by adding:
   </para>
   <screen>
-    HandlePowerKey=ignore
-    HandleSuspendKey=ignore
-    HandleHibernateKey=ignore
-    HandleLidSwitch=ignore
+HandlePowerKey=ignore
+HandleSuspendKey=ignore
+HandleHibernateKey=ignore
+HandleLidSwitch=ignore
 </screen>
   <para>
     to <filename>/etc/systemd/logind.conf</filename>. Note that this
@@ -533,7 +533,7 @@
 PrivateDevices=yes
 PrivateNetwork=yes
 ProtectSystem=yes
-  </screen>
+</screen>
   <para>
     If you do not use systemd, or can assert that none of the systemd
     services will use the above directives, the config option might not
@@ -635,8 +635,8 @@
     using the following command:
   </para>
   <screen>
-    # /sbin/cryptsetup luksDump <replaceable>&lt;disk-device&gt;</replaceable> | grep -i whirlpool
-  </screen>
+# /sbin/cryptsetup luksDump <replaceable>&lt;disk-device&gt;</replaceable> | grep -i whirlpool
+</screen>
   <para>
     For more information on migrating, please see item "8.3 Gcrypt
     1.6.x and later break Whirlpool" of the <ulink
@@ -774,8 +774,8 @@
       you can preseed the questions by using the following:
   </para>
   <screen>
-    echo 'base-passwd base-passwd/system/<replaceable>username</replaceable>/shell/<replaceable>current-shell-mangled</replaceable>/_usr_sbin_nologin boolean false' | debconf-set-selections
-  </screen>
+echo 'base-passwd base-passwd/system/<replaceable>username</replaceable>/shell/<replaceable>current-shell-mangled</replaceable>/_usr_sbin_nologin boolean false' | debconf-set-selections
+</screen>
   <para>
     Where <replaceable>username</replaceable> is the name of the user
     in question and <replaceable>current-shell-mangled</replaceable>
Index: en/upgrading.dbk
===================================================================
--- en/upgrading.dbk	(revision 10778)
+++ en/upgrading.dbk	(working copy)
@@ -201,7 +201,7 @@
   </para>
   <screen>
 mount -o remount,rw /
-  </screen>
+</screen>
   <para>
     More information on debugging a broken boot under systemd
     can be found in the <ulink
@@ -1195,7 +1195,7 @@
 To see a list of available linux-image metapackages, run:
 </para>
 <screen>
-  # apt-cache search linux-image- | grep -i meta | grep -v transition
+# apt-cache search linux-image- | grep -i meta | grep -v transition
 </screen>
 
 <para>
@@ -1333,8 +1333,8 @@
     may have configuration files left on the system (if any):
   </para>
   <screen>
-    # dpkg -l | awk '/^rc/ { print $2 }'
-  </screen>
+# dpkg -l | awk '/^rc/ { print $2 }'
+</screen>
   <para>
     The packages can be removed by using <command>apt-get
     purge</command>.  Assuming you want to purge all of them
@@ -1341,16 +1341,16 @@
     in one go, you can use the following command:
   </para>
   <screen>
-    # apt-get purge $(dpkg -l | awk '/^rc/ { print $2 }')
-  </screen>
+# apt-get purge $(dpkg -l | awk '/^rc/ { print $2 }')
+</screen>
   <para>
     If you use <systemitem role="package">aptitude</systemitem>, you
     can also use the following alternative to the commands above:
   </para>
   <screen>
-    $ aptitude search '~c'
-    $ aptitude purge '~c'
-  </screen>
+$ aptitude search '~c'
+$ aptitude purge '~c'
+</screen>
 </section>
 
 </section>