Skip to content

Commit 356d8b8

Browse files
rbowenrbowen
committed
Rebuild igalic's changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1041032 13f79535-47bb-0310-9956-ffa450edef68
1 parent 3f6efa0 commit 356d8b8

52 files changed

Lines changed: 140 additions & 89 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/manual/dns-caveats.html.en‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,18 +117,18 @@
117117
<p>Suppose that you've assigned 192.0.2.1 to
118118
<code>www.example1.dom</code> and 192.0.2.2 to
119119
<code>www.example2.dom</code>. Furthermore, suppose that
120-
<code>example2.dom</code> has control of their own DNS. With this
121-
config you have put <code>example2.dom</code> into a position where
122-
they can steal all traffic destined to <code>example1.dom</code>. To
123-
do so, all they have to do is set <code>www.example2.dom</code> to
124-
192.0.2.1. Since they control their own DNS you can't stop them
125-
from pointing the <code>www.example2.dom</code> record wherever they
120+
<code>example1.dom</code> has control of their own DNS. With this
121+
config you have put <code>example1.dom</code> into a position where
122+
they can steal all traffic destined to <code>example2.dom</code>. To
123+
do so, all they have to do is set <code>www.example1.dom</code> to
124+
192.0.2.2. Since they control their own DNS you can't stop them
125+
from pointing the <code>www.example1.dom</code> record wherever they
126126
wish.</p>
127127

128-
<p>Requests coming in to 192.0.2.1 (including all those where
128+
<p>Requests coming in to 192.0.2.2 (including all those where
129129
users typed in URLs of the form
130-
<code>http://www.example1.dom/whatever</code>) will all be served by
131-
the <code>example2.dom</code> virtual host. To better understand why
130+
<code>http://www.example2.dom/whatever</code>) will all be served by
131+
the <code>example1.dom</code> virtual host. To better understand why
132132
this happens requires a more in-depth discussion of how httpd
133133
matches up incoming requests with the virtual host that will
134134
serve it. A rough document describing this <a href="vhosts/details.html">is available</a>.</p>

‎docs/manual/dns-caveats.xml.ja‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
33
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
4-
<!-- English Revision: 507346:1030181 (outdated) -->
4+
<!-- English Revision: 507346:1040785 (outdated) -->
55

66
<!--
77
Licensed to the Apache Software Foundation (ASF) under one or more

‎docs/manual/dns-caveats.xml.ko‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="EUC-KR" ?>
22
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
33
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
4-
<!-- English Revision: 105989:1030181 (outdated) -->
4+
<!-- English Revision: 105989:1040785 (outdated) -->
55

66
<!--
77
Licensed to the Apache Software Foundation (ASF) under one or more

‎docs/manual/dns-caveats.xml.tr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
33
<?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
4-
<!-- English Revision: 788974:1030181 (outdated) -->
4+
<!-- English Revision: 788974:1040785 (outdated) -->
55
<!-- =====================================================
66
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
77
Reviewed by: Orhan Berent <berent belgeler.org>

‎docs/manual/howto/ssi.html.ja.utf8‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
<a href="../ja/howto/ssi.html" title="Japanese">&nbsp;ja&nbsp;</a> |
2525
<a href="../ko/howto/ssi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
2626
</div>
27+
<div class="outofdate">この日本語訳はすでに古くなっている可能性があります。
28+
更新された内容を見るには英語版をご覧下さい。</div>
2729

2830
<p>サーバサイドインクルードによって、既存の HTML
2931
ドキュメントに動的なコンテンツを追加することができます。</p>

‎docs/manual/howto/ssi.html.ko.euc-kr‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<a href="../ja/howto/ssi.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
2424
<a href="../ko/howto/ssi.html" title="Korean">&nbsp;ko&nbsp;</a></p>
2525
</div>
26+
<div class="outofdate">이 문서는 최신판 번역이 아닙니다.
27+
최근에 변경된 내용은 영어 문서를 참고하세요.</div>
2628

2729
<p>Server-side includes를 사용하여 HTML 문서에 동적인 내용을
2830
추가할 수 있다.</p>

‎docs/manual/install.html.en‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ $ tar xvf httpd-<em>NN</em>.tar
334334
<p>The first step in upgrading is to read the release announcement
335335
and the file <code>CHANGES</code> in the source distribution to
336336
find any changes that may affect your site. When changing between
337-
major releases (for example, from 1.3 to 2.0 or from 2.0 to 2.2),
337+
major releases (for example, from 2.0 to 2.2 or from 2.2 to 2.3),
338338
there will likely be major differences in the compile-time and
339339
run-time configuration that will require manual adjustments. All
340340
modules will also need to be upgraded to accomodate changes in the

‎docs/manual/install.html.fr‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
2727
<a href="./tr/install.html" hreflang="tr" rel="alternate" title="T�rk�e">&nbsp;tr&nbsp;</a></p>
2828
</div>
29+
<div class="outofdate">Cette traduction peut �tre p�rim�e. V�rifiez la version
30+
anglaise pour les changements r�cents.</div>
2931

3032

3133
<p>Ce document couvre l'installation et la compilation du serveur

‎docs/manual/install.xml.de‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version='1.0' encoding='UTF-8' ?>
22
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
33
<?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
4-
<!-- English Revision: 239255:952009 (outdated) -->
4+
<!-- English Revision: 239255:1041010 (outdated) -->
55

66
<!--
77
Licensed to the Apache Software Foundation (ASF) under one or more

‎docs/manual/install.xml.es‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version='1.0' encoding='UTF-8' ?>
22
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
33
<?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
4-
<!-- English Revision: 105989:952009 (outdated) -->
4+
<!-- English Revision: 105989:1041010 (outdated) -->
55

66
<!--
77
Licensed to the Apache Software Foundation (ASF) under one or more

0 commit comments

Comments
 (0)