Changeset 349012b

Timestamp:

11/23/2023 11:30:19 PM (7 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

a6781cb

Parents:

d1b6445 (diff), 1fdbce2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• Makefile (modified) (1 diff)
• chapter06/ncurses.xml (modified) (3 diffs)
• stylesheets/lfs-xsl/chunk-slave.xsl (modified) (1 diff)
• tidy.conf (modified) (1 diff)

Makefile

@@ -71 +71 @@
          /bin/bash obfuscate.sh $$filename;           \
          sed -e "s@text/html@application/xhtml+xml@g" \
-             -e "s/\xa9/\©/ "                    \
              -i $$filename;                           \
    done;

chapter06/ncurses.xml

@@ -79 +79 @@
         <term><parameter>--with-manpage-format=normal</parameter></term>
         <listitem>
-          <para>This prevents Ncurses installing compressed manual
+          <para>This prevents Ncurses from installing compressed manual
           pages, which may happen if the host distribution itself
           has compressed manual pages.</para>
@@ -95 +95 @@
         <term><parameter>--without-normal</parameter></term>
         <listitem>
-          <para>This prevents Ncurses building and installing static C
+          <para>This prevents Ncurses from building and installing static C
           libraries.</para>
         </listitem>
@@ -103 +103 @@
         <term><parameter>--without-debug</parameter></term>
         <listitem>
-          <para>This prevents Ncurses building and installing debug
+          <para>This prevents Ncurses from building and installing debug
           libraries.</para>
         </listitem>

stylesheets/lfs-xsl/chunk-slave.xsl

@@ -10 +10 @@
   <!-- Upstream XHTML presentation templates -->
   <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
-
-  <!-- Use ISO-8859-1 for output instead of default UTF-8 -->
-  <xsl:param name="chunker.output.encoding" select="'ISO-8859-1'"/>
 
   <!-- Including our customized elements templates -->

tidy.conf

@@ -2 +2 @@
 wrap: 78
 tab-size: 8
-input-encoding: latin1
-output-encoding: latin1
 write-back: yes
 markup: yes