From 2e5d9d52e1b8e219329c84eea0313d14b7fd5a5c Mon Sep 17 00:00:00 2001 From: Rich Bowen Date: Thu, 26 Apr 2012 14:57:35 +0000 Subject: [PATCH] Rebuild Humbedooh's changes. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1330892 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/bind.html.en | 37 +- docs/manual/bind.html.fr | 2 + docs/manual/bind.html.tr.utf8 | 1 + docs/manual/bind.xml.de | 2 +- docs/manual/bind.xml.fr | 2 +- docs/manual/bind.xml.ja | 2 +- docs/manual/bind.xml.ko | 2 +- docs/manual/bind.xml.meta | 4 +- docs/manual/bind.xml.tr | 2 +- docs/manual/caching.html.en | 11 +- docs/manual/caching.html.fr | 2 + docs/manual/caching.html.tr.utf8 | 1 + docs/manual/caching.xml.fr | 2 +- docs/manual/caching.xml.meta | 4 +- docs/manual/caching.xml.tr | 2 +- docs/manual/custom-error.html.en | 20 +- docs/manual/custom-error.html.fr | 2 + docs/manual/custom-error.xml.es | 2 +- docs/manual/custom-error.xml.fr | 2 +- docs/manual/custom-error.xml.ja | 2 +- docs/manual/custom-error.xml.ko | 2 +- docs/manual/custom-error.xml.meta | 2 +- docs/manual/custom-error.xml.tr | 2 +- docs/manual/env.html.en | 92 ++-- docs/manual/env.html.fr | 2 + docs/manual/env.html.tr.utf8 | 1 + docs/manual/env.xml.fr | 2 +- docs/manual/env.xml.ja | 2 +- docs/manual/env.xml.ko | 2 +- docs/manual/env.xml.meta | 4 +- docs/manual/env.xml.tr | 2 +- docs/manual/handler.html.en | 25 +- docs/manual/handler.html.fr | 2 + docs/manual/handler.xml.es | 2 +- docs/manual/handler.xml.fr | 2 +- docs/manual/handler.xml.ja | 2 +- docs/manual/handler.xml.ko | 2 +- docs/manual/handler.xml.meta | 2 +- docs/manual/handler.xml.tr | 2 +- docs/manual/handler.xml.zh-cn | 2 +- docs/manual/logs.html.en | 107 ++--- docs/manual/logs.html.fr | 2 + docs/manual/logs.html.tr.utf8 | 1 + docs/manual/logs.xml.fr | 2 +- docs/manual/logs.xml.ja | 2 +- docs/manual/logs.xml.ko | 2 +- docs/manual/logs.xml.meta | 4 +- docs/manual/logs.xml.tr | 2 +- docs/manual/misc/security_tips.html.en | 38 +- docs/manual/misc/security_tips.xml.fr | 2 +- docs/manual/misc/security_tips.xml.ko | 2 +- docs/manual/misc/security_tips.xml.tr | 2 +- docs/manual/mod/core.html.de | 2 +- docs/manual/mod/core.html.en | 10 +- docs/manual/mod/core.html.ja.utf8 | 2 +- docs/manual/mod/core.xml.de | 2 +- docs/manual/mod/core.xml.es | 2 +- docs/manual/mod/core.xml.fr | 2 +- docs/manual/mod/core.xml.ja | 2 +- docs/manual/mod/core.xml.tr | 2 +- docs/manual/platform/windows.html.en | 39 +- docs/manual/platform/windows.xml.ko | 2 +- docs/manual/rewrite/remapping.html.en | 6 +- docs/manual/sections.html.en | 238 +++++----- docs/manual/sections.html.fr | 2 + docs/manual/sections.html.tr.utf8 | 1 + docs/manual/sections.xml.fr | 2 +- docs/manual/sections.xml.ja | 2 +- docs/manual/sections.xml.ko | 2 +- docs/manual/sections.xml.meta | 4 +- docs/manual/sections.xml.tr | 2 +- docs/manual/ssl/ssl_faq.html.en | 41 +- docs/manual/ssl/ssl_faq.html.fr | 2 + docs/manual/ssl/ssl_faq.xml.fr | 2 +- docs/manual/ssl/ssl_faq.xml.meta | 2 +- docs/manual/ssl/ssl_howto.html.en | 202 +++++---- docs/manual/ssl/ssl_howto.html.fr | 2 + docs/manual/ssl/ssl_howto.xml.fr | 2 +- docs/manual/ssl/ssl_howto.xml.meta | 2 +- docs/manual/suexec.html.en | 9 +- docs/manual/suexec.html.fr | 2 + docs/manual/suexec.xml.fr | 2 +- docs/manual/suexec.xml.ja | 2 +- docs/manual/suexec.xml.ko | 2 +- docs/manual/suexec.xml.meta | 2 +- docs/manual/suexec.xml.tr | 2 +- docs/manual/upgrading.html.en | 32 +- docs/manual/upgrading.html.fr | 2 + docs/manual/upgrading.xml.fr | 2 +- docs/manual/upgrading.xml.meta | 2 +- docs/manual/urlmapping.html.en | 43 +- docs/manual/urlmapping.html.fr | 2 + docs/manual/urlmapping.html.tr.utf8 | 1 + docs/manual/urlmapping.xml.fr | 2 +- docs/manual/urlmapping.xml.ja | 2 +- docs/manual/urlmapping.xml.ko | 2 +- docs/manual/urlmapping.xml.meta | 4 +- docs/manual/urlmapping.xml.tr | 2 +- docs/manual/vhosts/examples.html.en | 496 +++++++++------------ docs/manual/vhosts/examples.html.fr | 2 + docs/manual/vhosts/examples.html.tr.utf8 | 1 + docs/manual/vhosts/examples.xml.fr | 2 +- docs/manual/vhosts/examples.xml.ja | 2 +- docs/manual/vhosts/examples.xml.ko | 2 +- docs/manual/vhosts/examples.xml.meta | 4 +- docs/manual/vhosts/examples.xml.tr | 2 +- docs/manual/vhosts/fd-limits.html.en | 7 +- docs/manual/vhosts/fd-limits.html.fr | 2 + docs/manual/vhosts/fd-limits.html.tr.utf8 | 1 + docs/manual/vhosts/fd-limits.xml.fr | 2 +- docs/manual/vhosts/fd-limits.xml.ja | 2 +- docs/manual/vhosts/fd-limits.xml.ko | 2 +- docs/manual/vhosts/fd-limits.xml.meta | 4 +- docs/manual/vhosts/fd-limits.xml.tr | 2 +- docs/manual/vhosts/ip-based.html.en | 40 +- docs/manual/vhosts/ip-based.html.fr | 2 + docs/manual/vhosts/ip-based.html.tr.utf8 | 1 + docs/manual/vhosts/ip-based.xml.fr | 2 +- docs/manual/vhosts/ip-based.xml.ja | 2 +- docs/manual/vhosts/ip-based.xml.ko | 2 +- docs/manual/vhosts/ip-based.xml.meta | 4 +- docs/manual/vhosts/ip-based.xml.tr | 2 +- docs/manual/vhosts/mass.html.en | 153 ++++--- docs/manual/vhosts/mass.html.tr.utf8 | 1 + docs/manual/vhosts/mass.xml.fr | 2 +- docs/manual/vhosts/mass.xml.ko | 2 +- docs/manual/vhosts/mass.xml.meta | 2 +- docs/manual/vhosts/mass.xml.tr | 2 +- docs/manual/vhosts/name-based.html.en | 35 +- docs/manual/vhosts/name-based.html.fr | 2 + docs/manual/vhosts/name-based.html.tr.utf8 | 1 + docs/manual/vhosts/name-based.xml.de | 2 +- docs/manual/vhosts/name-based.xml.fr | 2 +- docs/manual/vhosts/name-based.xml.ja | 2 +- docs/manual/vhosts/name-based.xml.ko | 2 +- docs/manual/vhosts/name-based.xml.meta | 4 +- docs/manual/vhosts/name-based.xml.tr | 2 +- 137 files changed, 991 insertions(+), 931 deletions(-) diff --git a/docs/manual/bind.html.en b/docs/manual/bind.html.en index 281f1399da..7999aec41a 100644 --- a/docs/manual/bind.html.en +++ b/docs/manual/bind.html.en @@ -68,25 +68,28 @@

For example, to make the server accept connections on both port 80 and port 8000, on all interfaces, use:

-

- Listen 80
- Listen 8000 -

+ 
+Listen 80
+Listen 8000
+
+

To make the server accept connections on port 80 for one interface, and port 8000 on another, use

-

- Listen 192.0.2.1:80
- Listen 192.0.2.5:8000 -

+ 
+Listen 192.0.2.1:80
+Listen 192.0.2.5:8000
+
+

IPv6 addresses must be enclosed in square brackets, as in the following example:

-

+ 

       Listen [2001:db8::a00:20ff:fea7:ccea]:80
-
+ +

Overlapping Listen directives will result in a fatal error which will prevent the server from starting up.

@@ -131,10 +134,11 @@ Listen directives, as in the following examples:

-

- Listen 0.0.0.0:80
- Listen 192.0.2.1:80 -

+ 
+Listen 0.0.0.0:80
+Listen 192.0.2.1:80
+
+

If your platform supports it and you want httpd to handle IPv4 and IPv6 connections on separate sockets (i.e., to disable IPv4-mapped @@ -156,9 +160,10 @@

You only need to set the protocol if you are running on non-standard ports. For example, running an https site on port 8443:

-

+ 

       Listen 192.170.2.1:8443 https
-
+ +
top

How This Works With Virtual Hosts

diff --git a/docs/manual/bind.html.fr b/docs/manual/bind.html.fr index 86bf0e79d0..b48b646a07 100644 --- a/docs/manual/bind.html.fr +++ b/docs/manual/bind.html.fr @@ -28,6 +28,8 @@  ko  |  tr 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

Configuration du serveur HTTP Apache pour l'écoute sur un port et une adresse IP spécifiques.

diff --git a/docs/manual/bind.html.tr.utf8 b/docs/manual/bind.html.tr.utf8 index 0eb91ac593..961e0b37be 100644 --- a/docs/manual/bind.html.tr.utf8 +++ b/docs/manual/bind.html.tr.utf8 @@ -28,6 +28,7 @@  ko  |  tr 

+
Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.

Apache HTTPD sunucusunun belli adresleri ve portları dinlemek üzere yapılandırılması.

diff --git a/docs/manual/bind.xml.de b/docs/manual/bind.xml.de index 4eef8998d6..f4b34a7faa 100644 --- a/docs/manual/bind.xml.de +++ b/docs/manual/bind.xml.de @@ -1,7 +1,7 @@ - + - + + + + - + + + + diff --git a/docs/manual/custom-error.xml.ja b/docs/manual/custom-error.xml.ja index cd28ce8eb6..ffefc68cc4 100644 --- a/docs/manual/custom-error.xml.ja +++ b/docs/manual/custom-error.xml.ja @@ -1,7 +1,7 @@ - + + + + diff --git a/docs/manual/env.xml.ja b/docs/manual/env.xml.ja index 7f055439e6..b47a605432 100644 --- a/docs/manual/env.xml.ja +++ b/docs/manual/env.xml.ja @@ -1,7 +1,7 @@ - + + + + - + + + + + - + + + + + diff --git a/docs/manual/misc/security_tips.xml.ko b/docs/manual/misc/security_tips.xml.ko index 94d8c0135f..68b5680216 100644 --- a/docs/manual/misc/security_tips.xml.ko +++ b/docs/manual/misc/security_tips.xml.ko @@ -1,7 +1,7 @@ - + + + + + diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index a328999e3d..e3f480f25c 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + + + - + + + + + diff --git a/docs/manual/ssl/ssl_faq.xml.meta b/docs/manual/ssl/ssl_faq.xml.meta index 61db826966..a5d5a97804 100644 --- a/docs/manual/ssl/ssl_faq.xml.meta +++ b/docs/manual/ssl/ssl_faq.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/ssl/ssl_howto.html.en b/docs/manual/ssl/ssl_howto.html.en index 423813f1a8..7e9d1237ff 100644 --- a/docs/manual/ssl/ssl_howto.html.en +++ b/docs/manual/ssl/ssl_howto.html.en @@ -44,17 +44,16 @@ before progressing to the advanced techniques.

Your SSL configuration will need to contain, at minimum, the following directives.

-

- Listen 443
- <VirtualHost *:443>
- - ServerName www.example.com
- SSLEngine on
- SSLCertificateFile /path/to/www.example.com.cert
- SSLCertificateKeyFile /path/to/www.example.com.key
- - </VirtualHost> -

+
+Listen 443
+<VirtualHost *:443>
+    ServerName www.example.com
+    SSLEngine on
+    SSLCertificateFile /path/to/www.example.com.cert
+    SSLCertificateKeyFile /path/to/www.example.com.key
+</VirtualHost>
+
+
top
@@ -70,18 +69,20 @@ requires a strong cipher for access to a particular URL? only?

The following enables only the strongest ciphers:

-

httpd.conf

- SSLCipherSuite HIGH:!aNULL:!MD5
-

+ 
+      SSLCipherSuite HIGH:!aNULL:!MD5
+
+

While with the following configuration you specify a preference for specific speed-optimized ciphers (which will be selected by mod_ssl, provided that they are supported by the client):

-

httpd.conf

- SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:!aNULL:!MD5
- SSLHonorCipherOrder on -

+ 
+SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:!aNULL:!MD5
+SSLHonorCipherOrder on
+
+

How can I create an SSL server which accepts all types of ciphers @@ -94,16 +95,17 @@ URL?

blocks, to give a per-directory solution, and can automatically force a renegotiation of the SSL parameters to meet the new configuration. This can be done as follows:

-

- # be liberal in general
- SSLCipherSuite ALL:!aNULL:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP:+eNULL
-
- <Location /strong/area>
- # but https://hostname/strong/area/ and below
- # requires strong ciphers
- SSLCipherSuite HIGH:!aNULL:!MD5
- </Location> -

+ 
+# be liberal in general
+SSLCipherSuite ALL:!aNULL:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP:+eNULL
+
+<Location /strong/area>
+# but https://hostname/strong/area/ and below
+# requires strong ciphers
+SSLCipherSuite HIGH:!aNULL:!MD5
+</Location>
+
+
top
@@ -128,13 +130,14 @@ Intranet website, for clients coming from the Internet? need to do is to create client certificates signed by your own CA certificate (ca.crt) and then verify the clients against this certificate.

-

httpd.conf

- # require a client certificate which has to be directly
- # signed by our CA certificate in ca.crt
- SSLVerifyClient require
- SSLVerifyDepth 1
- SSLCACertificateFile conf/ssl.crt/ca.crt -

+ 
+# require a client certificate which has to be directly
+# signed by our CA certificate in ca.crt
+SSLVerifyClient require
+SSLVerifyDepth 1
+SSLCACertificateFile conf/ssl.crt/ca.crt
+
+

How can I force clients to authenticate using certificates for a @@ -145,15 +148,16 @@ Intranet website, for clients coming from the Internet? you can use the per-directory reconfiguration features of mod_ssl:

-

httpd.conf

- SSLVerifyClient none
- SSLCACertificateFile conf/ssl.crt/ca.crt
-
- <Location /secure/area>
- SSLVerifyClient require
- SSLVerifyDepth 1
- </Location>
-

+ 
+SSLVerifyClient none
+SSLCACertificateFile conf/ssl.crt/ca.crt
+
+<Location /secure/area>
+SSLVerifyClient require
+SSLVerifyDepth 1
+</Location>
+
+

How can I allow only clients who have certificates to access a @@ -172,22 +176,23 @@ Intranet website, for clients coming from the Internet? you should establish a password database containing all clients allowed, as follows:

-

httpd.conf

+    
 SSLVerifyClient      none
 <Directory /usr/local/apache2/htdocs/secure/area>
+    SSLVerifyClient      require
+    SSLVerifyDepth       5
+    SSLCACertificateFile conf/ssl.crt/ca.crt
+    SSLCACertificatePath conf/ssl.crt
+    SSLOptions           +FakeBasicAuth
+    SSLRequireSSL
+    AuthName             "Snake Oil Authentication"
+    AuthType             Basic
+    AuthBasicProvider    file
+    AuthUserFile         /usr/local/apache2/conf/httpd.passwd
+    Require              valid-user
+</Directory>
+    

 
-SSLVerifyClient      require
-SSLVerifyDepth       5
-SSLCACertificateFile conf/ssl.crt/ca.crt
-SSLCACertificatePath conf/ssl.crt
-SSLOptions           +FakeBasicAuth
-SSLRequireSSL
-AuthName             "Snake Oil Authentication"
-AuthType             Basic
-AuthBasicProvider    file
-AuthUserFile         /usr/local/apache2/conf/httpd.passwd
-Require              valid-user
-</Directory>

The password used in this example is the DES encrypted string "password". See the SSLOptions docs for more @@ -202,10 +207,9 @@ Require valid-user into the DN, you can match them more easily using SSLRequire, as follows:

-

httpd.conf

+    
 SSLVerifyClient      none
 <Directory /usr/local/apache2/htdocs/secure/area>
-
   SSLVerifyClient      require
   SSLVerifyDepth       5
   SSLCACertificateFile conf/ssl.crt/ca.crt
@@ -214,7 +218,9 @@ SSLVerifyClient      none
   SSLRequireSSL
   SSLRequire       %{SSL_CLIENT_S_DN_O}  eq "Snake Oil, Ltd." \
                and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"}
-</Directory>
+</Directory> + +

How can I require HTTPS with strong ciphers, and either basic @@ -229,49 +235,51 @@ plain HTTP access for clients on the Intranet.

This configuration should remain outside of your HTTPS virtual host, so that it applies to both HTTPS and HTTP.

-

httpd.conf

+    
 SSLCACertificateFile conf/ssl.crt/company-ca.crt
 
 <Directory /usr/local/apache2/htdocs>
-#   Outside the subarea only Intranet access is granted
-Order                deny,allow
-Deny                 from all
-Allow                from 192.168.1.0/24
+    #   Outside the subarea only Intranet access is granted
+    Order                deny,allow
+    Deny                 from all
+    Allow                from 192.168.1.0/24
 </Directory>
 
 <Directory /usr/local/apache2/htdocs/subarea>
-#   Inside the subarea any Intranet access is allowed
-#   but from the Internet only HTTPS + Strong-Cipher + Password
-#   or the alternative HTTPS + Strong-Cipher + Client-Certificate
-
-#   If HTTPS is used, make sure a strong cipher is used.
-#   Additionally allow client certs as alternative to basic auth.
-SSLVerifyClient      optional
-SSLVerifyDepth       1
-SSLOptions           +FakeBasicAuth +StrictRequire
-SSLRequire           %{SSL_CIPHER_USEKEYSIZE} >= 128
-
-#   Force clients from the Internet to use HTTPS
-RewriteEngine        on
-RewriteCond          %{REMOTE_ADDR} !^192\.168\.1\.[0-9]+$
-RewriteCond          %{HTTPS} !=on
-RewriteRule          . - [F]
-
-#   Allow Network Access and/or Basic Auth
-Satisfy              any
-
-#   Network Access Control
-Order                deny,allow
-Deny                 from all
-Allow                192.168.1.0/24
-
-#   HTTP Basic Authentication
-AuthType             basic
-AuthName             "Protected Intranet Area"
-AuthBasicProvider    file
-AuthUserFile         conf/protected.passwd
-Require              valid-user
-</Directory>
+ # Inside the subarea any Intranet access is allowed + # but from the Internet only HTTPS + Strong-Cipher + Password + # or the alternative HTTPS + Strong-Cipher + Client-Certificate + + # If HTTPS is used, make sure a strong cipher is used. + # Additionally allow client certs as alternative to basic auth. + SSLVerifyClient optional + SSLVerifyDepth 1 + SSLOptions +FakeBasicAuth +StrictRequire + SSLRequire %{SSL_CIPHER_USEKEYSIZE} >= 128 + + # Force clients from the Internet to use HTTPS + RewriteEngine on + RewriteCond %{REMOTE_ADDR} !^192\.168\.1\.[0-9]+$ + RewriteCond %{HTTPS} !=on + RewriteRule . - [F] + + # Allow Network Access and/or Basic Auth + Satisfy any + + # Network Access Control + Order deny,allow + Deny from all + Allow 192.168.1.0/24 + + # HTTP Basic Authentication + AuthType basic + AuthName "Protected Intranet Area" + AuthBasicProvider file + AuthUserFile conf/protected.passwd + Require valid-user +</Directory> + +
top
diff --git a/docs/manual/ssl/ssl_howto.html.fr b/docs/manual/ssl/ssl_howto.html.fr index d698794d3f..0fe1dbf46e 100644 --- a/docs/manual/ssl/ssl_howto.html.fr +++ b/docs/manual/ssl/ssl_howto.html.fr @@ -24,6 +24,8 @@

Langues Disponibles:  en  |  fr 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

Ce document doit vous permettre de démarrer et de faire fonctionner diff --git a/docs/manual/ssl/ssl_howto.xml.fr b/docs/manual/ssl/ssl_howto.xml.fr index 632ea4b289..035106e20d 100644 --- a/docs/manual/ssl/ssl_howto.xml.fr +++ b/docs/manual/ssl/ssl_howto.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/ssl/ssl_howto.xml.meta b/docs/manual/ssl/ssl_howto.xml.meta index b7c021fd9a..8d9a5237f4 100644 --- a/docs/manual/ssl/ssl_howto.xml.meta +++ b/docs/manual/ssl/ssl_howto.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/suexec.html.en b/docs/manual/suexec.html.en index c990224cd7..6fca13483f 100644 --- a/docs/manual/suexec.html.en +++ b/docs/manual/suexec.html.en @@ -476,10 +476,11 @@

If for example, your web server is configured to run as:

-

- User www
- Group webgroup
-

+ 
+User www
+Group webgroup
+
+

and suexec is installed at "/usr/local/apache2/bin/suexec", you should run:

diff --git a/docs/manual/suexec.html.fr b/docs/manual/suexec.html.fr index 44bec91846..5eebc32d4e 100644 --- a/docs/manual/suexec.html.fr +++ b/docs/manual/suexec.html.fr @@ -27,6 +27,8 @@  ko  |  tr 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

La fonctionnalité suEXEC permet l'exécution des programmes CGI et diff --git a/docs/manual/suexec.xml.fr b/docs/manual/suexec.xml.fr index 19fbaac9bb..a346dba3bf 100644 --- a/docs/manual/suexec.xml.fr +++ b/docs/manual/suexec.xml.fr @@ -3,7 +3,7 @@ - + + + + - + - + + + + + diff --git a/docs/manual/vhosts/examples.xml.ja b/docs/manual/vhosts/examples.xml.ja index 0da43c657e..ed7237d7f2 100644 --- a/docs/manual/vhosts/examples.xml.ja +++ b/docs/manual/vhosts/examples.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + + diff --git a/docs/manual/vhosts/ip-based.xml.ja b/docs/manual/vhosts/ip-based.xml.ja index 2acee10af0..7bb1e28ad8 100644 --- a/docs/manual/vhosts/ip-based.xml.ja +++ b/docs/manual/vhosts/ip-based.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + + diff --git a/docs/manual/vhosts/name-based.xml.ja b/docs/manual/vhosts/name-based.xml.ja index f9d8bd8e77..e9167b986a 100644 --- a/docs/manual/vhosts/name-based.xml.ja +++ b/docs/manual/vhosts/name-based.xml.ja @@ -1,7 +1,7 @@ - + + +