Index: general/genlib/glib2.xml
===================================================================
--- general/genlib/glib2.xml	(revision c6c037c07e9192fac5328df1da9a60aab18663c5)
+++ general/genlib/glib2.xml	(revision 0f4428846aab8f904bfbdfa1473dbe9b0e612cf1)
@@ -92,4 +92,27 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring GLib</title>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>By default, <application>GLib</application> assumes that all
+      filenames are in the UTF-8 charset. See the <xref
+      linkend="locale-issues"/> page for more details on this kind of
+      issue. In order to tell GLib and applications that use it
+      that filenames are in the default locale encoding, set the variable
+      <envar>G_FILENAME_ENCODING</envar> to the value "@locale":</para>
+
+<screen><userinput>cat &gt; /etc/profile.d/glib2-locale.sh &lt;&lt; "EOF"
+<literal># Use the current locale charset for filenames
+# in applications using GLib
+export G_FILENAME_ENCODING=@locale</literal>
+EOF</userinput></screen>
+
+    </sect3>
 
   </sect2>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision c6c037c07e9192fac5328df1da9a60aab18663c5)
+++ introduction/welcome/changelog.xml	(revision 0f4428846aab8f904bfbdfa1473dbe9b0e612cf1)
@@ -46,4 +46,9 @@
       <itemizedlist>
         <listitem>
+          <para>[dnicholson] - Changed the i18n.sh profile text to reference
+          the LFS locale discussion and moved the GLib specific settings to
+          that package's page. Fixes #2012.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Added text to the 'Locale Related Issues' page which
           discusses improperly encoded manual pages.</para>
Index: postlfs/config/profile.xml
===================================================================
--- postlfs/config/profile.xml	(revision c6c037c07e9192fac5328df1da9a60aab18663c5)
+++ postlfs/config/profile.xml	(revision 0f4428846aab8f904bfbdfa1473dbe9b0e612cf1)
@@ -333,61 +333,14 @@
     </indexterm>
 
-      <para>This script shows how to set some environment variables necessary for
-      native language support. Setting these variables properly gives you:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>the output of programs translated into your native language</para>
-        </listitem>
-        <listitem>
-          <para>correct classification of characters into letters, digits and
-          other classes &ndash; this is necessary for <application>Bash</application>
-          to accept keystrokes properly in non-English locales</para>
-        </listitem>
-        <listitem>
-          <para>the alphabetical sorting order correct for your country</para>
-        </listitem>
-        <listitem>
-          <para>proper default paper size</para>
-        </listitem>
-        <listitem>
-          <para>correct formatting of monetary, time and date values</para>
-        </listitem>
-      </itemizedlist>
-
-      <para>Replace <replaceable>&lt;ll&gt;</replaceable> with the two-letter code for
-      your language (e.g., <quote>en</quote>) and
-      <replaceable>&lt;CC&gt;</replaceable> with the two-letter code for your country
-      (e.g., <quote>GB</quote>). Also you may need to specify (and this is actually
-      the preferred form) your character encoding (e.g., <quote>iso8859-1</quote>)
-      after a dot (so that the result is <quote>en_GB.iso8859-1</quote>). Issue the
-      following command for more information:</para>
-
-<screen><userinput>man 3 setlocale</userinput></screen>
-
-      <para>The list of all locales supported by <application>Glibc</application>
-      can be obtained by running the following command:</para>
-
-<screen><userinput>locale -a</userinput></screen>
-
-      <para>After you are sure about your locale settings, create the
-      <filename>/etc/profile.d/i18n.sh</filename> file:</para>
+      <para>This script sets an environment variable necessary for
+      native language support. A full discussion on determining this
+      variable can be found on the <ulink
+      url="&lfs-root;/chapter07/profile.html">LFS Bash Shell
+      Startup Files</ulink> page.</para>
 
 <screen role="root"><userinput>cat &gt; /etc/profile.d/i18n.sh &lt;&lt; "EOF"
 <literal># Set up i18n variables
-export LC_ALL=<replaceable>&lt;ll&gt;</replaceable>_<replaceable>&lt;CC&gt;</replaceable>
-export LANG=<replaceable>&lt;ll&gt;</replaceable>_<replaceable>&lt;CC&gt;</replaceable>
-export G_FILENAME_ENCODING=@locale</literal>
-EOF</userinput></screen>
-
-      <para>The <envar>LC_ALL</envar> variable sets the same value for all locale
-      categories. For better control, you may prefer to set values individually for
-      all categories listed in the output of the <command>locale</command>
-      command.</para>
-
-      <para>The <envar>G_FILENAME_ENCODING</envar> variable tells applications
-      such as <application>Glib</application> and <application>GTK+</application>
-      that filenames are in the default locale encoding and not in UTF-8 as
-      assumed by default.</para>
+export LANG=<replaceable>&lt;ll&gt;</replaceable>_<replaceable>&lt;CC&gt;</replaceable>.<replaceable>&lt;charmap&gt;</replaceable><replaceable>&lt;@modifiers&gt;</replaceable></literal>
+EOF</userinput></screen>
 
     </sect3>
