From 7873a7c1a60fc10b6669f8539d51a3dd43d76a24 Mon Sep 17 00:00:00 2001
From: Alex Gronenwoud <alex@linuxfromscratch.org>
Date: Sat, 7 Feb 2004 14:57:18 +0000
Subject: [PATCH] Moving Ack and Typ to Preface.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3237 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml                             |  3 +++
 chapter01/chapter01.xml                             |  2 --
 entities/book-structure.xml                         |  4 ++--
 index.xml                                           |  4 ++--
 preface/preface.xml                                 |  2 ++
 chapter01/conventions.xml => preface/typography.xml | 10 +++++-----
 6 files changed, 14 insertions(+), 11 deletions(-)
 rename chapter01/conventions.xml => preface/typography.xml (85%)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5c874531b..5ff71efca 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -6,6 +6,9 @@
 
 <itemizedlist>
 
+<listitem><para>February 7th, 2004 [alex]: Chapter 1 - Moved the Conventions
+and Acknowledgements sections to the Preface.</para></listitem>
+
 <listitem><para>February 7th, 2004 [alex]: Chapter 6 - Creating devices:
 replaced the MAKEDEV script with the make_devices script. Contributed by
 Matthias Benkmann.</para></listitem>
diff --git a/chapter01/chapter01.xml b/chapter01/chapter01.xml
index 7eb9aec66..20020fa3b 100644
--- a/chapter01/chapter01.xml
+++ b/chapter01/chapter01.xml
@@ -3,9 +3,7 @@
 <?dbhtml filename="chapter01.html" dir="chapter01"?>
 
 &c1-how;
-&c1-conventions;
 &c1-changelog;
 &c1-resources;
-&c1-acknowledgements;
 
 </chapter>
diff --git a/entities/book-structure.xml b/entities/book-structure.xml
index 6147befbc..24313e3e8 100644
--- a/entities/book-structure.xml
+++ b/entities/book-structure.xml
@@ -2,14 +2,14 @@
 <!ENTITY pf-foreword SYSTEM "../preface/foreword.xml">
 <!ENTITY pf-audience SYSTEM "../preface/audience.xml">
 <!ENTITY pf-prerequisites SYSTEM "../preface/prerequisites.xml">
+<!ENTITY pf-typography SYSTEM "../preface/typography.xml">
+<!ENTITY pf-acknowledgements SYSTEM "../preface/acknowledgements.xml">
 <!ENTITY pf-organization SYSTEM "../preface/organization.xml">
 
 <!ENTITY chapter01 SYSTEM "../chapter01/chapter01.xml">
 <!ENTITY c1-how SYSTEM "../chapter01/how.xml">
-<!ENTITY c1-conventions SYSTEM "../chapter01/conventions.xml">
 <!ENTITY c1-changelog SYSTEM "../chapter01/changelog.xml">
 <!ENTITY c1-resources SYSTEM "../chapter01/contactinfo.xml">
-<!ENTITY c1-acknowledgements SYSTEM "../chapter01/acknowledgements.xml">
 
 <!ENTITY chapter02 SYSTEM "../chapter02/chapter02.xml">
 <!ENTITY c2-aboutlfs SYSTEM "../chapter02/aboutlfs.xml">
diff --git a/index.xml b/index.xml
index 93c9b9935..2d569282f 100644
--- a/index.xml
+++ b/index.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "CVS-2004-02-05">
-<!ENTITY releasedate "February 5th, 2004">
+<!ENTITY version "CVS-2004-02-07">
+<!ENTITY releasedate "February 7th, 2004">
 <!ENTITY milestone "5.2">
 <!ENTITY nbsp " ">
 
diff --git a/preface/preface.xml b/preface/preface.xml
index c7bda60f5..5fd043488 100644
--- a/preface/preface.xml
+++ b/preface/preface.xml
@@ -5,6 +5,8 @@
 &pf-foreword;
 &pf-audience;
 &pf-prerequisites;
+&pf-typography;
+&pf-acknowledgements;
 &pf-organization;
 
 </preface>
diff --git a/chapter01/conventions.xml b/preface/typography.xml
similarity index 85%
rename from chapter01/conventions.xml
rename to preface/typography.xml
index 95c13ba1e..73f20a931 100644
--- a/chapter01/conventions.xml
+++ b/preface/typography.xml
@@ -1,9 +1,9 @@
-<sect1 id="ch-scatter-conventions">
-<title>Conventions used in this book</title>
-<?dbhtml filename="conventions.html" dir="chapter01"?>
+<sect1 id="pre-typography">
+<title>Typography</title>
+<?dbhtml filename="typography.html" dir="preface"?>
 
-<para>To make things easy to follow, there are a number of conventions used
-throughout the book. Following are some examples:</para>
+<para>To make things easier to follow, there are a few typographical
+conventions used throughout the book. Following are some examples:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>