Update Question 2.2:

- Make listing of the document's language and encoding more explicit,
  add country names for each encoding
- Move the note for Microsoft's Rich Text Format from <footnote> to
  <note> therefore fix its rendering
- Replace "Zip" with "<literal>zip</literal>"
- Replace "BZip2" with "<literal>bzip2</literal>"

Submitted by:	gabor
Approved by:	gabor (mentor)

1 files changed, 27 insertions, 26 deletions

diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index d8f5341434..8b1a3c9abf 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -681,13 +681,13 @@
 		    <row>
 		      <entry><literal>en_US.ISO8859-1</literal></entry>
 
-		      <entry>US English</entry>
+		      <entry>English (United States)</entry>
 		    </row>
 
 		    <row>
 		      <entry><literal>bn_BD.ISO10646-1</literal></entry>
 
-		      <entry>Bengali (or Bangla)</entry>
+		      <entry>Bengali or Bangla (Bangladesh)</entry>
 		    </row>
 
 		    <row>
@@ -699,7 +699,7 @@
 		    <row>
 		      <entry><literal>de_DE.ISO8859-1</literal></entry>
 
-		      <entry>German</entry>
+		      <entry>German (Germany)</entry>
 		    </row>
 
 		    <row>
@@ -711,37 +711,37 @@
 		    <row>
 		      <entry><literal>es_ES.ISO8859-1</literal></entry>
 
-		      <entry>Spanish</entry>
+		      <entry>Spanish (Spain)</entry>
 		    </row>
 
 		    <row>
 		      <entry><literal>fr_FR.ISO8859-1</literal></entry>
 
-		      <entry>French</entry>
+		      <entry>French (France)</entry>
 		    </row>
 
 		    <row>
 		      <entry><literal>hu_HU.ISO8859-2</literal></entry>
 
-		      <entry>Hungarian</entry>
+		      <entry>Hungarian (Hungary)</entry>
 		    </row>
 
 		    <row>
 		      <entry><literal>it_IT.ISO8859-15</literal></entry>
 
-		      <entry>Italian</entry>
+		      <entry>Italian (Italy)</entry>
 		    </row>
 
 		    <row>
 		      <entry><literal>ja_JP.eucJP</literal></entry>
 
-		      <entry>Japanese (EUC encoding)</entry>
+		      <entry>Japanese (Japan, EUC encoding)</entry>
 		    </row>
 
 		    <row>
 		      <entry><literal>mn_MN.UTF-8</literal></entry>
 
-		      <entry>Mongolian (UTF-8 encoding)</entry>
+		      <entry>Mongolian (Mongolia, UTF-8 encoding)</entry>
 		    </row>
 
 		    <row>
@@ -771,7 +771,7 @@
 		    <row>
 		      <entry><literal>ru_RU.KOI8-R</literal></entry>
 
-		      <entry>Russian (KOI8-R encoding)</entry>
+		      <entry>Russian (Russia, KOI8-R encoding)</entry>
 		    </row>
 
 		    <row>
@@ -789,14 +789,14 @@
 		    <row>
 		      <entry><literal>zh_CN.GB2312</literal></entry>
 
-		      <entry>Simplified Chinese (GB2312
+		      <entry>Simplified Chinese (China, GB2312
 			encoding)</entry>
 		    </row>
 
 		    <row>
 		      <entry><literal>zh_TW.Big5</literal></entry>
 
-		      <entry>Traditional Chinese (Big5 encoding)</entry>
+		      <entry>Traditional Chinese (Taiwan, Big5 encoding)</entry>
 		    </row>
 		  </tbody>
 		</tgroup>
@@ -869,16 +869,7 @@
 		    <row>
 		      <entry><literal>rtf</literal></entry>
 
-		      <entry>Microsoft's Rich Text Format<footnote>
-			  <para>Page numbers are not automatically
-			    updated when loading this format into Word.
-			    Press <keycombo
-			      action="simul"><keycap>CTRL</keycap><keycap>A</keycap></keycombo>,
-			    <keycombo
-			      action="simul"><keycap>CTRL</keycap><keycap>END</keycap></keycombo>,
-			    <keycap>F9</keycap> after loading the
-			    document, to update the page numbers.</para></footnote>
-		      </entry>
+		      <entry>Microsoft's Rich Text Format</entry>
 		    </row>
 
 		    <row>
@@ -889,6 +880,16 @@
 		  </tbody>
 		</tgroup>
 	      </informaltable>
+
+	      <note>
+		<para>Page numbers are not automatically updated when
+		  loading Rich Text Format into Word.  Press <keycombo
+		    action="simul"><keycap>Ctrl</keycap><keycap>A</keycap></keycombo>,
+		  <keycombo
+		    action="simul"><keycap>Ctrl</keycap><keycap>End</keycap></keycombo>,
+		  <keycap>F9</keycap> after loading the document, to
+		  update the page numbers.</para>
+	      </note>
 	    </listitem>
 
 	    <listitem>
@@ -928,7 +929,7 @@
 			<row>
 			  <entry><literal>zip</literal></entry>
 
-			  <entry>The Zip format.  If you want to
+			  <entry>The <literal>zip</literal> format.  If you want to
 			    uncompress this on &os; you will need to
 			    install the <filename
 			      role="package">archivers/unzip</filename>
@@ -938,8 +939,8 @@
 			<row>
 			  <entry><literal>bz2</literal></entry>
 
-			  <entry>The BZip2 format.  Less widespread than
-			    Zip, but generally gives smaller files.
+			  <entry>The <literal>bzip2</literal> format.  Less widespread than
+			    <literal>zip</literal>, but generally gives smaller files.
 			    Install the <filename
 			      role="package">archivers/bzip2</filename>
 			    port to uncompress these files.</entry>
@@ -949,7 +950,7 @@
 		  </informaltable>
 
 		  <para>So the &postscript; version of the Handbook,
-		    compressed using BZip2 will be stored in a file
+		    compressed using <literal>bzip2</literal> will be stored in a file
 		    called <filename>book.ps.bz2</filename> in the
 		    <filename class="directory">handbook/</filename> directory.</para>
 		</listitem>