Commit 60fb8de0 authored by Joshua Slive's avatar Joshua Slive
Browse files

Move all the listings of languages and charcter sets and 

related directives to extra/


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/simple-conf@159789 13f79535-47bb-0310-9956-ffa450edef68
parent 65addeeb

docs/conf/extra/httpd-languages.conf

0 → 100644
+139 −0
Original line number Diff line number Diff line 
#

# Settings for hosting different languages.

#

# Required modules: mod_mime, mod_negotiation



# DefaultLanguage and 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 the user can understand.

#

# Specify a default language. This means that all data

# going out without a specific language tag (see below) will 

# be marked with this one. You probably do NOT want to set

# this unless you are sure it is correct for all cases.

#

# * It is generally better to not mark a page as 

# * being a certain language than marking it with the wrong

# * language!

#

# DefaultLanguage nl

#

# 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 some cases 

# the two character 'Language' abbreviation 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. There is 'work in progress' to fix this and get

# the reference data for rfc1766 cleaned up.

#

# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl)

# English (en) - Esperanto (eo) - 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 de .de

AddLanguage el .el

AddLanguage en .en

AddLanguage eo .eo

AddLanguage es .es

AddLanguage et .et

AddLanguage fr .fr

AddLanguage he .he

AddLanguage hr .hr

AddLanguage it .it

AddLanguage ja .ja

AddLanguage ko .ko

AddLanguage ltz .ltz

AddLanguage nl .nl

AddLanguage nn .nn

AddLanguage no .no

AddLanguage pl .po

AddLanguage pt .pt

AddLanguage pt-BR .pt-br

AddLanguage ru .ru

AddLanguage sv .sv

AddLanguage zh-CN .zh-cn

AddLanguage zh-TW .zh-tw



# 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. We have

# more or less alphabetized them here. You probably want to change this.

#

LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW



#

# ForceLanguagePriority allows you to serve a result page rather than

# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback)

# [in case no accepted languages matched the available variants]

#

ForceLanguagePriority Prefer Fallback



#

# Commonly used filename extensions to character sets. You probably

# want to avoid clashes with the language extensions, unless you

# are good at carefully testing your setup after each change.

# See http://www.iana.org/assignments/character-sets for the

# official list of charset names and their respective RFCs.

#

AddCharset us-ascii.ascii .us-ascii

AddCharset ISO-8859-1  .iso8859-1  .latin1

AddCharset ISO-8859-2  .iso8859-2  .latin2 .cen

AddCharset ISO-8859-3  .iso8859-3  .latin3

AddCharset ISO-8859-4  .iso8859-4  .latin4

AddCharset ISO-8859-5  .iso8859-5  .cyr .iso-ru

AddCharset ISO-8859-6  .iso8859-6  .arb .arabic

AddCharset ISO-8859-7  .iso8859-7  .grk .greek

AddCharset ISO-8859-8  .iso8859-8  .heb .hebrew

AddCharset ISO-8859-9  .iso8859-9  .latin5 .trk

AddCharset ISO-8859-10  .iso8859-10  .latin6

AddCharset ISO-8859-13  .iso8859-13

AddCharset ISO-8859-14  .iso8859-14  .latin8

AddCharset ISO-8859-15  .iso8859-15  .latin9

AddCharset ISO-8859-16  .iso8859-16  .latin10

AddCharset ISO-2022-JP .iso2022-jp .jis

AddCharset ISO-2022-KR .iso2022-kr .kis

AddCharset ISO-2022-CN .iso2022-cn .cis

AddCharset Big5.Big5   .big5 .b5

AddCharset cn-Big5 .cn-big5

# For russian, more than one charset is used (depends on client, mostly):

AddCharset WINDOWS-1251 .cp-1251   .win-1251

AddCharset CP866   .cp866

AddCharset KOI8  .koi8

AddCharset KOI8-E  .koi8-e

AddCharset KOI8-r  .koi8-r .koi8-ru

AddCharset KOI8-U  .koi8-u

AddCharset KOI8-ru .koi8-uk .ua

AddCharset ISO-10646-UCS-2 .ucs2

AddCharset ISO-10646-UCS-4 .ucs4

AddCharset UTF-7   .utf7

AddCharset UTF-8   .utf8

AddCharset UTF-16  .utf16

AddCharset UTF-16BE.utf16be

AddCharset UTF-16LE.utf16le

AddCharset UTF-32  .utf32

AddCharset UTF-32BE.utf32be

AddCharset UTF-32LE.utf32le

AddCharset euc-cn  .euc-cn

AddCharset euc-gb  .euc-gb

AddCharset euc-jp  .euc-jp

AddCharset euc-kr  .euc-kr

#Not sure how euc-tw got in - IANA doesn't list it???

AddCharset EUC-TW  .euc-tw

AddCharset gb2312  .gb2312 .gb

AddCharset iso-10646-ucs-2 .ucs-2 .iso-10646-ucs-2

AddCharset iso-10646-ucs-4 .ucs-4 .iso-10646-ucs-4

AddCharset shift_jis   .shift_jis .sjis
 
 No newline at end of file

docs/conf/httpd-std.conf.in

+4 −139
Original line number Diff line number Diff line
@@ -643,147 +643,9 @@ ServerSignature On 
    AddType application/x-compress .Z

    AddType application/x-gzip .gz .tgz



    #

    # DefaultLanguage and 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 the user can understand.

    #

    # Specify a default language. This means that all data

    # going out without a specific language tag (see below) will 

    # be marked with this one. You probably do NOT want to set

    # this unless you are sure it is correct for all cases.

    #

    # * It is generally better to not mark a page as 

    # * being a certain language than marking it with the wrong

    # * language!

    #

    # DefaultLanguage nl

    #

    # 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 some cases 

    # the two character 'Language' abbreviation 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. There is 'work in progress' to fix this and get

    # the reference data for rfc1766 cleaned up.

    #

    # Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl)

    # English (en) - Esperanto (eo) - 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 de .de

    AddLanguage el .el

    AddLanguage en .en

    AddLanguage eo .eo

    AddLanguage es .es

    AddLanguage et .et

    AddLanguage fr .fr

    AddLanguage he .he

    AddLanguage hr .hr

    AddLanguage it .it

    AddLanguage ja .ja

    AddLanguage ko .ko

    AddLanguage ltz .ltz

    AddLanguage nl .nl

    AddLanguage nn .nn

    AddLanguage no .no

    AddLanguage pl .po

    AddLanguage pt .pt

    AddLanguage pt-BR .pt-br

    AddLanguage ru .ru

    AddLanguage sv .sv

    AddLanguage zh-CN .zh-cn

    AddLanguage zh-TW .zh-tw

</IfModule>



<IfModule negotiation_module>

    #

    # 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. We have

    # more or less alphabetized them here. You probably want to change this.

    #

    LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW



    #

    # ForceLanguagePriority allows you to serve a result page rather than

    # MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback)

    # [in case no accepted languages matched the available variants]

    #

    ForceLanguagePriority Prefer Fallback



</IfModule>



<IfModule mime_module>

    #

    # Commonly used filename extensions to character sets. You probably

    # want to avoid clashes with the language extensions, unless you

    # are good at carefully testing your setup after each change.

    # See http://www.iana.org/assignments/character-sets for the

    # official list of charset names and their respective RFCs.

    #

    AddCharset us-ascii    .ascii .us-ascii

    AddCharset ISO-8859-1  .iso8859-1  .latin1

    AddCharset ISO-8859-2  .iso8859-2  .latin2 .cen

    AddCharset ISO-8859-3  .iso8859-3  .latin3

    AddCharset ISO-8859-4  .iso8859-4  .latin4

    AddCharset ISO-8859-5  .iso8859-5  .cyr .iso-ru

    AddCharset ISO-8859-6  .iso8859-6  .arb .arabic

    AddCharset ISO-8859-7  .iso8859-7  .grk .greek

    AddCharset ISO-8859-8  .iso8859-8  .heb .hebrew

    AddCharset ISO-8859-9  .iso8859-9  .latin5 .trk

    AddCharset ISO-8859-10  .iso8859-10  .latin6

    AddCharset ISO-8859-13  .iso8859-13

    AddCharset ISO-8859-14  .iso8859-14  .latin8

    AddCharset ISO-8859-15  .iso8859-15  .latin9

    AddCharset ISO-8859-16  .iso8859-16  .latin10

    AddCharset ISO-2022-JP .iso2022-jp .jis

    AddCharset ISO-2022-KR .iso2022-kr .kis

    AddCharset ISO-2022-CN .iso2022-cn .cis

    AddCharset Big5        .Big5       .big5 .b5

    AddCharset cn-Big5     .cn-big5

    # For russian, more than one charset is used (depends on client, mostly):

    AddCharset WINDOWS-1251 .cp-1251   .win-1251

    AddCharset CP866       .cp866

    AddCharset KOI8      .koi8

    AddCharset KOI8-E      .koi8-e

    AddCharset KOI8-r      .koi8-r .koi8-ru

    AddCharset KOI8-U      .koi8-u

    AddCharset KOI8-ru     .koi8-uk .ua

    AddCharset ISO-10646-UCS-2 .ucs2

    AddCharset ISO-10646-UCS-4 .ucs4

    AddCharset UTF-7       .utf7

    AddCharset UTF-8       .utf8

    AddCharset UTF-16      .utf16

    AddCharset UTF-16BE    .utf16be

    AddCharset UTF-16LE    .utf16le

    AddCharset UTF-32      .utf32

    AddCharset UTF-32BE    .utf32be

    AddCharset UTF-32LE    .utf32le

    AddCharset euc-cn      .euc-cn

    AddCharset euc-gb      .euc-gb

    AddCharset euc-jp      .euc-jp

    AddCharset euc-kr      .euc-kr

    #Not sure how euc-tw got in - IANA doesn't list it???

    AddCharset EUC-TW      .euc-tw

    AddCharset gb2312      .gb2312 .gb

    AddCharset iso-10646-ucs-2 .ucs-2 .iso-10646-ucs-2

    AddCharset iso-10646-ucs-4 .ucs-4 .iso-10646-ucs-4

    AddCharset shift_jis   .shift_jis .sjis



    #

    # AddHandler allows you to map certain file extensions to "handlers":
@@ -948,3 +810,6 @@ ServerSignature On 


# Fancy directory listings

# Include extra/httpd-autoindex.conf



# Language settings

# Include extra/httpd-languages.conf
 
 No newline at end of file