sync.

Submitted by: Takashi Sato <serai@lans-tv.com>
Reviewd by: Hiroaki Kawai <kawai@apache.org>
English Revision: 425051

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@474732 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index de16403b227d5a929259de714b3d9b0954186442..4a5deed0e7d4b4de985182070af45170a06b3076 100644 (file)
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 421100:425051 (outdated) -->
+<!-- English Revision: 425051 -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -2742,7 +2742,7 @@ module="core">Directory</directive></seealso>
 <directivesynopsis>
 <name>ServerName</name>
 <description>\e$B%5!<%P$,<+J,<+?H$r<($9$H$-$K;H$&%[%9%HL>$H%]!<%H\e(B</description>
-<syntax>ServerName <var>fully-qualified-domain-name</var>[:<var>port</var>]</syntax>
+<syntax>ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
 <compatibility>\e$B$3$N%G%#%l%/%F%#%V$O%P!<%8%g%s\e(B 2.0 \e$B$G$O%P!<%8%g%s\e(B 1.3 \e$B$N\e(B
@@ -2750,7 +2750,7 @@ module="core">Directory</directive></seealso>
 
 <usage>
     <p><directive>ServerName</directive> \e$B%G%#%l%/%F%#%V$O!"\e(B
-    \e$B%5!<%P$,<+J,<+?H$r<($9%[%9%HL>$H%]!<%H$r@_Dj$7$^$9!#\e(B
+    \e$B%5!<%P$,<+J,<+?H$r<($9%j%/%(%9%H%9%-!<%`$H%[%9%HL>$H%]!<%H$r@_Dj$7$^$9!#\e(B
     \e$B$3$l$O!"%j%@%$%l%/%H$9$k\e(B URL \e$B$r@8@.$9$k:]$KMxMQ$5$l$^$9!#\e(B
     \e$BNc$($P!"%&%'%V%5!<%P$rF0$+$7$F$$$k%^%7%s$O\e(B <code>simple.example.com</code>
     \e$B$G!"\e(BDNS \e$B$N%(%$%j%"%9\e(B <code>www.example.com</code> \e$B$b$"$k$H$-$K!"\e(B
@@ -2775,6 +2775,13 @@ module="core">Directory</directive></seealso>
     <directive>ServerName</directive> \e$B$O$3$N%P!<%A%c%k%[%9%H$K%^%C%A$9$k$?$a$K\e(B
     \e$B2?$,%j%/%(%9%H$N\e(B Host: \e$B%X%C%@$K8=$l$kI,MW$,$"$k$N$+$r;XDj$7$^$9!#\e(B</p>
 
+    <p>\e$B%j%P!<%9%W%m%-%7$d%m!<%I%P%i%s%5$d\e(BSSL\e$BIi2Y7Z8:AuCV$N$h$&$J!"\e(B
+    SSL\e$B$r=hM}$9$k%^%7%s$N8e$m$G%5!<%P$rF0$+$9>l9g$O!"\e(B
+    \e$B%5!<%P$,@5$7$$<+8J;2>H\e(B URL\e$B$r3N<B$K@8@.$9$k$h$&$K!"\e(B
+    <code>https://</code> \e$B%9%-!<%`$H%/%i%$%"%s%H$,@\B3$9$k%]!<%HHV9f$r!"\e(B
+    <directive>ServerName</directive> \e$B%G%#%l%/%F%#%V$K;XDj$7$F$/$@$5$$!#\e(B
+    </p>
+
     <p>\e$B<+8J;2>H\e(B URL (\e$BNc$($P\e(B <module>mod_dir</module> \e$B%b%8%e!<%k$K$h$k$b$N$J$I\e(B)
     \e$B$,;XDj$5$l$?%]!<%H$r;H$&$+!"%/%i%$%"%s%H$N%j%/%(%9%H$N%]!<%HHV9f$r;H$&$+$r\e(B
     \e$B7hDj$9$k@_Dj$O\e(B <directive module="core">UseCanonicalName</directive>