aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2006-08-31 19:01:15 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2006-08-31 19:01:15 +0000
commit4b51ca76b24935156308cb84a81b71642435076a (patch)
treebdfaeac6f41b2335a985e76abb2d15f168a491cb
parent2a135aa50464b6ae47ead61e26c510977f060c13 (diff)
Remove spurious curly braces from /etc/resolv.conf. Fixes #1870
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7779 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter07/network.xml2
-rw-r--r--general.ent4
3 files changed, 13 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e79176b0a..94b2a375c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,16 @@
</listitem>
-->
<listitem>
+ <para>2006-08-31</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Remove spurious curly braces from the example
+ /etc/resolv.conf. Fixes #1870.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2006-08-24</para>
<itemizedlist>
<listitem>
diff --git a/chapter07/network.xml b/chapter07/network.xml
index 62f6f2c22..ab3590801 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -183,7 +183,7 @@ EOF</userinput></screen>
<screen><userinput>cat &gt; /etc/resolv.conf &lt;&lt; "EOF"
<literal># Begin /etc/resolv.conf
-domain {<replaceable>&lt;Your Domain Name&gt;</replaceable>}
+domain <replaceable>&lt;Your Domain Name&gt;</replaceable>
nameserver <replaceable>&lt;IP address of your primary nameserver&gt;</replaceable>
nameserver <replaceable>&lt;IP address of your secondary nameserver&gt;</replaceable>
diff --git a/general.ent b/general.ent
index c27210a67..3d536d468 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20060829">
-<!ENTITY releasedate "August 29, 2006">
+<!ENTITY version "SVN-20060831">
+<!ENTITY releasedate "August 31, 2006">
<!ENTITY milestone "6.3">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->