Changeset 69ce2ab in clfs-embedded for BOOK/introduction/common/resources.xml

Timestamp:

Feb 6, 2011, 8:47:29 PM (14 years ago)

Author:

Andrew Bradford <bradfa@…>

Branches:

master

Children:

a6b5527

Parents:

9cbe486 (diff), ee73578 (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:

Merge branch 'myclfs' into moveBUILD

File:

• BOOK/introduction/common/resources.xml (modified) (3 diffs)

BOOK/introduction/common/resources.xml

@@ -24 +24 @@
     <title>Mailing Lists</title>
 
-    <para>The <uri>linuxfromscratch.org</uri> server hosts a number of
+    <para>The <uri>cross-lfs.org</uri> server hosts a number of
     mailing lists used for the development of the CLFS project. These lists
     include the main development and support lists, among others. If the
     FAQ does not solve the problem you are having, the next step would be to
-    search the mailing lists at <ulink url="&lfs-root;search.html"/>.</para>
+    search the mailing lists at <ulink url="&clfs-wiki;wiki/lists"/>.</para>
 
     <para>For information on the different lists, how to subscribe, archive
     locations, and additional information, visit
-    <ulink url="&lfs-root;mail.html"/>. For mailing lists specifically
-    for CLFS, visit <ulink url="&clfs-wiki;wiki/lists"/>.</para>
+    <ulink url="&clfs-wiki;wiki/lists"/>.</para>
 
   </sect2>
@@ -55 +54 @@
     <uri>chat.freenode.net</uri>. The support channel for cross-lfs
     is named #cross-lfs. If you need to show people the output of your
-    problems, please use http://pastebin.cross-lfs.org and reference
-    the pastebin URL when asking your questions.</para>
+    problems, please use <ulink url="http://pastebin.cross-lfs.org"/> and 
+    reference the pastebin URL when asking your questions.</para>
 
   </sect2>
@@ -72 +71 @@
     <title>Mirror Sites</title>
 
-    <para>The LFS project has a number of world-wide mirrors to make
+    <para>The LFS and CLFS projects have a number of world-wide mirrors to make
     accessing the website and downloading the required packages more
     convenient. Please visit the LFS website at <ulink
     url="&lfs-root;mirrors.html"/> for a list of current mirrors of
     the LFS website, or <ulink url="&clfs-wiki;wiki/mirrors"/> for
-    mirrors of CLFS.</para>
+    mirrors of the CLFS website.</para>
 
   </sect2>