Automatic merge of trunk into multilib

appendices/dependencies.xml

@@ -1239,7 +1239,7 @@
       <segmentedlist id="groff-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Man-DB and Perl</seg>
+          <seg>Man-DB</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2455,7 +2455,7 @@
       <segmentedlist id="perl-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Bash, Binutils, Coreutils, Gawk, GCC, GDBM, Glibc, Grep, Groff,
+          <seg>Bash, Binutils, Coreutils, Gawk, GCC, GDBM, Glibc, Grep,
           Libxcrypt, Make, Sed, and Zlib</seg>
         </seglistitem>
       </segmentedlist>

chapter10/kernel/kernel-config.py

@@ -293,7 +293,7 @@ for i0, val, i1, title, arrow, key, menu, comment in r:
 
 from jinja2 import Template
 
-t = Template('''<?xml version="1.0" encoding="ISO-8859-1"?>
+t = Template('''<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- Automatically generated by kernel-config.py

git-version.sh

@@ -57,8 +57,8 @@ version="$rev"
 versiond="$rev-systemd"
 
 if [ "$(git diff HEAD | wc -l)" != "0" ]; then
-    version="$version+"
-    versiond="$versiond+"
+    version="$version-wip"
+    versiond="$versiond-wip"
 fi
 
 echo "<![ %sysv; ["                                        >  version.ent

packages.ent

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Notes:
      For empty *-home entities use " " not ""

patches.ent

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Start of Common Patches -->