cleanup addlanguage/comments and languagepriority

PR: 21743

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

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 8048e369386e09e68f80119e30a6365a1060e6d2..f231589156e87f0c850a5f1db069db45ea8d5744 100644 (file)
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -767,40 +767,39 @@ ServerSignature On
     # specifier. There is 'work in progress' to fix this and get
     # the reference data for rfc1766 cleaned up.
     #
-    # Danish (da) - Dutch (nl) - English (en) - Estonian (et)
-    # French (fr) - German (de) - Greek-Modern (el)
-    # Italian (it) - Norwegian (no) - Norwegian Nynorsk (nn) - Korean (ko) 
-    # Portugese (pt) - Luxembourgeois* (ltz)
-    # Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cs)
-    # Polish (pl) - Brazilian Portuguese (pt-br) - Japanese (ja)
-    # Russian (ru) - Croatian (hr)
+    # Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl)
+    # English (en) - Estonian (et) - French (fr) - German (de)
+    # Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja)
+    # Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn)
+    # Norwegian (no) - Polish (pl) - Portugese (pt)
+    # Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv)
+    # Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW)
     #
+    AddLanguage ca .ca
+    AddLanguage cs .cz .cs
     AddLanguage da .dk
-    AddLanguage nl .nl
     AddLanguage en .en
+    AddLanguage es .es
     AddLanguage et .et
     AddLanguage fr .fr
     AddLanguage de .de
     AddLanguage he .he
+    AddLanguage hr .hr
     AddLanguage el .el
     AddLanguage it .it
     AddLanguage ja .ja
-    AddLanguage pl .po
     AddLanguage ko .ko
-    AddLanguage pt .pt
+    AddLanguage ltz .ltz
+    AddLanguage nl .nl
     AddLanguage nn .nn
     AddLanguage no .no
-    AddLanguage pt-br .pt-br
-    AddLanguage ltz .ltz
-    AddLanguage ca .ca
-    AddLanguage es .es
+    AddLanguage pl .po
+    AddLanguage pt .pt
+    AddLanguage pt-BR .pt-br
     AddLanguage sv .sv
-    AddLanguage cs .cz .cs
     AddLanguage ru .ru
     AddLanguage zh-CN .zh-cn
     AddLanguage zh-TW .zh-tw
-    AddLanguage hr .hr
-
 </IfModule>
 
 <IfModule mod_negotiation.c>
@@ -811,7 +810,7 @@ ServerSignature On
     # 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 ko no pl pt pt-br ltz ca es sv tw
+    LanguagePriority en ca cs da es et fr de he hr el it ja ko ltz nl nn no pl pt pt-BR sv ru zh-CN zh-TW
 
     #
     # ForceLanguagePriority allows you to serve a result page rather than

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 212f0756ad94dbb5d37de40f6e1044cf662242e0..0f8906918dfa399cbd7de4b8d09a2aeee0544531 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -667,39 +667,39 @@ AddType application/x-gzip .gz .tgz
 # specifier. There is 'work in progress' to fix this and get
 # the reference data for rfc1766 cleaned up.
 #
-# Danish (da) - Dutch (nl) - English (en) - Estonian (et)
-# French (fr) - German (de) - Greek-Modern (el)
-# Italian (it) - Norwegian (no) - Norwegian Nynorsk (nn) - Korean (ko)
-# Portugese (pt) - Luxembourgeois* (ltz)
-# Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cs)
-# Polish (pl) - Brazilian Portuguese (pt-br) - Japanese (ja)
-# Russian (ru) - Croatian (hr)
+# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl)
+# English (en) - Estonian (et) - French (fr) - German (de)
+# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja)
+# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn)
+# Norwegian (no) - Polish (pl) - Portugese (pt)
+# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv)
+# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW)
 #
+AddLanguage ca .ca
+AddLanguage cs .cz .cs
 AddLanguage da .dk
-AddLanguage nl .nl
 AddLanguage en .en
+AddLanguage es .es
 AddLanguage et .et
 AddLanguage fr .fr
 AddLanguage de .de
 AddLanguage he .he
+AddLanguage hr .hr
 AddLanguage el .el
 AddLanguage it .it
 AddLanguage ja .ja
-AddLanguage pl .po
 AddLanguage ko .ko
-AddLanguage pt .pt
+AddLanguage ltz .ltz
+AddLanguage nl .nl
 AddLanguage nn .nn
 AddLanguage no .no
-AddLanguage pt-br .pt-br
-AddLanguage ltz .ltz
-AddLanguage ca .ca
-AddLanguage es .es
+AddLanguage pl .po
+AddLanguage pt .pt
+AddLanguage pt-BR .pt-br
 AddLanguage sv .sv
-AddLanguage cs .cz .cs
 AddLanguage ru .ru
 AddLanguage zh-CN .zh-cn
 AddLanguage zh-TW .zh-tw
-AddLanguage hr .hr
 
 #
 # LanguagePriority allows you to give precedence to some languages
@@ -708,7 +708,7 @@ AddLanguage hr .hr
 # 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 ko no pl pt pt-br ltz ca es sv tw
+LanguagePriority en ca cs da es et fr de he hr el it ja ko ltz nl nn no pl pt pt-BR sv ru zh-CN zh-TW
 
 #
 # ForceLanguagePriority allows you to serve a result page rather than