aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchaic <archaic@linuxfromscratch.org>2005-07-05 15:27:25 +0000
committerArchaic <archaic@linuxfromscratch.org>2005-07-05 15:27:25 +0000
commit49eaebc2677ad4cb17184e1fb395653571f2c3a4 (patch)
tree47b4a2c325f345f257a4432643f506f562d70388
parent4158ffc29666e767c99da1af9efb95ad008f2a15 (diff)
Removed reference to the wiki. Pointed to the FAQ instead. (merged from trunk r6386)
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1/BOOK@6387 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/administrativa.xml9
-rw-r--r--chapter01/changelog.xml3
-rw-r--r--chapter05/gcc-pass2.xml2
-rw-r--r--general.ent11
4 files changed, 12 insertions, 13 deletions
diff --git a/chapter01/administrativa.xml b/chapter01/administrativa.xml
index c0692fcac..82f90d2bf 100644
--- a/chapter01/administrativa.xml
+++ b/chapter01/administrativa.xml
@@ -52,15 +52,6 @@ FAQ or the mailing list archives. You can find the IRC network at
The support channel is named #LFS-support.</para>
</sect2>
-<sect2 id="ch-scatter-wiki">
-<title>Wiki</title>
-
-<para>For more information on packages, updated versions, tweaks, and
-personal experiences, see the LFS Wiki at <ulink url="&wiki-root;"/>.
-Users can also add information there to help others with their future
-LFS activities.</para>
-</sect2>
-
<sect2 id="ch-scatter-references">
<title>References</title>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 688bc6228..511d3faac 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -87,6 +87,9 @@ First a summary, then a detailed log.</para>
</itemizedlist>
</listitem>
+<listitem><para>July 5th, 2005 [archaic]: Removed reference to the wiki.
+Pointed to the FAQ.</para></listitem>
+
<listitem><para>July 4th, 2005 [archaic]: Reworded errata page so it only
refers to security warnings and bug fixes, not new features.</para></listitem>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 8e4d4efd9..89f7f4227 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -53,7 +53,7 @@ Ask your system administrator to create more.</computeroutput></screen>
<para>If the above message is received, the host does not have its
PTYs set up properly. In this case, there is no point in running the
test suites for GCC and Binutils until this issue is resolved. Please
-consult the LFS Wiki at <ulink url="&wiki-root;"/> for more
+consult the LFS FAQ at <ulink url="&faq-root;"/> for more
information on how to get PTYs working.</para>
<para>First correct a known problem and make an essential adjustment:</para>
diff --git a/general.ent b/general.ent
index 53356a139..b8d25889b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "TESTING-20050704">
-<!ENTITY releasedate "July 4, 2005">
+<!ENTITY version "TESTING-20050705">
+<!ENTITY releasedate "July 5, 2005">
<!ENTITY milestone "6.1">
<!ENTITY generic-version "testing"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
@@ -10,8 +10,13 @@
<!ENTITY hints-root "&lfs-root;hints/downloads/files/">
<!ENTITY hints-index "&lfs-root;hints/list.html">
<!ENTITY patches-root "&lfs-root;patches/lfs/&generic-version;/">
-<!ENTITY wiki-root "http://wiki.linuxfromscratch.org/">
<!ENTITY livecd-root "http://linuxfromscratch.org/~jhuntwork/livecd/">
+<!-- Uncomment these two and remove the last two once
+ the beta site has moved to www.
+
+<!ENTITY test-results "&lfs-root;lfs/build-logs/&generic-version;/">
+<!ENTITY errata "&lfs-root;lfs/errata/&generic-version;/">
+-->
<!ENTITY test-results "http://beta.linuxfromscratch.org/lfs/build-logs/&generic-version;/">
<!ENTITY errata "http://beta.linuxfromscratch.org/lfs/errata/&generic-version;/">