From e454a5410d8933bd5e726d4ec989ca0e018501f0 Mon Sep 17 00:00:00 2001
From: Thomas Trepl <thomas@linuxfromscratch.org>
Date: Mon, 29 Jun 2020 08:18:13 +0000
Subject: [PATCH] Merge changes from trunk to multilib

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11988 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendices/dependencies.xml | 12 +++++++-----
 chapter02/hostreqs.xml      |  3 +--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index d93438fce..907bb7d5f 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -680,7 +680,9 @@
         <segtitle>&external;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>
+            <ulink url="&blfs-root;view/stable/general/tk.html">tk</ulink>
+          </seg>  
         </seglistitem>
       </segmentedlist>
 
@@ -1241,7 +1243,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No test suite available</seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1348,7 +1350,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No test suite available</seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1456,7 +1458,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No test suite available</seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1491,7 +1493,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>No test suite available</seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter02/hostreqs.xml b/chapter02/hostreqs.xml
index f5b0eabde..9eac706a5 100644
--- a/chapter02/hostreqs.xml
+++ b/chapter02/hostreqs.xml
@@ -157,7 +157,6 @@
   <para >To see whether your host system has all the appropriate versions, and
   the ability to compile programs, run the following:</para>
 
-<!-- ANY additional lines in the script cause a pdf rendering problem-->
 <screen role="nodump"><userinput>cat &gt; version-check.sh &lt;&lt; "EOF"
 <literal>#!/bin/bash
 # Simple script to list version numbers of critical development tools
@@ -208,7 +207,7 @@ sed --version | head -n1
 tar --version | head -n1
 makeinfo --version | head -n1  # texinfo version
 xz --version | head -n1
-<?hard-pagebreak?>
+
 echo 'int main(){}' &gt; dummy.c &amp;&amp; g++ -o dummy dummy.c
 if [ -x dummy ]
   then echo "g++ compilation OK";