Commit 553c5785 authored by Hiroaki Kawai's avatar Hiroaki Kawai
Browse files

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
parent 08dd4f58
Loading
Loading
Loading
Loading
+10 −3
Changes for docs/manual/mod/core.xml.ja: 10 added lines, 3 removed lines.
Original line number Diff line number Diff line
<?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>$B%5!<%P$,<+J,<+?H$r<($9$H$-$K;H$&%[%9%HL>$H%]!<%H(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>$B$3$N%G%#%l%/%F%#%V$O%P!<%8%g%s(B 2.0 $B$G$O%P!<%8%g%s(B 1.3 $B$N(B
@@ -2750,7 +2750,7 @@ module="core">Directory</directive></seealso>

<usage>
    <p><directive>ServerName</directive> $B%G%#%l%/%F%#%V$O!"(B
    $B%5!<%P$,<+J,<+?H$r<($9%[%9%HL>$H%]!<%H$r@_Dj$7$^$9!#(B
    $B%5!<%P$,<+J,<+?H$r<($9%j%/%(%9%H%9%-!<%`$H%[%9%HL>$H%]!<%H$r@_Dj$7$^$9!#(B
    $B$3$l$O!"%j%@%$%l%/%H$9$k(B URL $B$r@8@.$9$k:]$KMxMQ$5$l$^$9!#(B
    $BNc$($P!"%&%'%V%5!<%P$rF0$+$7$F$$$k%^%7%s$O(B <code>simple.example.com</code>
    $B$G!"(BDNS $B$N%(%$%j%"%9(B <code>www.example.com</code> $B$b$"$k$H$-$K!"(B
@@ -2775,6 +2775,13 @@ module="core">Directory</directive></seealso>
    <directive>ServerName</directive> $B$O$3$N%P!<%A%c%k%[%9%H$K%^%C%A$9$k$?$a$K(B
    $B2?$,%j%/%(%9%H$N(B Host: $B%X%C%@$K8=$l$kI,MW$,$"$k$N$+$r;XDj$7$^$9!#(B</p>

    <p>$B%j%P!<%9%W%m%-%7$d%m!<%I%P%i%s%5$d(BSSL$BIi2Y7Z8:AuCV$N$h$&$J!"(B
    SSL$B$r=hM}$9$k%^%7%s$N8e$m$G%5!<%P$rF0$+$9>l9g$O!"(B
    $B%5!<%P$,@5$7$$<+8J;2>H(B URL$B$r3N<B$K@8@.$9$k$h$&$K!"(B
    <code>https://</code> $B%9%-!<%`$H%/%i%$%"%s%H$,@\B3$9$k%]!<%HHV9f$r!"(B
    <directive>ServerName</directive> $B%G%#%l%/%F%#%V$K;XDj$7$F$/$@$5$$!#(B
    </p>

    <p>$B<+8J;2>H(B URL ($BNc$($P(B <module>mod_dir</module> $B%b%8%e!<%k$K$h$k$b$N$J$I(B)
    $B$,;XDj$5$l$?%]!<%H$r;H$&$+!"%/%i%$%"%s%H$N%j%/%(%9%H$N%]!<%HHV9f$r;H$&$+$r(B
    $B7hDj$9$k@_Dj$O(B <directive module="core">UseCanonicalName</directive>