From 77f9604a8386afc64e92714f13f91b8143a4f941 Mon Sep 17 00:00:00 2001
From: Alex Gronenwoud <alex@linuxfromscratch.org>
Date: Tue, 23 Sep 2003 23:00:12 +0000
Subject: Putting several tiny sections in chapter 1 into one.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2874 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/chapter01.xml   |  6 +----
 chapter01/contactinfo.xml | 68 ++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 62 insertions(+), 12 deletions(-)

(limited to 'chapter01')

diff --git a/chapter01/chapter01.xml b/chapter01/chapter01.xml
index 9d98c44ca..95083950c 100644
--- a/chapter01/chapter01.xml
+++ b/chapter01/chapter01.xml
@@ -2,15 +2,11 @@
 <title>Introduction</title>
 <?dbhtml filename="chapter01.html" dir="chapter01"?>
 
-&c1-acknowledgements;
 &c1-how;
 &c1-conventions;
 &c1-version;
-&c1-mirrors;
 &c1-changelog;
-&c1-maillists;
-&c1-newsserver;
-&c1-faq;
 &c1-contactinfo;
+&c1-acknowledgements;
 
 </chapter>
diff --git a/chapter01/contactinfo.xml b/chapter01/contactinfo.xml
index b171393ae..72ba4e32d 100644
--- a/chapter01/contactinfo.xml
+++ b/chapter01/contactinfo.xml
@@ -1,13 +1,67 @@
-<sect1 id="ch01-contactinfo">
+<sect1 id="ch01-administrativa">
+<title>Resources</title>
+<?dbhtml filename="resources.html" dir="chapter01"?>
+
+
+<sect2 id="ch01-faq">
+<title>FAQ</title>
+
+<para>If you encounter any errors, have any questions, or if you find a
+typo in the book, then, please consult the FAQ (Frequently Asked Questions)
+page at <ulink url="http://www.linuxfromscratch.org/faq/"/>.</para>
+
+</sect2>
+
+
+<sect2 id="ch01-maillists" xreflabel="Chapter 1 - Mailing lists">
+<title>Mailing lists</title>
+
+<para>The <emphasis>linuxfromscratch.org</emphasis> server is hosting a number
+of mailinglists used for the development of the LFS project. These lists
+include, among others, the main development and support lists.</para>
+
+<para>For information on which lists are available, how to subscribe to them,
+their archive locations, and so on, visit <ulink
+url="http://www.linuxfromscratch.org/mailinglists/"/>.</para>
+
+</sect2>
+
+
+<sect2 id="ch01-newsserver">
+<title>News server</title>
+
+<para>All the mailing lists hosted at <emphasis>linuxfromscratch.org</emphasis>
+are also accessible via the NNTP server. All messages posted to a mailing list
+will be copied to the correspondent newsgroup, and vice versa.</para>
+
+<para>The news server can be reached at
+<emphasis>news.linuxfromscratch.org</emphasis>.</para>
+
+</sect2>
+
+
+<sect2 id="ch01-mirrors" xreflabel="Chapter 1 - Mirror sites">
+<title>Mirror sites</title>
+
+<para>The LFS project has a number of mirrors set up world-wide to make
+accessing the website and downloading the required packages more convenient.
+Please visit the website at <ulink url="http://www.linuxfromscratch.org/"/> for
+a list of current mirrors.</para>
+
+</sect2>
+
+
+<sect2 id="ch01-contactinfo">
 <title>Contact information</title>
-<?dbhtml filename="contactinfo.html" dir="chapter01"?>
 
-<para>Please direct your emails to one of the LFS mailing lists. See
-<xref linkend="ch01-maillists"/> for more information on the
-available mailing lists.</para>
+<para>Please direct your all your questions and comments to one of the LFS
+mailing lists (see above).</para>
+
+<para>But if you need to reach Gerard Beekmans personally, send an email to
+<ulink url="mailto:gerard@linuxfromscratch.org">gerard@linuxfromscratch.org</ulink>.</para>
+
+</sect2>
 
-<para>If you need to reach Gerard Beekmans personally, send an email to
-<ulink url="mailto:gerard@linuxfromscratch.org">gerard@linuxfromscratch.org</ulink></para>
 
 </sect1>
 
-- 
cgit v1.2.3-54-g00ecf