Added NO and KR intro pages donated by Lee Kuk Hyun and Lorant Czaran

and copied some lang's across into the conf file.
PR:
Obtained from: Lee Kuk Hyun and Lorant Czaran
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84782 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 88 insertions, 18 deletions

diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf
index 39004fc5bf..7b0f6632ad 100644
--- a/docs/conf/httpd-std.conf
+++ b/docs/conf/httpd-std.conf
@@ -632,24 +632,59 @@ AddEncoding x-gzip gz tgz
 #
 # AddLanguage allows you to specify the language of a document. You can
 # then use content negotiation to give a browser a file in a language
-# it can understand.  Note that the suffix does not have to be the same
-# as the language keyword --- those with documents in Polish (whose
-# net-standard language code is pl) may wish to use "AddLanguage pl .po" 
-# to avoid the ambiguity with the common suffix for perl scripts.
-#
+# it can understand.
+#
+# Note 1: The suffix does not have to be the same as the language
+# keyword --- those with documents in Polish (whose net-standard
+# language code is pl) may wish to use "AddLanguage pl .po" to
+# avoid the ambiguity with the common suffix for perl scripts.
+#
+# Note 2: The example entries below illustrate that in quite
+# some cases the two character 'Language' abbriviation is not
+# identical to the two character 'Country' code for its country,
+# E.g. 'Danmark/dk' versus 'Danish/da'.
+#
+# Note 3: In the case of 'ltz' we violate the RFC by using a three char
+# specifier. But there is 'work in progress' to fix this and get
+# the reference data for rfc1766 cleaned up.
+#
+# Danish (da) - Dutch (nl) - English (en) - Estonian (ee)
+# French (fr) - German (de) - Greek-Modern (el)
+# Italian (it) - Norwegian (no) - Korean (kr) 
+# Portugese (pt) - Luxembourgeois* (ltz)
+# Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cz)
+# Polish (pl) - Brazilian Portuguese (pt-br) - Japanese (ja)
+#
+AddLanguage da .dk
+AddLanguage nl .nl
 AddLanguage en .en
+AddLanguage et .ee
 AddLanguage fr .fr
 AddLanguage de .de
-AddLanguage da .da
 AddLanguage el .el
 AddLanguage it .it
+AddLanguage ja .ja
+AddCharset ISO-2022-JP .jis
+AddLanguage pl .po
+AddLanguage kr .kr
+AddCharset ISO-2022-KR .iso-kr
+AddCharset ISO-8859-2 .iso-pl
+AddLanguage pt .pt
+AddLanguage no .no
+AddLanguage pt-br .pt-br
+AddLanguage ltz .lu
+AddLanguage ca .ca
+AddLanguage es .es
+AddLanguage sv .se
+AddLanguage cz .cz
 
-#
 # LanguagePriority allows you to give precedence to some languages
 # in case of a tie during content negotiation.
-# Just list the languages in decreasing order of preference.
 #
-LanguagePriority en fr de
+# Just list the languages in decreasing order of preference. We have
+# more or less alphabetized them here. You probably want to change this.
+#
+LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ltz ca es sv
 
 #
 # AddType allows you to tweak mime.types without actually editing it, or to
diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index e5f9c1a8ef..6890183b75 100644
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -564,24 +564,59 @@ AddEncoding x-gzip gz tgz
 #
 # AddLanguage allows you to specify the language of a document. You can
 # then use content negotiation to give a browser a file in a language
-# it can understand.  Note that the suffix does not have to be the same
-# as the language keyword --- those with documents in Polish (whose
-# net-standard language code is pl) may wish to use "AddLanguage pl .po" 
-# to avoid the ambiguity with the common suffix for perl scripts.
-#
+# it can understand.
+#
+# Note 1: The suffix does not have to be the same as the language
+# keyword --- those with documents in Polish (whose net-standard
+# language code is pl) may wish to use "AddLanguage pl .po" to
+# avoid the ambiguity with the common suffix for perl scripts.
+#
+# Note 2: The example entries below illustrate that in quite
+# some cases the two character 'Language' abbriviation is not
+# identical to the two character 'Country' code for its country,
+# E.g. 'Danmark/dk' versus 'Danish/da'.
+#
+# Note 3: In the case of 'ltz' we violate the RFC by using a three char
+# specifier. But there is 'work in progress' to fix this and get
+# the reference data for rfc1766 cleaned up.
+#
+# Danish (da) - Dutch (nl) - English (en) - Estonian (ee)
+# French (fr) - German (de) - Greek-Modern (el)
+# Italian (it) - Norwegian (no) - Korean (kr)
+# Portugese (pt) - Luxembourgeois* (ltz)
+# Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cz)
+# Polish (pl) - Brazilian Portuguese (pt-br) - Japanese (ja)
+#
+AddLanguage da .dk
+AddLanguage nl .nl
 AddLanguage en .en
+AddLanguage et .ee
 AddLanguage fr .fr
 AddLanguage de .de
-AddLanguage da .da
 AddLanguage el .el
 AddLanguage it .it
+AddLanguage ja .ja
+AddCharset ISO-2022-JP .jis
+AddLanguage pl .po
+AddLanguage kr .kr
+AddCharset ISO-2022-KR .iso-kr
+AddCharset ISO-8859-2 .iso-pl
+AddLanguage pt .pt
+AddLanguage no .no
+AddLanguage pt-br .pt-br
+AddLanguage ltz .lu
+AddLanguage ca .ca
+AddLanguage es .es
+AddLanguage sv .se
+AddLanguage cz .cz
 
-#
 # LanguagePriority allows you to give precedence to some languages
 # in case of a tie during content negotiation.
-# Just list the languages in decreasing order of preference.
 #
-LanguagePriority en fr de
+# Just list the languages in decreasing order of preference. We have
+# more or less alphabetized them here. You probably want to change this.
+#
+LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ltz ca es sv
 
 #
 # AddType allows you to tweak mime.types without actually editing it, or to