From: André Malo Date: Thu, 6 Feb 2014 14:21:05 +0000 (+0000) Subject: update transformation X-Git-Tag: 2.2.27~42 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ade2c1bc183e0de501cd9355f9eb40bd8a6aa97c;p=thirdparty%2Fapache%2Fhttpd.git update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1565268 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/caching.html.en b/docs/manual/caching.html.en index 655f6b7afb1..87cef9cfc30 100644 --- a/docs/manual/caching.html.en +++ b/docs/manual/caching.html.en @@ -133,8 +133,7 @@ in which it matters: If you are using Server Side Includes;

- 
-<!-- The following include can be cached -->
+      
<!-- The following include can be cached -->
 <!--#include virtual="/footer.html" --> 
 
 <!-- The following include can not be cached -->
@@ -466,8 +465,7 @@ Vary: negotiate,accept-language,accept-charset
       the difference in the time it takes to read a file for the first time
       and the second time;

 
-      
-colm@coroebus:~$ time cat testfile > /dev/null
+      
colm@coroebus:~$ time cat testfile > /dev/null
 real    0m0.065s
 user    0m0.000s
 sys     0m0.001s
@@ -534,8 +532,7 @@ sys     0m0.000s

 
       
Caching of this type is enabled via;

 
-      
-# Enable memory caching
+      
# Enable memory caching
 CacheEnable mem /
 
 # Limit the size of the cache to 1 Megabyte
@@ -555,8 +552,7 @@ MCacheSize 1024

 
     
Typically the module will be configured as so;

 
-    
-CacheRoot   /var/cache/apache/
+    
CacheRoot   /var/cache/apache/
 CacheEnable disk /
 CacheDirLevels 2
 CacheDirLength 1

diff --git a/docs/manual/caching.html.fr b/docs/manual/caching.html.fr
index 9f9ef3d7ff1..590f1f9a49b 100644
--- a/docs/manual/caching.html.fr
+++ b/docs/manual/caching.html.fr
@@ -151,8 +151,7 @@
       En général, cela n'a que peu d'effet, à moins que vous n'utilisiez les
       Inclusions Côté Serveur (SSI);

 
-      
-<!-- L'inclusion suivante peut être mise en cache -->
+      
<!-- L'inclusion suivante peut être mise en cache -->
 <!--#include virtual="/footer.html" -->
 
 <!-- L'inclusion suivante ne peut pas être mise en cache -->
@@ -530,8 +529,7 @@ Vary: negotiate,accept-language,accept-charset
       temps nécessaire à la première lecture d'un fichier et le temps
       nécessaire à sa deuxième lecture;

 
-      
-colm@coroebus:~$ time cat testfile > /dev/null
+      
colm@coroebus:~$ time cat testfile > /dev/null
 real    0m0.065s
 user    0m0.000s
 sys     0m0.001s
@@ -608,8 +606,7 @@ sys     0m0.000s

 
       
La mise en cache selon cette méthode est activée comme suit :

 
-      
-# Activation de la mise en cache en mémoire
+      
# Activation de la mise en cache en mémoire
 CacheEnable mem /
 
 # Limite la taille du cache à 1 Mégaoctet
@@ -630,8 +627,7 @@ MCacheSize 1024

 
     
Typiquement, le module sera configuré comme suit :

 
-    
-CacheRoot   /var/cache/apache/
+    
CacheRoot   /var/cache/apache/
 CacheEnable disk /
 CacheDirLevels 2
 CacheDirLength 1

diff --git a/docs/manual/developer/API.html.en b/docs/manual/developer/API.html.en
index 86181947cc8..7a749880bec 100644
--- a/docs/manual/developer/API.html.en
+++ b/docs/manual/developer/API.html.en
@@ -358,9 +358,7 @@ struct stat finfo;    /* Set by server core;
 
int header_only;     /* HEAD request, as opposed to GET */
 char *protocol;      /* Protocol, as given to us, or HTTP/0.9 */
 char *method;        /* GET, HEAD, POST, etc. */
-int method_number;   /* M_GET, M_POST, etc. */
-
-

+int method_number;   /* M_GET, M_POST, etc. */

         /* Info for logging */

         

         char *the_request;

diff --git a/docs/manual/developer/filters.html.en b/docs/manual/developer/filters.html.en
index c0e83062041..1347af7e18a 100644
--- a/docs/manual/developer/filters.html.en
+++ b/docs/manual/developer/filters.html.en
@@ -133,19 +133,15 @@
     same set of filters as the main request.  A graphical representation
     might help:

 
-
-Default_handler --> includes_filter --> byterange --> ...
-

+
Default_handler --> includes_filter --> byterange --> ...

 
     
If the includes filter creates a sub request, then we don't want the
     data from that sub-request to go through the includes filter, because it
     might not be SSI data.  So, the subrequest adds the following:

 
-
    
-Default_handler --> includes_filter -/-> byterange --> ...
+
Default_handler --> includes_filter -/-> byterange --> ...
                                     /
-Default_handler --> sub_request_core
-

+Default_handler --> sub_request_core

 
     
What happens if the subrequest is SSI data?  Well, that's easy, the
     includes_filter is a resource filter, so it will be added to
diff --git a/docs/manual/developer/modules.html.en b/docs/manual/developer/modules.html.en
index f67f7cbcefe..6cb8b73f20f 100644
--- a/docs/manual/developer/modules.html.en
+++ b/docs/manual/developer/modules.html.en
@@ -86,8 +86,7 @@
       will be called in.

 
       
This is the code that was added to mod_mmap_static:

-      
-static void register_hooks(void)
+      
static void register_hooks(void)
 {
     static const char * const aszPre[]={ "http_core.c",NULL };
     ap_hook_post_config(mmap_post_config,NULL,NULL,HOOK_MIDDLE);
@@ -131,8 +130,7 @@ static void register_hooks(void)
       creating your module definition. The old defintion looked
       like

 
-      
-module MODULE_VAR_EXPORT module_name_module =
+      
module MODULE_VAR_EXPORT module_name_module =
 {
     STANDARD_MODULE_STUFF,
     /* initializer */
@@ -156,8 +154,7 @@ module MODULE_VAR_EXPORT module_name_module =
 };

 
       
The new structure is a great deal simpler...

-      
-module MODULE_VAR_EXPORT module_name_module =
+      
module MODULE_VAR_EXPORT module_name_module =
 {
     STANDARD20_MODULE_STUFF,
     /* create per-directory config structures */
diff --git a/docs/manual/developer/modules.html.ja.utf8 b/docs/manual/developer/modules.html.ja.utf8
index 4148b70470d..5040b83a459 100644
--- a/docs/manual/developer/modules.html.ja.utf8
+++ b/docs/manual/developer/modules.html.ja.utf8
@@ -95,8 +95,7 @@
 
     
以下は、mod_mmap_static に追加したコードです:

 
-      
-static void register_hooks(void)
+      
static void register_hooks(void)
 {
     static const char * const aszPre[]={ "http_core.c",NULL };
     ap_hook_post_config(mmap_post_config,NULL,NULL,HOOK_MIDDLE);
@@ -139,8 +138,7 @@ static void register_hooks(void)
       
モジュールの定義を作成する際に注意しなければならない
       ステージの数は激減しています。古い定義は次のようになっていました。

 
-      
-module MODULE_VAR_EXPORT module_name_module =
+      
module MODULE_VAR_EXPORT module_name_module =
 {
     STANDARD_MODULE_STUFF,
     /* initializer */
@@ -164,8 +162,7 @@ module MODULE_VAR_EXPORT module_name_module =
 };

 
     
新しい構造体はとってもシンプルです…

-      
-module MODULE_VAR_EXPORT module_name_module =
+      
module MODULE_VAR_EXPORT module_name_module =
 {
     STANDARD20_MODULE_STUFF,
     /* create per-directory config structures */
diff --git a/docs/manual/developer/request.html.en b/docs/manual/developer/request.html.en
index e66524e7215..41bf95fcc32 100644
--- a/docs/manual/developer/request.html.en
+++ b/docs/manual/developer/request.html.en
@@ -150,8 +150,7 @@
 
The Security Phase

     
Needs Documentation. Code is:

 
-    
-switch (ap_satisfies(r)) {
+    
switch (ap_satisfies(r)) {
 case SATISFY_ALL:
 case SATISFY_NOSPEC:
         if ((access_status = ap_run_access_checker(r)) != 0) {
diff --git a/docs/manual/env.html.en b/docs/manual/env.html.en
index 45073bf627d..71d124eba9d 100644
--- a/docs/manual/env.html.en
+++ b/docs/manual/env.html.en
@@ -381,8 +381,7 @@
         httpd.conf to deal with known client problems.  Since the affected clients
         are no longer seen in the wild, this configuration is likely no-longer
         necessary.

-
-#
+
#
 # The following directives modify normal HTTP response behavior.
 # The first directive disables keepalive for Netscape 2.x and browsers that
 # spoof it. There are known problems with these browser implementations.
diff --git a/docs/manual/env.html.ja.utf8 b/docs/manual/env.html.ja.utf8
index de40726e4e0..dc5e5641ca8 100644
--- a/docs/manual/env.html.ja.utf8
+++ b/docs/manual/env.html.ja.utf8
@@ -343,8 +343,7 @@
         httpd.conf に次の行を加えるよう推奨されていましたが、
         今となっては、問題としていたクライアントは実際には見かけることは
         なくなってきたので、この設定はもはや必要ないかもしれません。

-
-#
+
#
 # The following directives modify normal HTTP response behavior.
 # The first directive disables keepalive for Netscape 2.x and browsers that
 # spoof it. There are known problems with these browser implementations.
@@ -372,8 +371,7 @@ BrowserMatch "JDK/1\.0" force-response-1.0

         これを変更することで、特定のディレクトリのログ収集をやめたり、
         特定のホストからのリクエストのログ収集をやめたりすることが簡単にできます。
         

-    
-SetEnvIf Request_URI \.gif image-request
+    
SetEnvIf Request_URI \.gif image-request
 SetEnvIf Request_URI \.jpg image-request
 SetEnvIf Request_URI \.png image-request
 CustomLog logs/access_log common env=!image-request

@@ -387,8 +385,7 @@ CustomLog logs/access_log common env=!image-request

         これは推奨されている設定ではありませんが、ある限定された状況では有効です。
         ここでは、すべての画像は /web/images
 	というディレクトリにあると仮定します。

-    
-SetEnvIf Referer "^http://www.example.com/" local_referal
+    
SetEnvIf Referer "^http://www.example.com/" local_referal
 # Allow browsers that do not send Referer info
 SetEnvIf Referer "^$" local_referal
 <Directory /web/images>
diff --git a/docs/manual/env.html.ko.euc-kr b/docs/manual/env.html.ko.euc-kr
index 556e5aa7a54..6eb1f13ad0f 100644
--- a/docs/manual/env.html.ko.euc-kr
+++ b/docs/manual/env.html.ko.euc-kr
@@ -311,8 +311,7 @@
 
         
Ŭ¶óÀ̾ðÆ®µéÀÇ ÀÌ¹Ì ¾Ë·ÁÁø ¹®Á¦¸¦ ÇØ°áÇϱâÀ§ÇØ
         httpd.conf¿¡ ´ÙÀ½ ³»¿ëÀ» Æ÷ÇÔÇÏ±æ ¹Ù¶õ´Ù.

-
-#
+
#
 # ´ÙÀ½ Áö½Ã¾îµéÀº ÀϹÝÀûÀÎ HTTP ÀÀ´äÀ» º¯°æÇÑ´Ù.
 # ù¹ø° Áö½Ã¾î´Â Netscape 2.x¿Í À̸¦ °¡ÀåÇÑ ºê¶ó¿ìÀú¿¡°Ô
 # keepalive¸¦ »ç¿ëÇÏÁö ¾Ê´Â´Ù. ÀÌµé ºê¶ó¿ìÀú ±¸Çö¿¡ ¹®Á¦°¡ ÀÖ´Ù.
@@ -338,8 +337,7 @@ BrowserMatch "JDK/1\.0" force-response-1.0

         
ÀÌ ¿¹Á¦´Â À̹ÌÁö¿¡ ´ëÇÑ ¿äûÀ» Á¢±Ù ·Î±×¿¡ ±â·ÏÇÏÁö
         ¾Ê´Â´Ù. ƯÁ¤ µð·ºÅ丮¿¡ ´ëÇÑ È¤Àº ƯÁ¤ È£½ºÆ®¿¡¼­ ¿Â
         ¿äûÀ» ·Î±×ÇÏÁö ¾Êµµ·Ï ½±°Ô ¼öÁ¤ÇÒ ¼ö ÀÖ´Ù.

-    
-SetEnvIf Request_URI \.gif image-request
+    
SetEnvIf Request_URI \.gif image-request
 SetEnvIf Request_URI \.jpg image-request
 SetEnvIf Request_URI \.png image-request
 CustomLog logs/access_log common env=!image-request

@@ -353,8 +351,7 @@ CustomLog logs/access_log common env=!image-request

         ¼³Á¤À» ±ÇÀåÇÏÁö´Â ¾ÊÀ¸¸ç, Á¦ÇÑµÈ °æ¿ì¿¡¸¸ µ¿ÀÛÇÑ´Ù.
         ¿ì¸®´Â ¸ðµç À̹ÌÁö°¡ /web/images µð·ºÅ丮 ¾È¿¡ ÀÖ´Ù°í
         °¡Á¤ÇÑ´Ù.

-    
-SetEnvIf Referer "^http://www.example.com/" local_referal
+    
SetEnvIf Referer "^http://www.example.com/" local_referal
 # Referer Á¤º¸¸¦ º¸³»Áö ¾Ê´Â ºê¶ó¿ìÀú¸¦ Çã¿ëÇÑ´Ù
 SetEnvIf Referer "^$" local_referal
 <Directory /web/images>
diff --git a/docs/manual/env.html.tr.utf8 b/docs/manual/env.html.tr.utf8
index 688df9fdd10..2de827ba847 100644
--- a/docs/manual/env.html.tr.utf8
+++ b/docs/manual/env.html.tr.utf8
@@ -383,8 +383,7 @@
           önerilirdi. Fakat, böyle tarayıcılar artık ortalıkta görünmediğinden
           bu yapılandırmaya da artık gerek kalmamıştır.

 
-        
-#
+        
#
 # Aşağıdaki yönergeler normal HTTP yanıt davranışını değiştirirler.
 # İlk yönerge Netscape 2.x ve kendini öyle gösteren tarayıcılar için
 # kalıcı bağlantıyı (keepalive) iptal eder. İkinci yönerge ise HTTP/1.1
diff --git a/docs/manual/howto/cgi.html.en b/docs/manual/howto/cgi.html.en
index 6f7c71d294f..2e2c9af9be5 100644
--- a/docs/manual/howto/cgi.html.en
+++ b/docs/manual/howto/cgi.html.en
@@ -64,9 +64,7 @@
     directive has not been commented out.  A correctly configured directive
     may look like this:
 
-    
-      LoadModule cgi_module modules/mod_cgi.so
-    

+    
LoadModule cgi_module modules/mod_cgi.so

 

 
     
ScriptAlias

diff --git a/docs/manual/misc/rewriteguide.html.ko.euc-kr b/docs/manual/misc/rewriteguide.html.ko.euc-kr
index bb3df5b1336..d1883ad0f37 100644
--- a/docs/manual/misc/rewriteguide.html.ko.euc-kr
+++ b/docs/manual/misc/rewriteguide.html.ko.euc-kr
@@ -115,10 +115,8 @@
           ´ëüÇÏ°í, /u/user ¸¶Áö¸·¿¡ ½½·¡½¬°¡ ¾ø´Ù¸é
           Ãß°¡ÇÑ´Ù.

 
-
-RewriteRule   ^/~([^/]+)/?(.*)    /u/$1/$2  [R]
-RewriteRule   ^/([uge])/([^/]+)$  /$1/$2/   [R]
-

+
RewriteRule   ^/~([^/]+)/?(.*)    /u/$1/$2  [R]
+RewriteRule   ^/([uge])/([^/]+)$  /$1/$2/   [R]

         
       
 
@@ -136,15 +134,13 @@ RewriteRule   ^/([uge])/([^/]+)$  /$1/$2/   [<
         
ÇØ°áÃ¥:

 
         

-
-RewriteCond %{HTTP_HOST}   !^fully\.qualified\.domain\.name [NC]
+
RewriteCond %{HTTP_HOST}   !^fully\.qualified\.domain\.name [NC]
 RewriteCond %{HTTP_HOST}   !^$
 RewriteCond %{SERVER_PORT} !^80$
 RewriteRule ^/(.*)         http://fully.qualified.domain.name:%{SERVER_PORT}/$1 [L,R]
 RewriteCond %{HTTP_HOST}   !^fully\.qualified\.domain\.name [NC]
 RewriteCond %{HTTP_HOST}   !^$
-RewriteRule ^/(.*)         http://fully.qualified.domain.name/$1 [L,R]
-

+RewriteRule ^/(.*)         http://fully.qualified.domain.name/$1 [L,R]

         

       
 
@@ -182,10 +178,8 @@ RewriteRule ^/(.*)         http://fully.qualified.domain.name/$1 [L,R]
           ÇÒ ¼ö ¾ø´Ù. mod_rewrite¸¦ »ç¿ëÇϸé
           ÁøÂ¥ °£´ÜÇÏ´Ù:

 
-
-RewriteEngine on
-RewriteRule   ^/$  /e/www/  [R]
-

+
RewriteEngine on
+RewriteRule   ^/$  /e/www/  [R]

         
       
 
@@ -225,22 +219,18 @@ RewriteRule   ^/$  /e/www/  [R]
 
           
±×·¡¼­ À̸¦ ÇØ°áÇϱâÀ§ÇØ ´ÙÀ½°ú °°ÀÌ ¼³Á¤ÇÑ´Ù:

 
-
-RewriteEngine  on
+
RewriteEngine  on
 RewriteBase    /~quux/
-RewriteRule    ^foo$  foo/  [R]
-

+RewriteRule    ^foo$  foo/  [R]

 
           
Ȩµð·ºÅ丮ÀÇ ÃÖ»óÀ§ .htaccess ÆÄÀÏ¿¡
           ´ÙÀ½°ú °°ÀÌ ¼³Á¤ÇÒ ¼öµµ ÀÖ´Ù. ±×·¯³ª ó¸®Çϴµ¥ ºÎ´ãÀÌ
           µÈ´Ù.

 
-
-RewriteEngine  on
+
RewriteEngine  on
 RewriteBase    /~quux/
 RewriteCond    %{REQUEST_FILENAME}  -d
-RewriteRule    ^(.+[^/])$           $1/  [R]
-

+RewriteRule    ^(.+[^/])$           $1/  [R]

         
       
 
@@ -269,35 +259,28 @@ RewriteRule    ^(.+[^/])$           $1/  [R]
           (ºÐ»êµÈ) ¿ÜºÎ¸Ê¿¡ ½ÇÁ¦ ¼­¹ö Á¤º¸¸¦ ¾ò¾î¿Â´Ù. ¿ÜºÎ¸ÊÀº
           ´ÙÀ½°ú °°Àº Çü½ÄÀÌ´Ù

 
-
-user1  server_of_user1
+
user1  server_of_user1
 user2  server_of_user2
-:      :
-

+:      :

 
           
¿ì¸®´Â ÀÌ Á¤º¸¸¦ °¢°¢ map.xxx-to-host
           ÆÄÀÏ¿¡ ÀúÀåÇß´Ù. ´ÙÀ½À¸·Î ¸ðµç ¼­¹ö¿¡¼­ URLÀÌ ¼­¹ö¿¡
           ¾ø´Ù¸é ´ÙÀ½°ú °°Àº URLÀ»,

 
-
-/u/user/anypath
+
/u/user/anypath
 /g/group/anypath
-/e/entity/anypath
-

+/e/entity/anypath

 
           
´ÙÀ½°ú °°ÀÌ ¸®´ÙÀÌ·º¼ÇÇÑ´Ù

 
-
-http://physical-host/u/user/anypath
+
http://physical-host/u/user/anypath
 http://physical-host/g/group/anypath
-http://physical-host/e/entity/anypath
-

+http://physical-host/e/entity/anypath

 
           
¾Æ·¡ ±ÔÄ¢Àº ¸ÊÆÄÀÏÀ» »ç¿ëÇÏ¿© ÀÌ ÀÛ¾÷À» ÇÑ´Ù (server0Àº
           ¸Ê¿¡ Ç׸ñÀÌ ¾ø´Â °æ¿ì »ç¿ëÇÒ ±âº»¼­¹ö¶ó°í °¡Á¤ÇÑ´Ù):

 
-
-RewriteEngine on
+
RewriteEngine on
 
 RewriteMap      user-to-host   txt:/path/to/map.user-to-host
 RewriteMap     group-to-host   txt:/path/to/map.group-to-host
@@ -308,8 +291,7 @@ RewriteRule   ^/g/([^/]+)/?(.*)  http://${group-to-host
 RewriteRule   ^/e/([^/]+)/?(.*) http://${entity-to-host:$1|server0}/e/$1/$2
 
 RewriteRule   ^/([uge])/([^/]+)/?$          /$1/$2/.www/
-RewriteRule   ^/([uge])/([^/]+)/([^.]+.+)   /$1/$2/.www/$3\
-

+RewriteRule   ^/([uge])/([^/]+)/([^.]+.+)   /$1/$2/.www/$3\

         
       
 
@@ -337,10 +319,8 @@ RewriteRule   ^/([uge])/([^/]+)/([^.]+.+)   /$1/$2/.www/$3\
           http://newserver/~user/anypath·Î
           ¸®´ÙÀÌ·º¼ÇÇÏ¸é µÈ´Ù.

 
-
-RewriteEngine on
-RewriteRule   ^/~(.+)  http://newserver/~$1  [R,L]
-

+
RewriteEngine on
+RewriteRule   ^/~(.+)  http://newserver/~$1  [R,L]

         
       
 
@@ -369,10 +349,8 @@ RewriteRule   ^/~(.+)  http://newserver/~$1  [R,L]
           
¹°°áÇ¥½Ã°¡ ÀÖ´Â URLÀ» À§¿Í °°Àº ±¸Á¶·Î º¯È¯ÇϱâÀ§ÇØ
           ´ÙÀ½ ±ÔÄ¢À» »ç¿ëÇÑ´Ù.

 
-
-RewriteEngine on
-RewriteRule   ^/~(([a-z])[a-z0-9]+)(.*)  /home/$2/$1/.www$3
-

+
RewriteEngine on
+RewriteRule   ^/~(([a-z])[a-z0-9]+)(.*)  /home/$2/$1/.www$3

         
       
 
@@ -396,8 +374,7 @@ RewriteRule   ^/~(([a-z])[a-z0-9]+)(.*)  /home/$2
 
-
-drwxrwxr-x   2 netsw  users    512 Aug  3 18:39 Audio/
+
drwxrwxr-x   2 netsw  users    512 Aug  3 18:39 Audio/
 drwxrwxr-x   2 netsw  users    512 Jul  9 14:37 Benchmark/
 drwxrwxr-x  12 netsw  users    512 Jul  9 00:34 Crypto/
 drwxrwxr-x   5 netsw  users    512 Jul  9 00:41 Database/
@@ -412,8 +389,7 @@ drwxrwxr-x   2 netsw  users    512 Jul  9 05:53 Office/
 drwxrwxr-x   7 netsw  users    512 Jul  9 09:24 SoftEng/
 drwxrwxr-x   7 netsw  users    512 Jul  9 12:17 System/
 drwxrwxr-x  12 netsw  users    512 Aug  3 20:15 Typesetting/
-drwxrwxr-x  10 netsw  users    512 Jul  9 14:08 X11/
-

+drwxrwxr-x  10 netsw  users    512 Jul  9 14:08 X11/

 
           
1996³â 7¿ù ÀÌ ÀúÀå¼Ò¸¦ ¸ÚÀÖ´Â À¥ ÀÎÅÍÆäÀ̽º¸¦ ÅëÇØ
           ¼¼»ó¿¡ °ø°³Çϱâ·Î °áÁ¤ÇÞ´Ù. "¸ÚÀÖ´Ù"´Â ¸»Àº, ÃÖ»óÀ§
@@ -431,8 +407,7 @@ drwxrwxr-x  10 netsw  users    512 Jul  9 14:08 X11/
           ÇÊ¿äÇÏ´Ù. ³ª´Â ÀÌ ½ºÅ©¸³Æ®µéÀ» ´ÙÀ½°ú °°ÀÌ
           /e/netsw/.www/¿¡ µÎ¾ú´Ù:

 
-
--rw-r--r--   1 netsw  users    1318 Aug  1 18:10 .wwwacl
+
-rw-r--r--   1 netsw  users    1318 Aug  1 18:10 .wwwacl
 drwxr-xr-x  18 netsw  users     512 Aug  5 15:51 DATA/
 -rw-rw-rw-   1 netsw  users  372982 Aug  5 16:35 LOGFILE
 -rw-r--r--   1 netsw  users     659 Aug  4 09:27 TODO
@@ -444,8 +419,7 @@ drwxr-xr-x   2 netsw  users     512 Jul  8 23:47 netsw-img/
 -rwxr-xr-x   1 netsw  users   24050 Aug  5 15:49 netsw-lsdir.cgi
 -rwxr-xr-x   1 netsw  users    1589 Aug  3 18:43 netsw-search.cgi
 -rwxr-xr-x   1 netsw  users    1885 Aug  1 17:41 netsw-tree.cgi
--rw-r--r--   1 netsw  users     234 Jul 30 16:35 netsw-unlimit.lst
-

+-rw-r--r--   1 netsw  users     234 Jul 30 16:35 netsw-unlimit.lst

 
           
DATA/ ÇÏÀ§µð·ºÅ丮¿¡ À§¿¡¼­ ¸»ÇÑ ÀúÀå¼Ò°¡
           ÀÖ´Ù. ½ÇÁ¦ net.swÀÇ ³»¿ëÀº º¸Åë
@@ -457,18 +431,15 @@ drwxr-xr-x   2 netsw  users     512 Jul  8 23:47 netsw-img/
           URL /net.sw/¸¦ ³»ºÎ °æ·Î /e/netsw·Î
           ÀçÀÛ¼ºÇϱâÀ§ÇØ µð·ºÅ丮º° ¼³Á¤ÆÄÀÏ¿¡ ´ÙÀ½°ú °°ÀÌ ¼³Á¤ÇÑ´Ù:

 
-
-RewriteRule  ^net.sw$       net.sw/        [R]
-RewriteRule  ^net.sw/(.*)$  e/netsw/$1
-

+
RewriteRule  ^net.sw$       net.sw/        [R]
+RewriteRule  ^net.sw/(.*)$  e/netsw/$1

 
           
ù¹ø° ±ÔÄ¢Àº ¸¶Áö¸·¿¡ ½½·¡½¬°¡ ¾ø´Â ¿äûÀ» À§Çؼ­
           »ç¿ëÇß´Ù! µÎ¹ø° ±ÔÄ¢ÀÌ ½ÇÁ¦ ÀÛ¾÷À» ÇÑ´Ù. ±×¸®°í µð·ºÅ丮º°
           ¼³Á¤ÆÄÀÏ /e/netsw/.www/.wwwacl¿¡ °áÁ¤ÀûÀÎ
           ¼³Á¤ÀÌ ³ª¿Â´Ù:

 
-
-Options       ExecCGI FollowSymLinks Includes MultiViews
+
Options       ExecCGI FollowSymLinks Includes MultiViews
 
 RewriteEngine on
 
@@ -495,8 +466,7 @@ RewriteRule   ^netsw-img/.*$           -                  [L]
 #  ´Ù¸¥ cgi ½ºÅ©¸³Æ®°¡ ó¸®ÇÒ
 #  ÇÏÀ§µð·ºÅ丮°¡ ³²¾Ò´Ù
 RewriteRule   !^netsw-lsdir\.cgi.*     -                  [C]
-RewriteRule   (.*)                     netsw-lsdir.cgi/$1
-

+RewriteRule   (.*)                     netsw-lsdir.cgi/$1

 
           
Çؼ®À» À§ÇÑ ÈùÆ®:

 
@@ -540,10 +510,8 @@ RewriteRule   (.*)                     netsw-lsdir.cgi/$1
           
¸ðµç ¿äû¿¡¼­ ¾ÕºÎºÐÀ» µ¿ÀûÀ¸·Î Á¦°ÅÇÏ´Â Àü¿ª ±ÔÄ¢À»
           »ç¿ëÇÑ´Ù:

 
-
-RewriteEngine  on
-RewriteRule    ^/cgi-bin/imagemap(.*)  $1  [PT]
-

+
RewriteEngine  on
+RewriteRule    ^/cgi-bin/imagemap(.*)  $1  [PT]

         
       
 
@@ -567,8 +535,7 @@ RewriteRule    ^/cgi-bin/imagemap(.*)  $1  [PT]
         

           
¿©·¯ µð·ºÅ丮¿¡¼­ ÆÄÀÏÀ» ã´Â ±ÔÄ¢À» Á÷Á¢ ÇÁ·Î±×·¥ÇÑ´Ù.

 
-
-RewriteEngine on
+
RewriteEngine on
 
 #   ¸ÕÀú custom/¿¡¼­ ã±æ ½ÃµµÇÏ°í...
 #   ...ãÀ¸¸é ³¡!
@@ -581,8 +548,7 @@ RewriteCond         /your/docroot/dir2/%{REQUEST_FILENAME}  -f
 RewriteRule  ^(.+)  /your/docroot/dir2/$1  [L]
 
 #   ¸øãÀ¸¸é ´Ù¸¥ Alias³ª ScriptAlias Áö½Ã¾î µîÀ¸·Î ÁøÇàÇÑ´Ù.
-RewriteRule   ^(.+)  -  [PT]
-

+RewriteRule   ^(.+)  -  [PT]

         

       
 
@@ -610,10 +576,8 @@ RewriteRule   ^(.+)  -  [PT]
           /foo/bar/·Î º¯È¯µÇ°í STATUS¶ó´Â
           ȯ°æº¯¼ö °ªÀ» "java"·Î ¼³Á¤ÇÑ´Ù.

 
-
-RewriteEngine on
-RewriteRule   ^(.*)/S=([^/]+)/(.*)    $1/$3 [E=STATUS:$2]
-

+
RewriteEngine on
+RewriteRule   ^(.*)/S=([^/]+)/(.*)    $1/$3 [E=STATUS:$2]

         
       
 
@@ -642,12 +606,10 @@ RewriteRule   ^(.*)/S=([^/]+)/(.*)    $1/$3 [E=STATUS:$
           /home/username/anypath·Î ÀçÀÛ¼ºÇÒ ¼ö
           ÀÖ´Ù:

 
-
-RewriteEngine on
+
RewriteEngine on
 RewriteCond   %{HTTP_HOST}                 ^www\.[^.]+\.host\.com$
 RewriteRule   ^(.+)                        %{HTTP_HOST}$1          [C]
-RewriteRule   ^www\.([^.]+)\.host\.com(.*) /home/$1$2
-

+RewriteRule   ^www\.([^.]+)\.host\.com(.*) /home/$1$2

         
       
 
@@ -672,11 +634,9 @@ RewriteRule   ^www\.([^.]+)\.host\.com(.*) /home/$1
           
ÀçÀÛ¼º Á¶°ÇÀ» »ç¿ëÇÏ¸é µÈ´Ù:

 
-
-RewriteEngine on
+
RewriteEngine on
 RewriteCond   %{REMOTE_HOST}  !^.+\.ourdomain\.com$
-RewriteRule   ^(/~.+)         http://www.somewhere.com/$1 [R,L]
-

+RewriteRule   ^(/~.+)         http://www.somewhere.com/$1 [R,L]

         
       
 
@@ -704,21 +664,17 @@ RewriteRule   ^(/~.+)         http://www.somewhere.com/$1 [R,L]
           
ù¹ø° ¹æ¹ýÀº ºü¸£Áö¸¸ À¯¿¬¼ºÀÌ ¶³¾îÁö°í ¿ÏÀüÇÏÁö
           ¾Ê´Ù:

 
-
-RewriteEngine on
+
RewriteEngine on
 RewriteCond   /your/docroot/%{REQUEST_FILENAME} !-f
-RewriteRule   ^(.+)                             http://webserverB.dom/$1
-

+RewriteRule   ^(.+)                             http://webserverB.dom/$1

 
           
ÀÌ ¹æ¹ýÀÇ ´ÜÁ¡Àº DocumentRoot ¾È¿¡ ÀÖ´Â ÆäÀÌÁö¸¸
           °¡´ÉÇÏ´Ù´Â Á¡ÀÌ´Ù. (¿¹¸¦ µé¾î Ȩµð·ºÅ丮 µîÀ» À§ÇØ)
           Á¶°ÇÀ» Ãß°¡ÇÒ ¼ö ÀÖÁö¸¸, ´õ ÁÁÀº ¹æ¹ýÀÌ ÀÖ´Ù:

 
-
-RewriteEngine on
+
RewriteEngine on
 RewriteCond   %{REQUEST_URI} !-U
-RewriteRule   ^(.+)          http://webserverB.dom/$1
-

+RewriteRule   ^(.+)          http://webserverB.dom/$1

 
           
mod_rewriteÀÇ URL Àü¹æÂüÁ¶(look-ahead)¸¦
           »ç¿ëÇÑ´Ù. ±×·¡¼­ ¸ðµç URL¿¡ µ¿ÀÛÇÏ°í ¾ÈÀüÇÏ´Ù. ±×·¯³ª
@@ -757,17 +713,14 @@ RewriteRule   ^(.+)          http://webserverB.dom/$1
           ³¡ºÎºÐ¿¡ »ç¿ëÇØ¾ß ÇÑ´Ù) »õ·Î¿î URL scheme
           xredirect:¸¦ µµÀÔÇÑ´Ù:

 
-
-RewriteRule ^xredirect:(.+) /path/to/nph-xredirect.cgi/$1 \
-            [T=application/x-httpd-cgi,L]
-

+
RewriteRule ^xredirect:(.+) /path/to/nph-xredirect.cgi/$1 \
+            [T=application/x-httpd-cgi,L]

 
           
±×·¯¸é xredirect:·Î ½ÃÀÛÇÏ´Â ¸ðµç URLÀº
           nph-xredirect.cgi ÇÁ·Î±×·¥À» ÅëÇÏ°Ô µÈ´Ù.
           ÇÁ·Î±×·¥Àº ´ÙÀ½°ú °°´Ù:

 
-
-#!/path/to/perl
+
#!/path/to/perl
 ##
 ##  nph-xredirect.cgi -- NPH/CGI script for extended redirects
 ##  Copyright (c) 1997 Ralf S. Engelschall, All Rights Reserved.
@@ -791,17 +744,14 @@ print "The document has moved <a HREF=\"$url\">here</a>.<p>\n"
 print "</body>\n";
 print "</html>\n";
 
-##EOF##
-

+##EOF##

 
           
±×·¯¸é mod_rewrite°¡ Á÷Á¢ ¹ÞÁö¸øÇÏ´Â
           ¸ðµç URL schemeÀ¸·Î ¸®´ÙÀÌ·º¼ÇÇÒ ¼ö ÀÖ´Ù. ¿¹¸¦ µé¾î,
           ´ÙÀ½°ú °°ÀÌ news:newsgroupÀ¸·Î ¸®´ÙÀÌ·º¼ÇÇÒ
           ¼ö ÀÖ´Ù

 
-
-RewriteRule ^anyurl  xredirect:news:newsgroup
-

+
RewriteRule ^anyurl  xredirect:news:newsgroup

 
           
ÁÖÀÇ: À§ÀÇ Æ¯º°ÇÑ "Åë°ú" ±ÔÄ¢À» »ç¿ëÇÏ¿©
           xredirect:¸¦ ¸¶Áö¸·¿¡ È®ÀåÇØ¾ß Çϱ⶧¹®¿¡
@@ -838,15 +788,12 @@ RewriteRule ^anyurl  xredirect:news:newsgroup
           »ç¿ëÇÏ¿© À§Ä¡¸¦ ÃßÁ¤ÇÒ ¼ö ÀÖ´Ù. º¹ÀâÈ÷ ¿«ÀÎ ±ÔÄ¢¿¡¼­
           ÃÖ»óÀ§ µµ¸ÞÀÎÀ» Áß°è¸ÊÀÇ Å°·Î »ç¿ëÇÑ´Ù.

 
-
-RewriteEngine on
+
RewriteEngine on
 RewriteMap    multiplex                txt:/path/to/map.cxan
 RewriteRule   ^/CxAN/(.*)              %{REMOTE_HOST}::$1                 [C]
-RewriteRule   ^.+\.([a-zA-Z]+)::(.*)$  ${multiplex:$1|ftp.default.dom}$2  [R,L]
-

+RewriteRule   ^.+\.([a-zA-Z]+)::(.*)$  ${multiplex:$1|ftp.default.dom}$2  [R,L]

 
-
-##
+
##
 ##  map.cxan -- Multiplexing Map for CxAN
 ##
 
@@ -854,8 +801,7 @@ de        ftp://ftp.cxan.de/CxAN/
 uk        ftp://ftp.cxan.uk/CxAN/
 com       ftp://ftp.cxan.com/CxAN/
  :
-##EOF##
-

+##EOF##

         
       
 
@@ -884,13 +830,11 @@ com       ftp://ftp.cxan.com/CxAN/
           =STRINGÀ» »ç¿ëÇÏ¿© ½Ã°£¿¡ µû¶ó ¸®´ÙÀÌ·º¼ÇÇÒ
           ¼ö ÀÖ´Ù:

 
-
-RewriteEngine on
+
RewriteEngine on
 RewriteCond   %{TIME_HOUR}%{TIME_MIN} >0700
 RewriteCond   %{TIME_HOUR}%{TIME_MIN} <1900
 RewriteRule   ^foo\.html$             foo.day.html
-RewriteRule   ^foo\.html$             foo.night.html
-

+RewriteRule   ^foo\.html$             foo.night.html

 
           
URL foo.htmlÀ» ¿äûÇϸé
           07:00-19:00 µ¿¾È foo.day.html
@@ -925,8 +869,7 @@ RewriteRule   ^foo\.html$             foo.night.html
           ¾øÀ¸¸é URLÀ» ¿ø·¡ »óÅ·ΠÀçÀÛ¼ºÇÑ´Ù.

 
 
-
-#   ¹®¼­.html ÀÌ ¾ø°í
+
#   ¹®¼­.html ÀÌ ¾ø°í
 #   ¹®¼­.phtml ¸¸ ÀÖ´Â °æ¿ì
 #   ¹®¼­.html À» ¹®¼­.phtml ·Î
 #   ÀçÀÛ¼ºÇÏ´Â ¿ªÈ£È¯ ±ÔÄ¢
@@ -939,8 +882,7 @@ RewriteCond   %{REQUEST_FILENAME}.phtml -f
 RewriteRule   ^(.*)$ $1.phtml                   [S=1]
 #   ¾Æ´Ï¸é ¾Õ¿¡¼­ ãÀº ±âº»À̸§À» µÇµ¹¸°´Ù
 RewriteCond   %{ENV:WasHTML}            ^yes$
-RewriteRule   ^(.*)$ $1.html
-

+RewriteRule   ^(.*)$ $1.html

         
       
 
@@ -972,11 +914,9 @@ RewriteRule   ^(.*)$ $1.html
           
´ÙÀ½ ±ÔÄ¢À¸·Î ÀÌÀü URLÀ» ³»ºÎÀûÀ¸·Î »õ·Î¿î URL·Î
           ÀçÀÛ¼ºÇÑ´Ù:

 
-
-RewriteEngine  on
+
RewriteEngine  on
 RewriteBase    /~quux/
-RewriteRule    ^foo\.html$  bar.html
-

+RewriteRule    ^foo\.html$  bar.html

         
       
 
@@ -1003,11 +943,9 @@ RewriteRule    ^foo\.html$  bar.html
           
»õ·Î¿î URL·Î HTTP ¸®´ÙÀÌ·º¼ÇÇÏ´Ù. ±×·¯¸é ºê¶ó¿ìÀú°¡
           »õ·Î¿î URL¸¦ º¸ÀÌ°í º¯°æ»ç½ÇÀ» »ç¿ëÀÚ°¡ ¾Ë°ÔµÈ´Ù:

 
-
-RewriteEngine  on
+
RewriteEngine  on
 RewriteBase    /~quux/
-RewriteRule    ^foo\.html$  bar.html  [R]
-

+RewriteRule    ^foo\.html$  bar.html  [R]

         
       
 
@@ -1042,16 +980,14 @@ RewriteRule    ^foo\.html$  bar.html  [foo.32.html ÆäÀÌÁö¸¦ ¹Þ´Â´Ù. ¾Æ·¡ ±ÔÄ¢ÀÌ
           ÀÌ ÀÛ¾÷À» ÇÑ´Ù:

 
-
-RewriteCond %{HTTP_USER_AGENT}  ^Mozilla/3.*
+
RewriteCond %{HTTP_USER_AGENT}  ^Mozilla/3.*
 RewriteRule ^foo\.html$         foo.NS.html          [L]
 
 RewriteCond %{HTTP_USER_AGENT}  ^Lynx/.*         [OR]
 RewriteCond %{HTTP_USER_AGENT}  ^Mozilla/[12].*
 RewriteRule ^foo\.html$         foo.20.html          [L]
 
-RewriteRule ^foo\.html$         foo.32.html          [L]
-

+RewriteRule ^foo\.html$         foo.32.html          [L]

         
       
 
@@ -1084,17 +1020,13 @@ RewriteRule ^foo\.html$         foo.32.html          [L
           [P]) »ç¿ëÇÏ¿© ¿ÜºÎ À¥ÆäÀÌÁö ȤÀº ¿ÜºÎ
           À¥°ø°£ Àüü¸¦ ¿ì¸® À̸§°ø°£À¸·Î ´ëÀÀÇÑ´Ù:

 
-
-RewriteEngine  on
+
RewriteEngine  on
 RewriteBase    /~quux/
-RewriteRule    ^hotsheet/(.*)$  http://www.tstimpreso.com/hotsheet/$1  [P]
-

+RewriteRule    ^hotsheet/(.*)$  http://www.tstimpreso.com/hotsheet/$1  [P]

 
-
-RewriteEngine  on
+
RewriteEngine  on
 RewriteBase    /~quux/
-RewriteRule    ^usa-news\.html$   http://www.quux-corp.com/news/index.html  [P]
-

+RewriteRule    ^usa-news\.html$   http://www.quux-corp.com/news/index.html  [P]

         
       
 
@@ -1112,11 +1044,9 @@ RewriteRule    ^usa-news\.html$   http://www.quux-corp.
         
ÇØ°áÃ¥:

 
         

-
-RewriteEngine on
+
RewriteEngine on
 RewriteCond   /mirror/of/remotesite/$1           -U
-RewriteRule   ^http://www\.remotesite\.com/(.*)$ /mirror/of/remotesite/$1
-

+RewriteRule   ^http://www\.remotesite\.com/(.*)$ /mirror/of/remotesite/$1

         

       
 
@@ -1153,12 +1083,10 @@ RewriteRule   ^http://www\.remotesite\.com/(.*)$ /mirror/of/remotesite/$1
           proxy throughput ±â´ÉÀ» ÅëÇØ ¿äûÇÏ´Â
           mod_rewrite ±ÔÄ¢À» ÀÛ¼ºÇÑ´Ù:

 
-
-RewriteRule ^/~([^/]+)/?(.*)          /home/$1/.www/$2
+
RewriteRule ^/~([^/]+)/?(.*)          /home/$1/.www/$2
 RewriteCond %{REQUEST_FILENAME}       !-f
 RewriteCond %{REQUEST_FILENAME}       !-d
-RewriteRule ^/home/([^/]+)/.www/?(.*) http://www2.quux-corp.dom/~$1/pub/$2 [P]
-

+RewriteRule ^/home/([^/]+)/.www/?(.*) http://www2.quux-corp.dom/~$1/pub/$2 [P]

         
       
 
@@ -1193,26 +1121,22 @@ RewriteRule ^/home/([^/]+)/.www/?(.*) http://www2.quux-corp.dom
               °°ÀÌ DNS A(address) ·¹Äڵ忡
               www[0-9].foo.comÀ» ¼³Á¤ÇÑ´Ù.

 
-
-www0   IN  A       1.2.3.1
+
www0   IN  A       1.2.3.1
 www1   IN  A       1.2.3.2
 www2   IN  A       1.2.3.3
 www3   IN  A       1.2.3.4
 www4   IN  A       1.2.3.5
-www5   IN  A       1.2.3.6
-

+www5   IN  A       1.2.3.6

 
               
±×¸®°í ´ÙÀ½ Ç׸ñÀ» Ãß°¡ÇÑ´Ù:

 
-
-www    IN  CNAME   www0.foo.com.
+
www    IN  CNAME   www0.foo.com.
        IN  CNAME   www1.foo.com.
        IN  CNAME   www2.foo.com.
        IN  CNAME   www3.foo.com.
        IN  CNAME   www4.foo.com.
        IN  CNAME   www5.foo.com.
-       IN  CNAME   www6.foo.com.
-

+       IN  CNAME   www6.foo.com.

 
               
À߸øµÈ °Íó·³ º¸ÀÌÁö¸¸, ½ÇÁ¦·Î BINDÀÇ
               ÀǵµµÈ ±â´ÉÀÌ´Ù. ÀÌÁ¦ www.foo.comÀ»
@@ -1246,9 +1170,7 @@ www    IN  CNAME   www0.foo.com.
               »ç¿ëÇÏ¿© www0.foo.comÀÌ ½ÇÁ¦
               www.foo.comÀ» Àü´ãÇÏ°Ô ÇÑ´Ù

 
-
-www    IN  CNAME   www0.foo.com.
-

+
www    IN  CNAME   www0.foo.com.

 
               
±×¸®°í www0.foo.comÀ» ÇÁ·Ï½ÃÀü¿ë
               ¼­¹ö·Î º¯°æÇÑ´Ù. Áï, URLÀ» ¹ÞÀ¸¸é ¼­¹ö´Â ³»ºÎ
@@ -1257,16 +1179,13 @@ www    IN  CNAME   www0.foo.com.
               ·Îµå¹ë·±½Ì ½ºÅ©¸³Æ® lb.pl·Î º¸³»´Â
               ±ÔÄ¢À» ¸¸µç´Ù.

 
-
-RewriteEngine on
+
RewriteEngine on
 RewriteMap    lb      prg:/path/to/lb.pl
-RewriteRule   ^/(.+)$ ${lb:$1}           [P,L]
-

+RewriteRule   ^/(.+)$ ${lb:$1}           [P,L]

 
               
lb.plÀ» ÀÛ¼ºÇÑ´Ù:

 
-
-#!/path/to/perl
+
#!/path/to/perl
 ##
 ##  lb.pl -- ·Îµå¹ë·±½Ì ½ºÅ©¸³Æ®
 ##
@@ -1285,8 +1204,7 @@ while (<STDIN>) {
     print "http://$server/$_";
 }
 
-##EOF##
-

+##EOF##

 
               
¸¶Áö¸· ÁÖÀÇ: ¿Ö ÀÌ ¹æ¹ýÀÌ À¯¿ëÇÑ°¡?
               www0.foo.com¿¡ ºÎ´ãÀÌ °¡Áö¾Ê´Â°¡?
@@ -1332,10 +1250,8 @@ while (<STDIN>) {
           /~user/foo/bar.scgi/ Çü½ÄÀÇ URLÀ»
           ¿øÇϱ⶧¹®ÀÌ´Ù. ´ÙÀ½ ±ÔÄ¢ÀÌ ¹®Á¦¸¦ ÇØ°áÇÑ´Ù:

 
-
-RewriteRule ^/[uge]/([^/]+)/\.www/(.+)\.scgi(.*) ...
-... /internal/cgi/user/cgiwrap/~$1/$2.scgi$3  [NS,T=application/x-http-cgi]
-

+
RewriteRule ^/[uge]/([^/]+)/\.www/(.+)\.scgi(.*) ...
+... /internal/cgi/user/cgiwrap/~$1/$2.scgi$3  [NS,T=application/x-http-cgi]

 
           
ÀÌÁ¦ ´Ù¸¥ ¸ÚÁø ÇÁ·Î±×·¥, (URL ÇÏÀ§Æ®¸®¿¡ ´ëÇÑ
           access.log¸¦ Ãâ·ÂÇÏ´Â) wwwlog¿Í
@@ -1346,9 +1262,7 @@ RewriteRule ^/[uge]/([^/]+)/\.www/(.+)\.scgi(.*) ...
           /u/user/foo/¿¡ ´ëÇØ swwidx
           ÇÁ·Î±×·¥À» ½ÇÇàÇÑ´Ù¸é ´ÙÀ½°ú °°Àº ¸µÅ©¸¦ »ç¿ëÇÑ´Ù

 
-
-/internal/cgi/user/swwidx?i=/u/user/foo/
-

+
/internal/cgi/user/swwidx?i=/u/user/foo/

 
           
±ò²ûÇÏÁö ¾Ê´Ù. ¸µÅ©¿¡ ¿µ¿ªÀÇ À§Ä¡¿Í
           CGI À§Ä¡¸¦ ¸ðµÎ Àû¾î¾ß Çϱ⶧¹®ÀÌ´Ù.
@@ -1362,24 +1276,18 @@ RewriteRule ^/[uge]/([^/]+)/\.www/(.+)\.scgi(.*) ...
           
ÇØ°áÃ¥Àº ÀÚµ¿À¸·Î ÀûÀýÇÑ CGI¸¦ ½ÇÇàÇÏ´Â »õ·Î¿î
           Ưº°ÇÑ URL Çü½ÄÀ» ¸¸µå´Â °ÍÀÌ´Ù. ´ÙÀ½°ú °°ÀÌ ¼³Á¤ÇÑ´Ù:

 
-
-RewriteRule   ^/([uge])/([^/]+)(/?.*)/\*  /internal/cgi/user/wwwidx?i=/$1/$2$3/
-RewriteRule   ^/([uge])/([^/]+)(/?.*):log /internal/cgi/user/wwwlog?f=/$1/$2$3
-

+
RewriteRule   ^/([uge])/([^/]+)(/?.*)/\*  /internal/cgi/user/wwwidx?i=/$1/$2$3/
+RewriteRule   ^/([uge])/([^/]+)(/?.*):log /internal/cgi/user/wwwlog?f=/$1/$2$3

 
           
ÀÌÁ¦ /u/user/foo/À» °Ë»öÇÏ´Â ¸µÅ©´Â
           ´ÙÀ½°ú °°´Ù

 
-
-HREF="*"
-/u/user/foo/* (???)
-

+
HREF="*"
+/u/user/foo/* (???)

 
           
³»ºÎÀûÀ¸·Î ´ÙÀ½°ú °°ÀÌ ÀÚµ¿º¯È¯µÈ´Ù

 
-
-/internal/cgi/user/wwwidx?i=/u/user/foo/
-

+
/internal/cgi/user/wwwidx?i=/u/user/foo/

 
           
°°Àº ¹æ¹ýÀ¸·Î ¸µÅ© µÚ¿¡ :log¸¦ »ç¿ëÇÏ¿©
           Á¢±Ù ·Î±× CGI ÇÁ·Î±×·¥À» ½ÇÇàÇÒ ¼ö ÀÖ´Ù.

@@ -1409,11 +1317,9 @@ HREF="*"
           /~quux/foo.html¸¦ ¿äûÇÏ¸é ³»ºÎÀûÀ¸·Î
           /~quux/foo.cgi¸¦ ½ÇÇàÇÏ°Ô µÈ´Ù.

 
-
-RewriteEngine  on
+
RewriteEngine  on
 RewriteBase    /~quux/
-RewriteRule    ^foo\.html$  foo.cgi  [T=application/x-httpd-cgi]
-

+RewriteRule    ^foo\.html$  foo.cgi  [T=application/x-httpd-cgi]

         
       
 
@@ -1441,10 +1347,8 @@ RewriteRule    ^foo\.html$  foo.cgi  [T=
           ´ÙÀ½ ±ÔÄ¢À» »ç¿ëÇÑ´Ù:
 
-
-RewriteCond %{REQUEST_FILENAME}   !-s
-RewriteRule ^page\.html$          page.cgi   [T=application/x-httpd-cgi,L]
-

+
RewriteCond %{REQUEST_FILENAME}   !-s
+RewriteRule ^page\.html$          page.cgi   [T=application/x-httpd-cgi,L]

 
           
¿©±â¼­ page.html¸¦ ¿äûÇÒ¶§
           page.htmlÀÌ ¾ø°Å³ª ÆÄÀÏÅ©±â°¡ 0ÀÎ °æ¿ì
@@ -1482,27 +1386,20 @@ RewriteRule ^page\.html$          page.cgi   [
           :refresh¸¦ Ãß°¡Çϱ⸸ Çϸé ÆÄÀϽýºÅÛ¿¡¼­
           ¼öÁ¤µÉ ¶§¸¶´Ù »õ·Î °íħÇÑ´Ù.

 
-
-RewriteRule   ^(/[uge]/[^/]+/?.*):refresh  /internal/cgi/apache/nph-refresh?f=$1
-

+
RewriteRule   ^(/[uge]/[^/]+/?.*):refresh  /internal/cgi/apache/nph-refresh?f=$1

 
           
ÀÌÁ¦ ´ÙÀ½ URL¿¡ Á¢±ÙÇϸé

 
-
-/u/foo/bar/page.html:refresh
-

+
/u/foo/bar/page.html:refresh

 
           
´ÙÀ½ URLÀ» ³»ºÎÀûÀ¸·Î ºÎ¸¥´Ù

 
-
-/internal/cgi/apache/nph-refresh?f=/u/foo/bar/page.html
-

+
/internal/cgi/apache/nph-refresh?f=/u/foo/bar/page.html

 
           
ÀÌÁ¦ NPH-CGI ½ºÅ©¸³Æ®¸¸ ³²¾Ò´Ù. º¸Åë "µ¶ÀÚ¿¡°Ô
           ¿¬½ÀÀ¸·Î ³²°ÜµÒ"À̶ó°í ¸»ÇÏÁö¸¸ ;-) ³ª´Â À̰͵µ Á¦°øÇÑ´Ù.

 
-
-#!/sw/bin/perl
+
#!/sw/bin/perl
 ##
 ##  nph-refresh -- NPH/CGI script for auto refreshing pages
 ##  Copyright (c) 1997 Ralf S. Engelschall, All Rights Reserved.
@@ -1602,8 +1499,7 @@ for ($n = 0; $n &lt; $QS_n; $n++) {
 
 exit(0);
 
-##EOF##
-

+##EOF##

         
       
 
@@ -1629,18 +1525,15 @@ exit(0);
           ±â´ÉÀ» (Ç÷¡±× [P]) »ç¿ëÇÏ¿© ¿ÜºÎ À¥ÆäÀÌÁö
           ȤÀº Àüü ¿ÜºÎ À¥¿µ¿ªÀ» ¿ì¸®ÀÇ À̸§°ø°£¿¡ ´ëÀÀÇÑ´Ù:

 
-
-##
+
##
 ##  vhost.map
 ##
 www.vhost1.dom:80  /path/to/docroot/vhost1
 www.vhost2.dom:80  /path/to/docroot/vhost2
      :
-www.vhostN.dom:80  /path/to/docroot/vhostN
-

+www.vhostN.dom:80  /path/to/docroot/vhostN

 
-
-##
+
##
 ##  httpd.conf
 ##
     :
@@ -1686,8 +1579,7 @@ RewriteCond   ${vhost:%1}  ^(/.*)$
 #   5. ¸¶Áö¸·À¸·Î URLÀ» ¹®¼­ À§Ä¡·Î ´ëÀÀÇÏ°í
 #      ·Î±×¿¡ ³²±â±âÀ§ÇØ °¡»óÈ£½ºÆ®¸¦ ±â¾ïÇØ µÐ´Ù
 RewriteRule   ^/(.*)$   %1/$1  [E=VHOST:${lowercase:%{HTTP_HOST}}]
-    :
-

+    :

         
       
 
@@ -1723,11 +1615,9 @@ RewriteRule   ^/(.*)$   %1/$1  [E=VHOST:${lowercase:%{HTTP_HOST}}]
           ¸·´Â °ÍÀ¸·Î´Â ºÒÃæºÐÇϸç, ±× È£½ºÆ®ÀÇ »ç¿ëÀÚµµ ¸·¾Æ¹ö¸®°Ô
           µÈ´Ù. User-Agent HTTP Çì´õ Á¤º¸µµ ºñ±³ÇÑ´Ù.

 
-
-RewriteCond %{HTTP_USER_AGENT}   ^NameOfBadRobot.*
+
RewriteCond %{HTTP_USER_AGENT}   ^NameOfBadRobot.*
 RewriteCond %{REMOTE_ADDR}       ^123\.45\.67\.[8-9]$
-RewriteRule ^/~quux/foo/arc/.+   -   [F]
-

+RewriteRule ^/~quux/foo/arc/.+   -   [F]

         
       
 
@@ -1753,17 +1643,13 @@ RewriteRule ^/~quux/foo/arc/.+   -   [F]
           
±×¸²À» 100% º¸È£ÇÒ ¼ö´Â ¾øÁö¸¸, ÃÖ¼ÒÇÑ ºê¶ó¿ìÀú°¡
           HTTP Referer Çì´õ¸¦ º¸³»´Â °æ¿ì Á¦ÇÑÇÒ ¼ö ÀÖ´Ù.

 
-
-RewriteCond %{HTTP_REFERER} !^$
+
RewriteCond %{HTTP_REFERER} !^$
 RewriteCond %{HTTP_REFERER} !^http://www.quux-corp.de/~quux/.*$ [NC]
-RewriteRule .*\.gif$        -                                    [F]
-

+RewriteRule .*\.gif$        -                                    [F]

 
-
-RewriteCond %{HTTP_REFERER}         !^$
+
RewriteCond %{HTTP_REFERER}         !^$
 RewriteCond %{HTTP_REFERER}         !.*/foo-with-gif\.html$
-RewriteRule ^inlined-in-foo\.gif$   -                        [F]
-

+RewriteRule ^inlined-in-foo\.gif$   -                        [F]

         
       
 
@@ -1786,28 +1672,23 @@ RewriteRule ^inlined-in-foo\.gif$   -                        [F
         

           
¾ÆÆÄÄ¡ >= 1.3b6¿¡¼­:

 
-
-RewriteEngine on
+
RewriteEngine on
 RewriteMap    hosts-deny  txt:/path/to/hosts.deny
 RewriteCond   ${hosts-deny:%{REMOTE_HOST}|NOT-FOUND} !=NOT-FOUND [OR]
 RewriteCond   ${hosts-deny:%{REMOTE_ADDR}|NOT-FOUND} !=NOT-FOUND
-RewriteRule   ^/.*  -  [F]
-

+RewriteRule   ^/.*  -  [F]

 
           
¾ÆÆÄÄ¡ <= 1.3b6¿¡¼­:

 
-
-RewriteEngine on
+
RewriteEngine on
 RewriteMap    hosts-deny  txt:/path/to/hosts.deny
 RewriteRule   ^/(.*)$ ${hosts-deny:%{REMOTE_HOST}|NOT-FOUND}/$1
 RewriteRule   !^NOT-FOUND/.* - [F]
 RewriteRule   ^NOT-FOUND/(.*)$ ${hosts-deny:%{REMOTE_ADDR}|NOT-FOUND}/$1
 RewriteRule   !^NOT-FOUND/.* - [F]
-RewriteRule   ^NOT-FOUND/(.*)$ /$1
-

+RewriteRule   ^NOT-FOUND/(.*)$ /$1

 
-
-##
+
##
 ##  hosts.deny
 ##
 ##  ÁÖÀÇ! ÀÌ°ÍÀº ¸ñ·Ïó·³ º¸ÀÌÁö¸¸ ¸ñ·ÏÀÌ ¾Æ´Ï¶ó ¸ÊÀÌ´Ù.
@@ -1817,8 +1698,7 @@ RewriteRule   ^NOT-FOUND/(.*)$ /$1
 
 193.102.180.41 -
 bsdti1.sdm.de  -
-192.76.162.40  -
-

+192.76.162.40  -

         

       
 
@@ -1845,17 +1725,13 @@ bsdti1.sdm.de  -
           mod_proxy ÀÌÀü¿¡ ºÒ¸°´Ù.
           ÀÌÁ¦ ´ÙÀ½°ú °°ÀÌ Æ¯Á¤ È£½ºÆ®¸¦ °ÅºÎÇϵµ·Ï ¼³Á¤ÇÑ´Ù...

 
-
-RewriteCond %{REMOTE_HOST} ^badhost\.mydomain\.com$
-RewriteRule !^http://[^/.]\.mydomain.com.*  - [F]
-

+
RewriteCond %{REMOTE_HOST} ^badhost\.mydomain\.com$
+RewriteRule !^http://[^/.]\.mydomain.com.*  - [F]

 
           
...±×¸®°í ´ÙÀ½Àº user@host¿¡ µû¶ó °ÅºÎÇÑ´Ù:

 
-
-RewriteCond %{REMOTE_IDENT}@%{REMOTE_HOST}  ^badguy@badhost\.mydomain\.com$
-RewriteRule !^http://[^/.]\.mydomain.com.*  - [F]
-

+
RewriteCond %{REMOTE_IDENT}@%{REMOTE_HOST}  ^badguy@badhost\.mydomain\.com$
+RewriteRule !^http://[^/.]\.mydomain.com.*  - [F]

         
       
 
@@ -1880,12 +1756,10 @@ RewriteRule !^http://[^/.]\.mydomain.com.*  - [F]
         

           
Ä£±¸¸¸ Á¢±ÙÀÌ °¡´ÉÇϵµ·Ï ÀçÀÛ¼º ±ÔÄ¢µéÀ» »ç¿ëÇÑ´Ù:

 
-
-RewriteCond %{REMOTE_IDENT}@%{REMOTE_HOST} !^friend1@client1.quux-corp\.com$
+
RewriteCond %{REMOTE_IDENT}@%{REMOTE_HOST} !^friend1@client1.quux-corp\.com$
 RewriteCond %{REMOTE_IDENT}@%{REMOTE_HOST} !^friend2@client2.quux-corp\.com$
 RewriteCond %{REMOTE_IDENT}@%{REMOTE_HOST} !^friend3@client3.quux-corp\.com$
-RewriteRule ^/~quux/only-for-friends/      -                                 [F]
-

+RewriteRule ^/~quux/only-for-friends/      -                                 [F]

         

       
 
@@ -1908,8 +1782,7 @@ RewriteRule ^/~quux/only-for-friends/      -                                 [F]
         

           
´ÙÀ½°ú °°ÀÌ º¹ÀâÇÑ ±ÔÄ¢À»...

 
-
-RewriteMap  deflector txt:/path/to/deflector.map
+
RewriteMap  deflector txt:/path/to/deflector.map
 
 RewriteCond %{HTTP_REFERER} !=""
 RewriteCond ${deflector:%{HTTP_REFERER}} ^-$
@@ -1917,20 +1790,17 @@ RewriteRule ^.* %{HTTP_REFERER} [R,L]
 
 RewriteCond %{HTTP_REFERER} !=""
 RewriteCond ${deflector:%{HTTP_REFERER}|NOT-FOUND} !=NOT-FOUND
-RewriteRule ^.* ${deflector:%{HTTP_REFERER}} [R,L]
-

+RewriteRule ^.* ${deflector:%{HTTP_REFERER}} [R,L]

 
           
... ÀçÀÛ¼º ¸Ê°ú °°ÀÌ »ç¿ëÇÑ´Ù:

 
-
-##
+
##
 ##  deflector.map
 ##
 
 http://www.badguys.com/bad/index.html    -
 http://www.badguys.com/bad/index2.html   -
-http://www.badguys.com/bad/index3.html   http://somewhere.com/
-

+http://www.badguys.com/bad/index3.html   http://somewhere.com/

 
           
±×·¯¸é ¿äûÀ» ÀÚµ¿À¸·Î (¸Ê¿¡¼­ °ªÀ¸·Î "-"¸¦
           »ç¿ëÇÑ °æ¿ì) ÂüÁ¶ÆäÀÌÁö³ª (URLÀÌ ¸Ê¿¡ ÀÖ´Â °æ¿ì µÎ¹ø°
@@ -1967,14 +1837,12 @@ http://www.badguys.com/bad/index3.html   http://somewhere.com/
           STDIN¿¡¼­ ¿äûÇÑ URLÀ» ¹Þ°í, (°°Àº ¼ø¼­·Î!)
           °á°ú (º¸Åë ÀçÀÛ¼ºµÈ) URLÀ» STDOUT¿¡ Ãâ·ÂÇÑ´Ù.

 
-
-RewriteEngine on
+
RewriteEngine on
 RewriteMap    quux-map       prg:/path/to/map.quux.pl
 RewriteRule   ^/~quux/(.*)$  /~quux/${quux-map:$1}
 

 
-
-#!/path/to/perl
+
#!/path/to/perl
 
 #   ¾ÆÆÄÄ¡ ¼­¹ö°¡ ¸ØÃßÁö ¾Êµµ·Ï
 #   ÀÔÃâ·Â ¹öÆÛ¸¦ »ç¿ëÇÏÁö ¾Ê´Â´Ù
@@ -1985,8 +1853,7 @@ $| = 1;
 while (<>) {
     s|^foo/|bar/|;
     print $_;
-}
-

+}

 
           
¼³¸íÇϱâÀ§ÇØ ¸ðµç /~quux/foo/... URLÀ»
           /~quux/bar/...·Î ÀçÀÛ¼ºÇÏ´Â ½ºÅ©¸³Æ®¸¦
diff --git a/docs/manual/mod/mod_authn_dbd.html.en b/docs/manual/mod/mod_authn_dbd.html.en
index b673b69f601..d72cb417eca 100644
--- a/docs/manual/mod/mod_authn_dbd.html.en
+++ b/docs/manual/mod/mod_authn_dbd.html.en
@@ -78,8 +78,7 @@
 the Authentication and DBD frameworks. Please note that you need
 to load an authorization module, such as mod_authz_user,
 to get it working.

-
-# mod_dbd configuration
+
# mod_dbd configuration
 DBDriver pgsql
 DBDParams "dbname=apacheauth user=apache password=xxxxxx"
 
@@ -101,8 +100,7 @@ DBDExptime 300
   # mod_authn_dbd SQL query to authenticate a user
   AuthDBDUserPWQuery \
     "SELECT password FROM authn WHERE user = %s"
-</Directory>
-

+</Directory>

 
top

 

 
Exposing Login Information

@@ -135,10 +133,8 @@ configuration required in some web applications.
     will be passed as a single string parameter when the SQL query is
     executed.  It may be referenced within the query statement using
     a %s format specifier.

-    
Example
-AuthDBDUserPWQuery \
-  "SELECT password FROM authn WHERE user = %s"
-

+    
Example
AuthDBDUserPWQuery \
+  "SELECT password FROM authn WHERE user = %s"

     
The first column value of the first row returned by the query
     statement should be a string containing the encrypted password.
     Subsequent rows will be ignored.  If no rows are returned, the user
@@ -170,10 +166,8 @@ AuthDBDUserPWQuery \
     The user's ID and the realm, in that order, will be passed as string
     parameters when the SQL query is executed.  They may be referenced
     within the query statement using %s format specifiers.

-    
Example
-AuthDBDUserRealmQuery \
-  "SELECT password FROM authn WHERE user = %s AND realm = %s"
-

+    
Example
AuthDBDUserRealmQuery \
+  "SELECT password FROM authn WHERE user = %s AND realm = %s"

     
The first column value of the first row returned by the query
     statement should be a string containing the encrypted password.
     Subsequent rows will be ignored.  If no rows are returned, the user
diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en
index d54d0ff1602..0bacfd31e06 100644
--- a/docs/manual/mod/mod_authnz_ldap.html.en
+++ b/docs/manual/mod/mod_authnz_ldap.html.en
@@ -598,8 +598,7 @@ Require valid-user
     authentication to it is a matter of adding the following
     directives to every .htaccess file
     that gets created in the web

-
-AuthLDAPURL            "the url"
+
AuthLDAPURL            "the url"
 AuthGroupFile mygroupfile
 Require group mygroupfile
 

@@ -724,16 +723,14 @@ Require group mygroupfile
     
If the value begins with exec: the resulting command will be
     executed and the first line returned to standard output by the
     program will be used as the password.

-
-#Password used as-is
+
#Password used as-is
 AuthLDAPBindPassword secret
 
 #Run /path/to/program to get my password
 AuthLDAPBindPassword exec:/path/to/program
 
 #Run /path/to/otherProgram and provide arguments
-AuthLDAPBindPassword "exec:/path/to/otherProgram argument1"
-

+AuthLDAPBindPassword "exec:/path/to/otherProgram argument1"

 
 
 

diff --git a/docs/manual/mod/mod_authnz_ldap.html.fr b/docs/manual/mod/mod_authnz_ldap.html.fr
index bec0c431b39..6a43c2b0dba 100644
--- a/docs/manual/mod/mod_authnz_ldap.html.fr
+++ b/docs/manual/mod/mod_authnz_ldap.html.fr
@@ -648,8 +648,7 @@ connexion
     l'authentification LDAP consiste à ajouter les directives suivantes
     à chaque fichier .htaccess qui sera créé dans
     le site web :

-
-AuthLDAPURL            "l'url"
+
AuthLDAPURL            "l'url"
 AuthGroupFile mon-fichier-de-groupes
 Require group mon-fichier-de-groupes
 

@@ -793,16 +792,14 @@ serveur HTTP Apache.
     commande correspondante est exécutée, et c'est la première ligne qui
     sera renvoyée par la commande sur la sortie standard qui sera
     utilisée comme mot de passe.

-
-# Mot de passe spécifié directement
+
# Mot de passe spécifié directement
 AuthLDAPBindPassword secret
 
 # Exécution de /path/to/program pour obtenir le mot de passe
 AuthLDAPBindPassword exec:/path/to/program
 
 # Exécution de /path/to/program avec un argument pour obtenir le mot de passe
-AuthLDAPBindPassword "exec:/path/to/otherProgram argument1"
-

+AuthLDAPBindPassword "exec:/path/to/otherProgram argument1"

 
 
 

diff --git a/docs/manual/mod/mod_autoindex.html.tr.utf8 b/docs/manual/mod/mod_autoindex.html.tr.utf8
index 4f147639098..d06513a442d 100644
--- a/docs/manual/mod/mod_autoindex.html.tr.utf8
+++ b/docs/manual/mod/mod_autoindex.html.tr.utf8
@@ -159,8 +159,7 @@ yaptığı gibi dizin içeriğini listeler.
       mod_autoindex tarafından son argüman olarak ele
       alınacak ve çözümleme işlemi o noktada duracaktır.

 
-    
-<form action="" method="get">
+    
<form action="" method="get">
   <input type="text" name="P" value="*" /> ile eşleşen
   <select name="C">
     <option value="N" selected="selected">isme</option>
diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 149609f2e92..18705ea6c84 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -1253,8 +1253,7 @@ through
     scheme can be accomplished with mod_rewrite as in the
     following example.

 
-    
-RewriteEngine On
+    
RewriteEngine On
 
 RewriteCond %{HTTPS} =off
 RewriteRule . - [E=protocol:http]
@@ -1263,8 +1262,7 @@ RewriteRule . - [E=protocol:https]
 
 RewriteRule ^/mirror/foo/(.*) %{ENV:protocol}://backend.example.com/$1 [P]
 ProxyPassReverse  /mirror/foo/ http://backend.example.com/
-ProxyPassReverse  /mirror/foo/ https://backend.example.com/
-    

+ProxyPassReverse  /mirror/foo/ https://backend.example.com/

 
 
 

diff --git a/docs/manual/mod/mod_proxy.html.fr b/docs/manual/mod/mod_proxy.html.fr
index 379acf62dcf..c33f863f6b7 100644
--- a/docs/manual/mod/mod_proxy.html.fr
+++ b/docs/manual/mod/mod_proxy.html.fr
@@ -1406,8 +1406,7 @@ l'espace d'URLs du serveur local
     protocole peut être effectuée à l'aide de
     mod_rewrite comme dans l'exemple suivant :

 
-    
-RewriteEngine On
+    
RewriteEngine On
 
 RewriteCond %{HTTPS} =off
 RewriteRule . - [E=protocol:http]
@@ -1416,8 +1415,7 @@ RewriteRule . - [E=protocol:https]
 
 RewriteRule ^/mirror/foo/(.*) %{ENV:protocol}://backend.example.com/$1 [P]
 ProxyPassReverse  /mirror/foo/ http://backend.example.com/
-ProxyPassReverse  /mirror/foo/ https://backend.example.com/
-    

+ProxyPassReverse  /mirror/foo/ https://backend.example.com/

 
 
 
diff --git a/docs/manual/mod/mod_proxy_ajp.html.en b/docs/manual/mod/mod_proxy_ajp.html.en
index b61bf23e43a..c391cbae18d 100644
--- a/docs/manual/mod/mod_proxy_ajp.html.en
+++ b/docs/manual/mod/mod_proxy_ajp.html.en
@@ -342,8 +342,7 @@
 
Request Packet Structure

     
For messages from the server to the container of type
     Forward Request:

-    
-AJP13_FORWARD_REQUEST :=
+    
AJP13_FORWARD_REQUEST :=
     prefix_code      (byte) 0x02 = JK_AJP13_FORWARD_REQUEST
     method           (byte)
     protocol         (string)
@@ -356,25 +355,19 @@ AJP13_FORWARD_REQUEST :=
     num_headers      (integer)
     request_headers *(req_header_name req_header_value)
     attributes      *(attribut_name attribute_value)
-    request_terminator (byte) OxFF
-    

+    request_terminator (byte) OxFF

     
The request_headers have the following structure:
-    
-req_header_name := 
+    
req_header_name := 
     sc_req_header_name | (string)  [see below for how this is parsed]
 
 sc_req_header_name := 0xA0xx (integer)
 
-req_header_value := (string)
-

+req_header_value := (string)

     
The attributes are optional and have the following
     structure:

-    
-attribute_name := sc_a_name | (sc_a_req_attribute string)
+    
attribute_name := sc_a_name | (sc_a_req_attribute string)
 
-attribute_value := (string)
-
-    

+attribute_value := (string)

     
Not that the all-important header is content-length,
     because it determines whether or not the container looks for another
     packet immediately.

@@ -527,8 +520,7 @@ attribute_value := (string)
 

 
Response Packet Structure

     
for messages which the container can send back to the server.

-    
-AJP13_SEND_BODY_CHUNK :=
+    
AJP13_SEND_BODY_CHUNK :=
   prefix_code   3
   chunk_length  (integer)
   chunk        *(byte)
@@ -555,8 +547,7 @@ AJP13_END_RESPONSE :=
 
 AJP13_GET_BODY_CHUNK :=
   prefix_code       6
-  requested_length  (integer)
-    

+  requested_length  (integer)

   
Details:

   
Send Body Chunk

     
The chunk is basically binary data, and is sent directly back to the
diff --git a/docs/manual/mod/mod_proxy_ajp.html.ja.utf8 b/docs/manual/mod/mod_proxy_ajp.html.ja.utf8
index 2c2bf0e047e..828de100285 100644
--- a/docs/manual/mod/mod_proxy_ajp.html.ja.utf8
+++ b/docs/manual/mod/mod_proxy_ajp.html.ja.utf8
@@ -284,8 +284,7 @@
 
リクエストパケット構造

     
サーバからコンテナへ送られるメッセージが
     Forward Request 型の場合 :

-    
-AJP13_FORWARD_REQUEST :=
+    
AJP13_FORWARD_REQUEST :=
     prefix_code      (byte) 0x02 = JK_AJP13_FORWARD_REQUEST
     method           (byte)
     protocol         (string)
@@ -298,24 +297,18 @@ AJP13_FORWARD_REQUEST :=
     num_headers      (integer)
     request_headers *(req_header_name req_header_value)
     attributes      *(attribut_name attribute_value)
-    request_terminator (byte) OxFF
-    

+    request_terminator (byte) OxFF

     
request_headers は次のような構造になっています :
-    
-req_header_name := 
+    
req_header_name := 
     sc_req_header_name | (string)  [see below for how this is parsed]
 
 sc_req_header_name := 0xA0xx (integer)
 
-req_header_value := (string)
-

+req_header_value := (string)

     
属性 はオプションで、次のような構造をしています :

-    
-attribute_name := sc_a_name | (sc_a_req_attribute string)
+    
attribute_name := sc_a_name | (sc_a_req_attribute string)
 
-attribute_value := (string)
-
-    

+attribute_value := (string)

     
もっとも重要なヘッダは content-length だということに
     注意してください。コンテナは次のパケットを探すかどうかを、
     それを見て決めるからです。

@@ -463,8 +456,7 @@ attribute_value := (string)
 

 
レスポンスパケット構造

     
コンテナがサーバに送り返すことのできるメッセージ:

-    
-AJP13_SEND_BODY_CHUNK :=
+    
AJP13_SEND_BODY_CHUNK :=
   prefix_code   3
   chunk_length  (integer)
   chunk        *(byte)
@@ -491,8 +483,7 @@ AJP13_END_RESPONSE :=
 
 AJP13_GET_BODY_CHUNK :=
   prefix_code       6
-  requested_length  (integer)
-    

+  requested_length  (integer)

   
詳細 :

   
Send Body Chunk

     
チャンクは基本的にはバイナリデータで、ブラウザに直接送られます。

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index ddce3a9cf8d..f54a7938338 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -109,12 +109,10 @@ URLs on the fly
       primarily used to rewrite logical URLs to physical
       pathnames.

 
-
Example
-SCRIPT_NAME=/sw/lib/w3s/tree/global/u/rse/.www/index.html
+
Example
SCRIPT_NAME=/sw/lib/w3s/tree/global/u/rse/.www/index.html
 SCRIPT_FILENAME=/u/rse/.www/index.html
 SCRIPT_URL=/u/rse/
-SCRIPT_URI=http://en1.engelschall.com/u/rse/
-

+SCRIPT_URI=http://en1.engelschall.com/u/rse/

 
 
top

 

@@ -172,15 +170,13 @@ SCRIPT_URI=http://en1.engelschall.com/u/rse/
     since the resource was not relative to the document root.  This 
     misconfiguration would normally cause the server to look for an "opt"
     directory under the document root.

-
-DocumentRoot /var/www/example.com
+
DocumentRoot /var/www/example.com
 Alias /myapp /opt/myapp-1.2.3
 <Directory /opt/myapp-1.2.3>
 RewriteEngine On
 RewriteBase /myapp/
 RewriteRule ^index\.html$  welcome.html 
-</Directory>
-

+</Directory>

 
 

 
top

@@ -582,12 +578,10 @@ RewriteRule ^index\.html$  welcome.html
           Use this to combine rule conditions with a local OR
           instead of the implicit AND. Typical example: 
 
-
-RewriteCond %{REMOTE_HOST}  =host1  [OR]
+
RewriteCond %{REMOTE_HOST}  =host1  [OR]
 RewriteCond %{REMOTE_HOST}  =host2  [OR]
 RewriteCond %{REMOTE_HOST}  =host3
-RewriteRule ...some special stuff for any of these hosts...
-

+RewriteRule ...some special stuff for any of these hosts...

 
           Without this flag you would have to write the condition/rule
           pair three times.
@@ -612,15 +606,13 @@ RewriteRule ...some special stuff for any of these hosts...
         ``User-Agent:'' header of the request, you can
         use the following: 

 
-
-RewriteCond  %{HTTP_USER_AGENT}  ^Mozilla
+
RewriteCond  %{HTTP_USER_AGENT}  ^Mozilla
 RewriteRule  ^/$                 /homepage.max.html  [L]
 
 RewriteCond  %{HTTP_USER_AGENT}  ^Lynx
 RewriteRule  ^/$                 /homepage.min.html  [L]
 
-RewriteRule  ^/$                 /homepage.std.html  [L]
-

+RewriteRule  ^/$                 /homepage.std.html  [L]

 
         
Explanation: If you use a browser which identifies itself 
 	as 'Mozilla' (including Netscape Navigator, Mozilla etc), then you
@@ -854,14 +846,12 @@ Apache 2.0.41 and later
             SubstValue
           

 
-
Example
-##
+
Example
##
 ##  map.txt -- rewriting map
 ##
 
 Ralf.S.Engelschall    rse   # Bastard Operator From Hell
-Mr.Joe.Average        joe   # Mr. Average
-

+Mr.Joe.Average        joe   # Mr. Average

 
 

 RewriteMap real-to-user txt:/path/to/file/map.txt
@@ -886,14 +876,12 @@ RewriteMap real-to-user txt:/path/to/file/map.txt
           else is sent to one of the 'dynamic' pool.

           
Example:

 
-
Rewrite map file
-##
+
Rewrite map file
##
 ##  map.txt -- rewriting map
 ##
 
 static   www1|www2|www3|www4
-dynamic  www5|www6
-

+dynamic  www5|www6

 
 
Configuration directives

 RewriteMap servers rnd:/path/to/file/map.txt

@@ -981,14 +969,12 @@ $ httxt2dbm -i mapfile.txt -o mapfile.map
           context that does not have RewriteEngine set to
           on
.
 
-
-#!/usr/bin/perl
+
#!/usr/bin/perl
 $| = 1;
 while (<STDIN>) {
     # ...put here any transformations or lookups...
     print $_;
-}
-

+}

 
           
But be very careful:

 
@@ -1470,8 +1456,7 @@ directive.

                                                 (the [R] flag is redundant)
 
 ^/somepath(.*) http://otherhost/otherpath$1 [P] http://otherhost/otherpath/pathinfo
-                                                via internal proxy
-

+                                                via internal proxy

 
       
Inside per-directory configuration for
       /somepath

@@ -1513,8 +1498,7 @@ directive.

                                                 (the [R] flag is redundant)
 
 ^localpath(.*) http://otherhost/otherpath$1 [P] http://otherhost/otherpath/pathinfo
-                                                via internal proxy
-

+                                                via internal proxy

   
 

 

diff --git a/docs/manual/mod/mod_rewrite.html.fr b/docs/manual/mod/mod_rewrite.html.fr
index 60ab05a266c..49fc29d1d8d 100644
--- a/docs/manual/mod/mod_rewrite.html.fr
+++ b/docs/manual/mod/mod_rewrite.html.fr
@@ -116,12 +116,10 @@ d'Apache
       le savoir car le processus de réécriture est principalement
       utilisé pour réécrire des URLs logiques en chemins physiques.

 
-
Exemple
-SCRIPT_NAME=/sw/lib/w3s/tree/global/u/rse/.www/index.html
+
Exemple
SCRIPT_NAME=/sw/lib/w3s/tree/global/u/rse/.www/index.html
 SCRIPT_FILENAME=/u/rse/.www/index.html
 SCRIPT_URL=/u/rse/
-SCRIPT_URI=http://en1.engelschall.com/u/rse/
-

+SCRIPT_URI=http://en1.engelschall.com/u/rse/

 
 
top

 

@@ -185,15 +183,13 @@ ressource n'
 de configuration aurait conduit le serveur à rechercher un répertoire
 "opt" à la racine des documents.

 
-
-DocumentRoot /var/www/example.com
+
DocumentRoot /var/www/example.com
 Alias /myapp /opt/myapp-1.2.3
 <Directory /opt/myapp-1.2.3>
 RewriteEngine On
 RewriteBase /myapp/
 RewriteRule ^index\.html$  welcome.html 
-</Directory>
-

+</Directory>

 
 

 
top

@@ -616,12 +612,10 @@ la r
 	  Permet de chaîner les conditions de règles avec un OU au
 	  lieu du AND implicite. Exemple typique :
 
-
-RewriteCond %{REMOTE_HOST}  ^hote1  [OR]
+
RewriteCond %{REMOTE_HOST}  ^hote1  [OR]
 RewriteCond %{REMOTE_HOST}  ^hote2  [OR]
 RewriteCond %{REMOTE_HOST}  ^hote3
-RewriteRule ...règles concernant tous ces hôtes...
-

+RewriteRule ...règles concernant tous ces hôtes...

 
           Sans ce drapeau, les paires
 	  condition/règle devraient être écrites trois fois.
@@ -647,15 +641,13 @@ RewriteRule ...r
        l'en-tête ``User-Agent:'' de la requête, vous
        pouvez utiliser ce qui suit : 

 
-
-RewriteCond  %{HTTP_USER_AGENT}  ^Mozilla
+
RewriteCond  %{HTTP_USER_AGENT}  ^Mozilla
 RewriteRule  ^/$                 /homepage.max.html  [L]
 
 RewriteCond  %{HTTP_USER_AGENT}  ^Lynx
 RewriteRule  ^/$                 /homepage.min.html  [L]
 
-RewriteRule  ^/$                 /homepage.std.html  [L]
-

+RewriteRule  ^/$                 /homepage.std.html  [L]

 
         
Explications : si vous utilisez un navigateur
 	(Netscape Navigator, Mozilla etc) qui s'identifie comme
@@ -917,15 +909,13 @@ bases de donn
             valeur de remplacement
           

 
-
Exemple
-##
+
Exemple
##
 ##  map.txt -- table de correspondance pour la réécriture
 ##
 
 Ralf.S.Engelschall    rse   # Bastard Operator From Hell
 (traduction à votre convenance)
-Mr.Joe.Average        joe   # Mr. Average
-

+Mr.Joe.Average        joe   # Mr. Average

 
 

 RewriteMap real-to-user txt:/chemin/vers/fichier/map.txt
@@ -955,14 +945,12 @@ RewriteMap real-to-user txt:/chemin/vers/fichier/map.txt
 	  "dynamique".

           
Exemple:

 
-
Fichier de correspondances pour la réécriture
-##
+
Fichier de correspondances pour la réécriture
##
 ##  map.txt -- correspondances pour la réécriture
 ##
 
 static   www1|www2|www3|www4
-dynamic  www5|www6
-

+dynamic  www5|www6

 
 
Directives de configuration

 RewriteMap serveurs rnd:/chemin/vers/fichier/map.txt

@@ -1063,14 +1051,12 @@ $ httxt2dbm -i fichier-source.txt -o fichier-dbm.map
 	 RewriteEngine n'a pas été définie à
 	 on.

 
-
-#!/usr/bin/perl
+
#!/usr/bin/perl
 $| = 1;
 while (<STDIN>) {
     # ...insérer ici le code de transformation ou de recherche...
     print $_;
-}
-

+}

 
           
Mais soyez très prudent :

 
@@ -1614,8 +1600,7 @@ utilis
 						redondant)
 
 ^/chemin(.*) http://autre hôte/autre-chemin$1 [P] http://autre hôte/autre-chemin/infochemin
-                                                via un mandataire interne
-

+                                                via un mandataire interne

 
       
Dans une configuration de niveau répertoire pour
       /chemin

@@ -1658,8 +1643,7 @@ utilis
 						redondant)
 
 ^chemin-local(.*) http://autre hôte/autre-chemin$1 [P] http://autre hôte/autre-chemin/infochemin
-                                                via un mandataire interne
-

+                                                via un mandataire interne

   
 

 

diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en
index ad5ee1f427d..dddef6552f8 100644
--- a/docs/manual/mod/mod_ssl.html.en
+++ b/docs/manual/mod/mod_ssl.html.en
@@ -537,16 +537,14 @@ authenticate, i.e. for SSL only the Anonymous Diffie-Hellman ciphers. Next,
 use ciphers using RC4 and RSA. Next include the high, medium and then the low
 security ciphers. Finally pull all SSLv2 and export ciphers to the
 end of the list.

-
-$ openssl ciphers -v 'ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP'
+
$ openssl ciphers -v 'ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP'
 NULL-SHA                SSLv3 Kx=RSA      Au=RSA  Enc=None      Mac=SHA1
 NULL-MD5                SSLv3 Kx=RSA      Au=RSA  Enc=None      Mac=MD5
 EDH-RSA-DES-CBC3-SHA    SSLv3 Kx=DH       Au=RSA  Enc=3DES(168) Mac=SHA1
 ...                     ...               ...     ...           ...
 EXP-RC4-MD5             SSLv3 Kx=RSA(512) Au=RSA  Enc=RC4(40)   Mac=MD5  export
 EXP-RC2-CBC-MD5         SSLv2 Kx=RSA(512) Au=RSA  Enc=RC2(40)   Mac=MD5  export
-EXP-RC4-MD5             SSLv2 Kx=RSA(512) Au=RSA  Enc=RC4(40)   Mac=MD5  export
-

+EXP-RC4-MD5             SSLv2 Kx=RSA(512) Au=RSA  Enc=RC4(40)   Mac=MD5  export

 
The complete list of particular RSA & DH ciphers for SSL is given in Table 2.

 
Example

 SSLCipherSuite RSA:!EXP:!NULL:+HIGH:+MEDIUM:-LOW
@@ -1585,8 +1583,7 @@ containing any number of access checks.

 The expression must match the following syntax (given as a BNF
 grammar notation):

 

-
-expr     ::= "true" | "false"
+
expr     ::= "true" | "false"
            | "!" expr
            | expr "&&" expr
            | expr "||" expr
@@ -1615,8 +1612,7 @@ word     ::= digit
 digit    ::= [0-9]+
 cstring  ::= "..."
 variable ::= "%{" varname "}"
-function ::= funcname "(" funcargs ")"
-

+function ::= funcname "(" funcargs ")"

 

 
while for varname any variable from Table 3 can be used. Finally for
 funcname the following functions are available:

@@ -1649,8 +1645,7 @@ checked, until a match is found.
 

 
 
Standard CGI/1.0 and Apache variables:

-
-HTTP_USER_AGENT        PATH_INFO             AUTH_TYPE
+
HTTP_USER_AGENT        PATH_INFO             AUTH_TYPE
 HTTP_REFERER           QUERY_STRING          SERVER_SOFTWARE
 HTTP_COOKIE            REMOTE_HOST           API_VERSION
 HTTP_FORWARDED         REMOTE_IDENT          TIME_YEAR
@@ -1662,11 +1657,9 @@ THE_REQUEST            SERVER_PORT           TIME_SEC
 REQUEST_METHOD         SERVER_PROTOCOL       TIME_WDAY
 REQUEST_SCHEME         REMOTE_ADDR           TIME
 REQUEST_URI            REMOTE_USER           ENV:variablename
-REQUEST_FILENAME
-

+REQUEST_FILENAME

 
SSL-related variables:

-
-HTTPS                  SSL_CLIENT_M_VERSION   SSL_SERVER_M_VERSION
+
HTTPS                  SSL_CLIENT_M_VERSION   SSL_SERVER_M_VERSION
                        SSL_CLIENT_M_SERIAL    SSL_SERVER_M_SERIAL
 SSL_PROTOCOL           SSL_CLIENT_V_START     SSL_SERVER_V_START
 SSL_SESSION_ID         SSL_CLIENT_V_END       SSL_SERVER_V_END
@@ -1702,8 +1695,7 @@ SSL_VERSION_INTERFACE  SSL_CLIENT_S_DN_OU     SSL_SERVER_S_DN_OU
                        SSL_CLIENT_A_KEY       SSL_SERVER_A_KEY
                        SSL_CLIENT_CERT        SSL_SERVER_CERT
                        SSL_CLIENT_CERT_CHAIN_n
-                       SSL_CLIENT_VERIFY      SSL_TLS_SNI
-

+                       SSL_CLIENT_VERIFY      SSL_TLS_SNI

 
 

 
top

diff --git a/docs/manual/mod/mod_usertrack.html.en b/docs/manual/mod/mod_usertrack.html.en
index 1a5a674379e..a0f18358c4a 100644
--- a/docs/manual/mod/mod_usertrack.html.en
+++ b/docs/manual/mod/mod_usertrack.html.en
@@ -82,8 +82,7 @@ CustomLog logs/clickstream "%{cookie}n %r %t"
     
(the following is from message
     <022701bda43d$9d32bbb0$1201a8c0@christian.office.sane.com>
     in the new-httpd archives) 

-
-From: "Christian Allen" <christian@sane.com>
+
From: "Christian Allen" <christian@sane.com>
 Subject: Re: Apache Y2K bug in mod_usertrack.c
 Date: Tue, 30 Jun 1998 11:41:56 -0400
 
@@ -112,8 +111,7 @@ Summary:  Mozilla 3.x and up understands two digit dates up until "37"
 (2037).  Mozilla 4.x understands up until at least "50" (2050) in 2-digit
 form, but also understands 4-digit years, which can probably reach up until
 9999.  Your best bet for sending a long-life cookie is to send it for some
-time late in the year "37".
-

+time late in the year "37".

 
 

 
top

diff --git a/docs/manual/platform/perf-hp.html.en b/docs/manual/platform/perf-hp.html.en
index 980b3dcfe47..e8f1dee04de 100644
--- a/docs/manual/platform/perf-hp.html.en
+++ b/docs/manual/platform/perf-hp.html.en
@@ -26,13 +26,11 @@
 

 
 
-
-Date: Wed, 05 Nov 1997 16:59:34 -0800
+
Date: Wed, 05 Nov 1997 16:59:34 -0800
 From: Rick Jones <raj@cup.hp.com>
 Reply-To: raj@cup.hp.com
 Organization: Network Performance
-Subject: HP-UX tuning tips
-

+Subject: HP-UX tuning tips

 
     
Here are some tuning tips for HP-UX to add to the tuning page.

 
diff --git a/docs/manual/platform/perf-hp.html.ko.euc-kr b/docs/manual/platform/perf-hp.html.ko.euc-kr
index efe8dc3a8bf..977b7efcad7 100644
--- a/docs/manual/platform/perf-hp.html.ko.euc-kr
+++ b/docs/manual/platform/perf-hp.html.ko.euc-kr
@@ -28,13 +28,11 @@
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.

 
 
-
-Date: Wed, 05 Nov 1997 16:59:34 -0800
+
Date: Wed, 05 Nov 1997 16:59:34 -0800
 From: Rick Jones <raj@cup.hp.com>
 Reply-To: raj@cup.hp.com
 Organization: Network Performance
-Subject: HP-UX tuning tips
-

+Subject: HP-UX tuning tips

 
     
ÀÌ ±ÛÀº ¼º´ÉÇâ»ó ÆäÀÌÁö¿¡ Ãß°¡ÇÒ HP-UX ¼º´ÉÇâ»ó ÆÁÀÌ´Ù.

 
diff --git a/docs/manual/platform/win_compiling.html.ko.euc-kr b/docs/manual/platform/win_compiling.html.ko.euc-kr
index 5e55880880b..484bf536206 100644
--- a/docs/manual/platform/win_compiling.html.ko.euc-kr
+++ b/docs/manual/platform/win_compiling.html.ko.euc-kr
@@ -179,11 +179,9 @@
     ÀÖ´Ù. Windows NT¿¡¼­ release¿Í debug
     ÄÄÆÄÀÏÇÏ´Â ¸í·É¾î´Â °¢°¢ ´ÙÀ½°ú °°´Ù:

 
-    
-nmake /f Makefile.win _apacher
+    
nmake /f Makefile.win _apacher
 
-nmake /f Makefile.win _apached
-    

+nmake /f Makefile.win _apached

 
     
µÎ ¸í·É¾î ¸ðµÎ ¾ÆÆÄÄ¡¸¦ ÄÄÆÄÀÏÇÑ´Ù. ÈÄÀÚ´Â °á°úÆÄÀÏ¿¡
     µð¹ö±ë Á¤º¸¸¦ Æ÷ÇÔÇÏ¿© ¹ö±×¸¦ ã°í ¹®Á¦¸¦ ÃßÀûÇϱ⠽±°Ô
@@ -323,8 +321,7 @@ nmake /f Makefile.win _apached
     
ÄÄÆÄÀÏÇÏ°í ¸ðµç ÆÄÀÏÀ» ¿øÇÏ´Â Æú´õ dir¿¡ ÀÚµ¿À¸·Î
     ¼³Ä¡ÇÏ·Á¸é ´ÙÀ½ nmake ¸í·É¾îÁß Çϳª¸¦ »ç¿ëÇÑ´Ù:

 
-    
-nmake /f Makefile.win installr INSTDIR=dir
+    
nmake /f Makefile.win installr INSTDIR=dir
 
 nmake /f Makefile.win installd INSTDIR=dir
     

diff --git a/docs/manual/rewrite/advanced.html.en b/docs/manual/rewrite/advanced.html.en
index 8c535200736..ae31d0a0777 100644
--- a/docs/manual/rewrite/advanced.html.en
+++ b/docs/manual/rewrite/advanced.html.en
@@ -126,11 +126,9 @@ RewriteRule   ^/u/([^/]+)/?(.*)   http://${users-to-hos
     

       This is done via the following ruleset:
 
-
-# This example is valid in per-directory context only
+
# This example is valid in per-directory context only
 RewriteCond %{REQUEST_URI}   !-U
-RewriteRule ^(.+)\.html$          /regenerate_page.cgi   [PT,L]
-

+RewriteRule ^(.+)\.html$          /regenerate_page.cgi   [PT,L]

 
 
     
The -U operator determines whether the test string
@@ -242,8 +240,7 @@ RewriteRule   ^(/[uge]/[^/]+/?.*):refresh  /internal/cgi/apache/nph-refresh?f=$1
       one would usually say "left as an exercise to the reader"
       ;-) I will provide this, too.

 
-
-#!/sw/bin/perl
+
#!/sw/bin/perl
 ##
 ##  nph-refresh -- NPH/CGI script for auto refreshing pages
 ##  Copyright (c) 1997 Ralf S. Engelschall, All Rights Reserved.
@@ -343,8 +340,7 @@ for ( $n = 0 ; $n & lt ; $QS_n ; $n++ ) {
 
 exit(0);
 
-##EOF##
-

+##EOF##

     

   
 
diff --git a/docs/manual/ssl/ssl_faq.html.en b/docs/manual/ssl/ssl_faq.html.en
index 75bae6e0669..79f55e57008 100644
--- a/docs/manual/ssl/ssl_faq.html.en
+++ b/docs/manual/ssl/ssl_faq.html.en
@@ -327,10 +327,8 @@ Certificate for testing purposes?
 			-keyout server.key

 	These can be used as follows in your httpd.conf 
 	file:
-        
-             SSLCertificateFile    /path/to/this/server.crt
-             SSLCertificateKeyFile /path/to/this/server.key
-	

+        
             SSLCertificateFile    /path/to/this/server.crt
+             SSLCertificateKeyFile /path/to/this/server.key

     
     
  • It is important that you are aware that this 
 	server.key does not have any passphrase.
@@ -439,10 +437,8 @@ Certificate for testing purposes?
     
  • You should now have two files: server.key and
     server.crt. These can be used as follows in your
     httpd.conf file:
-       
    -       SSLCertificateFile    /path/to/this/server.crt
-       SSLCertificateKeyFile /path/to/this/server.key
-       
    
+       
           SSLCertificateFile    /path/to/this/server.crt
+       SSLCertificateKeyFile /path/to/this/server.key
    
        The server.csr file is no longer needed.
     
    • 
 
diff --git a/docs/manual/ssl/ssl_howto.html.en b/docs/manual/ssl/ssl_howto.html.en
index fcf57f3126f..e45de55db4a 100644
--- a/docs/manual/ssl/ssl_howto.html.en
+++ b/docs/manual/ssl/ssl_howto.html.en
@@ -191,8 +191,7 @@ Intranet website, for clients coming from the Internet?
     you should establish a password database containing all
     clients allowed, as follows:
    
     
-    
    httpd.conf
    -SSLCACertificateFile conf/ssl.crt/ca.crt
+    
    httpd.conf
    SSLCACertificateFile conf/ssl.crt/ca.crt
 SSLCACertificatePath conf/ssl.crt
 SSLVerifyClient      none
 
@@ -212,8 +211,7 @@ Require              valid-user
     See the SSLOptions docs for more 
     information.
    
     
-    
    httpd.passwd
    -/C=DE/L=Munich/O=Snake Oil, Ltd./OU=Staff/CN=Foo:xxj31ZMTZzkVA
+    
    httpd.passwd
    /C=DE/L=Munich/O=Snake Oil, Ltd./OU=Staff/CN=Foo:xxj31ZMTZzkVA
 /C=US/L=S.F./O=Snake Oil, Ltd./OU=CA/CN=Bar:xxj31ZMTZzkVA
 /C=US/L=L.A./O=Snake Oil, Ltd./OU=Dev/CN=Quux:xxj31ZMTZzkVA
    
 
@@ -221,8 +219,7 @@ Require              valid-user
     into the DN, you can match them more easily using SSLRequire, as follows:
    
 
 
-    
    httpd.conf
    -SSLVerifyClient      none
+    
    httpd.conf
    SSLVerifyClient      none
 SSLCACertificateFile conf/ssl.crt/ca.crt
 SSLCACertificatePath conf/ssl.crt
 
@@ -248,8 +245,7 @@ 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
+    
    httpd.conf
    SSLCACertificateFile conf/ssl.crt/company-ca.crt
 
 <Directory /usr/local/apache2/htdocs>
 #   Outside the subarea only Intranet access is granted