summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/manual/misc/relevant_standards.html.en41
-rw-r--r--docs/manual/new_features_2_0.html2
-rw-r--r--docs/manual/upgrading.html2
3 files changed, 43 insertions, 2 deletions
diff --git a/docs/manual/misc/relevant_standards.html.en b/docs/manual/misc/relevant_standards.html.en
index 4ad5d91f18..99421e383d 100644
--- a/docs/manual/misc/relevant_standards.html.en
+++ b/docs/manual/misc/relevant_standards.html.en
@@ -51,6 +51,7 @@
<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#http_recommendations">HTTP Recommendations</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#html_recommendations">HTML Recommendations</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#authentication">Authentication</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#language_country_codes">Language/Country Codes</a></li>
</ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
@@ -147,6 +148,46 @@
</dl>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="language_country_codes" id="language_country_codes">Language/Country Codes</a></h2>
+
+ <p>The following links document ISO and other language and country
+ code information:</p>
+
+ <dl>
+ <dt><a href="http://www.loc.gov/standards/iso639-2/">ISO 639-2</a></dt>
+
+ <dd>ISO 639 provides two sets of language codes, one as a two-letter
+ code set (639-1) and another as a three-letter code set (this part
+ of ISO 639) for the representation of names of languages.</dd>
+
+ <dt><a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/index.html">
+ ISO 3166-1</a></dt>
+
+ <dd>These pages document the country names (official short names
+ in English) in alphabetical order as given in ISO 3166-1 and the
+ corresponding ISO 3166-1-alpha-2 code elements.</dd>
+
+ <dt><a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">BCP 47</a>
+ (Best Current Practice),
+ <a href="http://www.rfc-editor.org/rfc/rfc3066.txt">RFC 3066</a></dt>
+
+ <dd>This document describes a language tag for use in cases where
+ it is desired to indicate the language used in an information
+ object, how to register values for use in this language tag,
+ and a construct for matching such language tags.</dd>
+
+ <dt><a href="http://www.rfc-editor.org/rfc/rfc3282.txt">RFC 3282</a>
+ (Standards Track)</dt>
+
+ <dd>This document defines a "Content-language:" header, for use in
+ cases where one desires to indicate the language of something that
+ has RFC 822-like headers, like MIME body parts or Web documents,
+ and an "Accept-Language:" header for use in cases where one wishes
+ to indicate one's preferences with regard to language.</dd>
+ </dl>
+
</div></div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/misc/relevant_standards.html" title="English">&nbsp;en&nbsp;</a></p>
diff --git a/docs/manual/new_features_2_0.html b/docs/manual/new_features_2_0.html
index 74c1831ba8..c6fdf07862 100644
--- a/docs/manual/new_features_2_0.html
+++ b/docs/manual/new_features_2_0.html
@@ -20,4 +20,4 @@ Content-type: text/html; charset=EUC-KR
URI: new_features_2_0.html.ru.koi8-r
Content-Language: ru
-Content-type: text/html; charset=KOI8-r
+Content-type: text/html; charset=KOI8-R
diff --git a/docs/manual/upgrading.html b/docs/manual/upgrading.html
index 093173f4be..c376453c0e 100644
--- a/docs/manual/upgrading.html
+++ b/docs/manual/upgrading.html
@@ -20,4 +20,4 @@ Content-type: text/html; charset=EUC-KR
URI: upgrading.html.ru.koi8-r
Content-Language: ru
-Content-type: text/html; charset=KOI8-r
+Content-type: text/html; charset=KOI8-R