From c09639ef60bade89c64b432969dc6a964ea4edac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Malo?= Date: Sat, 7 Feb 2004 17:27:04 +0000 Subject: [PATCH] apply Apache License, Version 2.0 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102540 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/LICENSE | 232 ++++++++++++++++------ docs/manual/bind.xml | 16 ++ docs/manual/bind.xml.ja | 16 ++ docs/manual/bind.xml.ko | 16 ++ docs/manual/cgi_path.xml | 16 ++ docs/manual/cgi_path.xml.ja | 16 ++ docs/manual/cgi_path.xml.ko | 16 ++ docs/manual/configuring.xml | 17 ++ docs/manual/configuring.xml.ja | 19 +- docs/manual/configuring.xml.ko | 17 ++ docs/manual/content-negotiation.xml | 17 ++ docs/manual/content-negotiation.xml.ja | 19 +- docs/manual/content-negotiation.xml.ko | 17 ++ docs/manual/custom-error.xml | 16 ++ docs/manual/custom-error.xml.ja | 16 ++ docs/manual/custom-error.xml.ko | 16 ++ docs/manual/dns-caveats.xml | 16 ++ docs/manual/dns-caveats.xml.ja | 16 ++ docs/manual/dns-caveats.xml.ko | 16 ++ docs/manual/dso.xml | 16 ++ docs/manual/dso.xml.ja | 16 ++ docs/manual/dso.xml.ko | 16 ++ docs/manual/env.xml | 16 ++ docs/manual/env.xml.ja | 16 ++ docs/manual/env.xml.ko | 16 ++ docs/manual/filter.xml | 16 ++ docs/manual/filter.xml.ja | 16 ++ docs/manual/filter.xml.ko | 16 ++ docs/manual/glossary.xml | 16 ++ docs/manual/glossary.xml.ko | 16 ++ docs/manual/handler.xml | 16 ++ docs/manual/handler.xml.ja | 16 ++ docs/manual/handler.xml.ko | 16 ++ docs/manual/index.xml | 16 ++ docs/manual/index.xml.de | 16 ++ docs/manual/index.xml.ja | 16 ++ docs/manual/index.xml.ko | 16 ++ docs/manual/install.xml | 17 ++ docs/manual/install.xml.de | 16 ++ docs/manual/install.xml.ja | 17 ++ docs/manual/install.xml.ko | 17 ++ docs/manual/invoking.xml | 17 ++ docs/manual/invoking.xml.de | 17 ++ docs/manual/invoking.xml.ja | 19 +- docs/manual/invoking.xml.ko | 17 ++ docs/manual/license.html.en | 242 +++++++++++++++++------ docs/manual/license.xml | 257 +++++++++++++++++++------ docs/manual/logs.xml | 16 ++ docs/manual/logs.xml.ja | 16 ++ docs/manual/logs.xml.ko | 16 ++ docs/manual/mpm.xml | 17 ++ docs/manual/mpm.xml.ja | 19 +- docs/manual/mpm.xml.ko | 17 ++ docs/manual/new_features_2_0.xml | 17 ++ docs/manual/new_features_2_0.xml.de | 16 ++ docs/manual/new_features_2_0.xml.ja | 19 +- docs/manual/new_features_2_0.xml.ko | 17 ++ docs/manual/new_features_2_0.xml.ru | 16 ++ docs/manual/sections.xml | 16 ++ docs/manual/sections.xml.ja | 16 ++ docs/manual/sections.xml.ko | 16 ++ docs/manual/server-wide.xml | 17 ++ docs/manual/server-wide.xml.ja | 19 +- docs/manual/server-wide.xml.ko | 17 ++ docs/manual/sitemap.xml | 16 ++ docs/manual/sitemap.xml.de | 16 ++ docs/manual/sitemap.xml.ja | 16 ++ docs/manual/sitemap.xml.ko | 16 ++ docs/manual/stopping.xml | 17 ++ docs/manual/stopping.xml.de | 17 ++ docs/manual/stopping.xml.ja | 17 ++ docs/manual/stopping.xml.ko | 17 ++ docs/manual/style/css/manual.css | 8 + docs/manual/style/xsl/common.xsl | 9 +- docs/manual/suexec.xml | 16 ++ docs/manual/suexec.xml.ja | 16 ++ docs/manual/suexec.xml.ko | 16 ++ docs/manual/upgrading.xml | 17 ++ docs/manual/upgrading.xml.de | 16 ++ docs/manual/upgrading.xml.ja | 19 +- docs/manual/upgrading.xml.ko | 17 ++ docs/manual/upgrading.xml.ru | 16 ++ docs/manual/urlmapping.xml | 16 ++ docs/manual/urlmapping.xml.ja | 16 ++ docs/manual/urlmapping.xml.ko | 16 ++ 85 files changed, 1888 insertions(+), 183 deletions(-) diff --git a/docs/manual/LICENSE b/docs/manual/LICENSE index a50e1419a4..d9a10c0d8e 100644 --- a/docs/manual/LICENSE +++ b/docs/manual/LICENSE @@ -1,58 +1,176 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000-2004 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS diff --git a/docs/manual/bind.xml b/docs/manual/bind.xml index 020ae696e8..bbd0d67fdf 100644 --- a/docs/manual/bind.xml +++ b/docs/manual/bind.xml @@ -2,6 +2,22 @@ + + Binding diff --git a/docs/manual/bind.xml.ja b/docs/manual/bind.xml.ja index 7434f4b8a8..1c4081a6dd 100644 --- a/docs/manual/bind.xml.ja +++ b/docs/manual/bind.xml.ja @@ -3,6 +3,22 @@ + + $B%P%$%s%I(B diff --git a/docs/manual/bind.xml.ko b/docs/manual/bind.xml.ko index 6c1f19eb07..a137f1eafd 100644 --- a/docs/manual/bind.xml.ko +++ b/docs/manual/bind.xml.ko @@ -3,6 +3,22 @@ + + ÁÖ¼Ò¿Í Æ÷Æ® ÁöÁ¤ (Binding) diff --git a/docs/manual/cgi_path.xml b/docs/manual/cgi_path.xml index e714c46e76..388368c358 100644 --- a/docs/manual/cgi_path.xml +++ b/docs/manual/cgi_path.xml @@ -2,6 +2,22 @@ + + PATH_INFO Changes in the CGI Environment diff --git a/docs/manual/cgi_path.xml.ja b/docs/manual/cgi_path.xml.ja index 48a783eeea..0fc76cee80 100644 --- a/docs/manual/cgi_path.xml.ja +++ b/docs/manual/cgi_path.xml.ja @@ -3,6 +3,22 @@ + + CGI $B4D6-$G$N(B PATH_INFO $B$NJQ99(B diff --git a/docs/manual/cgi_path.xml.ko b/docs/manual/cgi_path.xml.ko index 0811cfff5b..913e659cfa 100644 --- a/docs/manual/cgi_path.xml.ko +++ b/docs/manual/cgi_path.xml.ko @@ -3,6 +3,22 @@ + + CGI ȯ°æ¿¡¼­ PATH_INFOÀÇ º¯È­ diff --git a/docs/manual/configuring.xml b/docs/manual/configuring.xml index 3edfeecf3d..77dab810c4 100644 --- a/docs/manual/configuring.xml +++ b/docs/manual/configuring.xml @@ -1,6 +1,23 @@ + + + Configuration Files diff --git a/docs/manual/configuring.xml.ja b/docs/manual/configuring.xml.ja index e71de59533..e37d440a73 100644 --- a/docs/manual/configuring.xml.ja +++ b/docs/manual/configuring.xml.ja @@ -1,9 +1,26 @@ - + + + + $B@_Dj%U%!%$%k(B diff --git a/docs/manual/configuring.xml.ko b/docs/manual/configuring.xml.ko index 88b9178fae..5aa8acb883 100644 --- a/docs/manual/configuring.xml.ko +++ b/docs/manual/configuring.xml.ko @@ -2,6 +2,23 @@ + + + ¼³Á¤ÆÄÀÏ diff --git a/docs/manual/content-negotiation.xml b/docs/manual/content-negotiation.xml index fdced7de62..8859920ac9 100644 --- a/docs/manual/content-negotiation.xml +++ b/docs/manual/content-negotiation.xml @@ -1,6 +1,23 @@ + + + Content Negotiation diff --git a/docs/manual/content-negotiation.xml.ja b/docs/manual/content-negotiation.xml.ja index f4f2518936..2f1b6e98bf 100644 --- a/docs/manual/content-negotiation.xml.ja +++ b/docs/manual/content-negotiation.xml.ja @@ -1,9 +1,26 @@ - + + + + $B%3%s%F%s%H%M%4%7%(!<%7%g%s(B diff --git a/docs/manual/content-negotiation.xml.ko b/docs/manual/content-negotiation.xml.ko index 5758275bf3..e709819ab0 100644 --- a/docs/manual/content-negotiation.xml.ko +++ b/docs/manual/content-negotiation.xml.ko @@ -2,6 +2,23 @@ + + + ³»¿ëÇù»ó (Content Negotiation) diff --git a/docs/manual/custom-error.xml b/docs/manual/custom-error.xml index 663b40343f..692790b650 100644 --- a/docs/manual/custom-error.xml +++ b/docs/manual/custom-error.xml @@ -2,6 +2,22 @@ + + Custom Error Responses diff --git a/docs/manual/custom-error.xml.ja b/docs/manual/custom-error.xml.ja index a7133beb81..afeb37f56c 100644 --- a/docs/manual/custom-error.xml.ja +++ b/docs/manual/custom-error.xml.ja @@ -3,6 +3,22 @@ + + $B%+%9%?%`%(%i!<%l%9%]%s%9(B diff --git a/docs/manual/custom-error.xml.ko b/docs/manual/custom-error.xml.ko index 3638b3d362..89290be34a 100644 --- a/docs/manual/custom-error.xml.ko +++ b/docs/manual/custom-error.xml.ko @@ -3,6 +3,22 @@ + + »ç¿ëÀÚÁ¤ÀÇ ¿À·ù ÀÀ´ä diff --git a/docs/manual/dns-caveats.xml b/docs/manual/dns-caveats.xml index 2fdbf5feeb..8395e160ef 100644 --- a/docs/manual/dns-caveats.xml +++ b/docs/manual/dns-caveats.xml @@ -2,6 +2,22 @@ + + Issues Regarding DNS and Apache diff --git a/docs/manual/dns-caveats.xml.ja b/docs/manual/dns-caveats.xml.ja index 4b8e5279c1..f03575b25c 100644 --- a/docs/manual/dns-caveats.xml.ja +++ b/docs/manual/dns-caveats.xml.ja @@ -3,6 +3,22 @@ + + DNS $B$H(B Apache $B$K$^$D$o$kCm0U;v9`(B diff --git a/docs/manual/dns-caveats.xml.ko b/docs/manual/dns-caveats.xml.ko index 7d7444b6ef..9300e1c87b 100644 --- a/docs/manual/dns-caveats.xml.ko +++ b/docs/manual/dns-caveats.xml.ko @@ -3,6 +3,22 @@ + + DNS¿Í ¾ÆÆÄÄ¡¿Í °ü·ÃµÈ »çÇ× diff --git a/docs/manual/dso.xml b/docs/manual/dso.xml index aebb3fa0cc..6252672314 100644 --- a/docs/manual/dso.xml +++ b/docs/manual/dso.xml @@ -2,6 +2,22 @@ + + Dynamic Shared Object (DSO) Support diff --git a/docs/manual/dso.xml.ja b/docs/manual/dso.xml.ja index 2d00e7eada..6a586a2bc1 100644 --- a/docs/manual/dso.xml.ja +++ b/docs/manual/dso.xml.ja @@ -3,6 +3,22 @@ + + $BF0E*6&M-%*%V%8%'%/%H(B (DSO) $B%5%]!<%H(B diff --git a/docs/manual/dso.xml.ko b/docs/manual/dso.xml.ko index 758de33837..b40c5c2802 100644 --- a/docs/manual/dso.xml.ko +++ b/docs/manual/dso.xml.ko @@ -3,6 +3,22 @@ + + µ¿Àû°øÀ¯°´Ã¼ (DSO) Áö¿ø diff --git a/docs/manual/env.xml b/docs/manual/env.xml index cacfec8bb9..1cdd4cd542 100644 --- a/docs/manual/env.xml +++ b/docs/manual/env.xml @@ -2,6 +2,22 @@ + + Environment Variables in Apache diff --git a/docs/manual/env.xml.ja b/docs/manual/env.xml.ja index 4b45818ce8..4fe3e1b296 100644 --- a/docs/manual/env.xml.ja +++ b/docs/manual/env.xml.ja @@ -3,6 +3,22 @@ + + Apache $B$N4D6-JQ?t(B diff --git a/docs/manual/env.xml.ko b/docs/manual/env.xml.ko index 9753d1f37c..ea2255eb2c 100644 --- a/docs/manual/env.xml.ko +++ b/docs/manual/env.xml.ko @@ -3,6 +3,22 @@ + + ¾ÆÆÄÄ¡ÀÇ È¯°æº¯¼ö diff --git a/docs/manual/filter.xml b/docs/manual/filter.xml index 060d6c450c..4bc272990f 100644 --- a/docs/manual/filter.xml +++ b/docs/manual/filter.xml @@ -2,6 +2,22 @@ + + Filters diff --git a/docs/manual/filter.xml.ja b/docs/manual/filter.xml.ja index 28541dc80b..300db40e9d 100644 --- a/docs/manual/filter.xml.ja +++ b/docs/manual/filter.xml.ja @@ -3,6 +3,22 @@ + + $B%U%#%k%?(B diff --git a/docs/manual/filter.xml.ko b/docs/manual/filter.xml.ko index f8020bc45b..e8e744b63b 100644 --- a/docs/manual/filter.xml.ko +++ b/docs/manual/filter.xml.ko @@ -3,6 +3,22 @@ + + ÇÊÅÍ diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml index fae2e7c2ad..546d6492b1 100644 --- a/docs/manual/glossary.xml +++ b/docs/manual/glossary.xml @@ -2,6 +2,22 @@ + + Glossary diff --git a/docs/manual/glossary.xml.ko b/docs/manual/glossary.xml.ko index e830f70420..1ce2cf7661 100644 --- a/docs/manual/glossary.xml.ko +++ b/docs/manual/glossary.xml.ko @@ -3,6 +3,22 @@ + + ¿ë¾î diff --git a/docs/manual/handler.xml b/docs/manual/handler.xml index 3f38cb9d6c..d5ae747da1 100644 --- a/docs/manual/handler.xml +++ b/docs/manual/handler.xml @@ -2,6 +2,22 @@ + + Apache's Handler Use diff --git a/docs/manual/handler.xml.ja b/docs/manual/handler.xml.ja index e8cda94c96..100cae6034 100644 --- a/docs/manual/handler.xml.ja +++ b/docs/manual/handler.xml.ja @@ -3,6 +3,22 @@ + + Apache $B$N%O%s%I%i$N;HMQ(B diff --git a/docs/manual/handler.xml.ko b/docs/manual/handler.xml.ko index 1c2e458873..4bc3bdf7e5 100644 --- a/docs/manual/handler.xml.ko +++ b/docs/manual/handler.xml.ko @@ -3,6 +3,22 @@ + + ¾ÆÆÄÄ¡¿¡¼­ Çڵ鷯 »ç¿ë diff --git a/docs/manual/index.xml b/docs/manual/index.xml index e8644219b1..74dde9aea5 100644 --- a/docs/manual/index.xml +++ b/docs/manual/index.xml @@ -2,6 +2,22 @@ + + diff --git a/docs/manual/index.xml.de b/docs/manual/index.xml.de index e07d1c9ca7..8cd95d50b1 100644 --- a/docs/manual/index.xml.de +++ b/docs/manual/index.xml.de @@ -3,6 +3,22 @@ + + diff --git a/docs/manual/index.xml.ja b/docs/manual/index.xml.ja index ebab0b512d..a5e13e3bda 100644 --- a/docs/manual/index.xml.ja +++ b/docs/manual/index.xml.ja @@ -3,6 +3,22 @@ + + diff --git a/docs/manual/index.xml.ko b/docs/manual/index.xml.ko index ac0575c1cf..55cfb30a49 100644 --- a/docs/manual/index.xml.ko +++ b/docs/manual/index.xml.ko @@ -3,6 +3,22 @@ + + diff --git a/docs/manual/install.xml b/docs/manual/install.xml index 8d0b12a60c..969934a3d6 100644 --- a/docs/manual/install.xml +++ b/docs/manual/install.xml @@ -1,6 +1,23 @@ + + + Compiling and Installing diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de index dfaac91cca..a69e8f7f30 100644 --- a/docs/manual/install.xml.de +++ b/docs/manual/install.xml.de @@ -3,6 +3,22 @@ + + Kompilieren und Installieren diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja index 94392f624a..bee006b03e 100644 --- a/docs/manual/install.xml.ja +++ b/docs/manual/install.xml.ja @@ -1,6 +1,23 @@ + + + diff --git a/docs/manual/install.xml.ko b/docs/manual/install.xml.ko index a119998a85..eb96d0c34c 100644 --- a/docs/manual/install.xml.ko +++ b/docs/manual/install.xml.ko @@ -2,6 +2,23 @@ + + + ÄÄÆÄÀÏ°ú ¼³Ä¡ diff --git a/docs/manual/invoking.xml b/docs/manual/invoking.xml index 0a5e6fcf63..116bcf68ee 100644 --- a/docs/manual/invoking.xml +++ b/docs/manual/invoking.xml @@ -1,6 +1,23 @@ + + + Starting Apache diff --git a/docs/manual/invoking.xml.de b/docs/manual/invoking.xml.de index 47c6230c57..25923145c0 100644 --- a/docs/manual/invoking.xml.de +++ b/docs/manual/invoking.xml.de @@ -2,6 +2,23 @@ + + + Apache starten diff --git a/docs/manual/invoking.xml.ja b/docs/manual/invoking.xml.ja index f5a55fc560..b7d6e704bf 100644 --- a/docs/manual/invoking.xml.ja +++ b/docs/manual/invoking.xml.ja @@ -1,9 +1,26 @@ - + + + + Apache $B$N5/F0(B diff --git a/docs/manual/invoking.xml.ko b/docs/manual/invoking.xml.ko index 5216f4c676..3fa798e3d0 100644 --- a/docs/manual/invoking.xml.ko +++ b/docs/manual/invoking.xml.ko @@ -2,6 +2,23 @@ + + + ¾ÆÆÄÄ¡ ½ÃÀÛ diff --git a/docs/manual/license.html.en b/docs/manual/license.html.en index 6092437072..e73f956986 100644 --- a/docs/manual/license.html.en +++ b/docs/manual/license.html.en @@ -5,7 +5,7 @@ This file is generated from xml source: DO NOT EDIT XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --> -The Apache Software License, Version 1.1 - Apache HTTP Server +The Apache License, Version 2.0 - Apache HTTP Server @@ -16,68 +16,192 @@
<-

The Apache Software License, Version 1.1

+Apache > HTTP Server > Documentation > Version 2.1

The Apache License, Version 2.0

Available Languages:  en 

-

Copyright (c) 2000-2004 The Apache Software Foundation. All rights - reserved.

- -

Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met:

- -
    -
  1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer.
    2. - -
  2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution.
    3. - -
  3. The end-user documentation included with the redistribution, - if any, must include the following acknowledgment: -

    - "This product includes software developed by the - Apache Software Foundation (http://www.apache.org/)." -

    - -

    Alternately, this acknowledgment may appear in the software itself, - if and wherever such third-party acknowledgments normally appear.

    4. - -
  4. The names "Apache" and "Apache Software Foundation" must - not be used to endorse or promote products derived from this - software without prior written permission. For written - permission, please contact apache@apache.org.
    5. - -
  5. Products derived from this software may not be called "Apache", - nor may "Apache" appear in their name, without prior written - permission of the Apache Software Foundation.
    6. -
- -
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE.
- -

This software consists of voluntary contributions made by many - individuals on behalf of the Apache Software Foundation. For more - information on the Apache Software Foundation, please see - <http://www.apache.org/>.

- -

Portions of this software are based upon public domain software - originally written at the National Center for Supercomputing Applications, - University of Illinois, Urbana-Champaign.

+

Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/

+ + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

+ +
    +
  1. Definitions
    + +

    "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document.

    + +

    "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License.

    + +

    "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity.

    + +

    "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License.

    + +

    "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files.

    + +

    "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types.

    + +

    "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below).

    + +

    "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof.

    + +

    "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution."

    + +

    "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work.

    2. + +
  2. Grant of Copyright License. Subject to the terms + and conditions of this License, each Contributor hereby grants to You + a perpetual, worldwide, non-exclusive, no-charge, royalty-free, + irrevocable copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form.
    3. + +
  3. Grant of Patent License. Subject to the terms + and conditions of this License, each Contributor hereby grants to You a + perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed.
    4. + +
  4. Redistribution. You may reproduce and distribute + copies of the Work or Derivative Works thereof in any medium, with or + without modifications, and in Source or Object form, provided that You + meet the following conditions: + +
      +
    1. You must give any other recipients of the Work or + Derivative Works a copy of this License; and
      2. + +
    2. You must cause any modified files to carry prominent notices + stating that You changed the files; and
      3. + +
    3. You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and
      4. + +
    4. If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License.
      5. +
    + +

    You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License.

    5. + +
  5. Submission of Contributions. Unless You explicitly + state otherwise, any Contribution intentionally submitted for inclusion + in the Work by You to the Licensor shall be under the terms and + conditions of this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions.
    6. + +
  6. Trademarks. This License does not grant permission + to use the trade names, trademarks, service marks, or product names of + the Licensor, except as required for reasonable and customary use in + describing the origin of the Work and reproducing the content of the + NOTICE file.
    7. + +
  7. Disclaimer of Warranty. Unless required by + applicable law or agreed to in writing, Licensor provides the Work (and + each Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License.
    8. + +
  8. Limitation of Liability. In no event and under no + legal theory, whether in tort (including negligence), contract, or + otherwise, unless required by applicable law (such as deliberate and + grossly negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages.
    9. + +
  9. Accepting Warranty or Additional Liability. While + redistributing the Work or Derivative Works thereof, You may choose to + offer, and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability.
    10. +
+ +

END OF TERMS AND CONDITIONS

diff --git a/docs/manual/license.xml b/docs/manual/license.xml index c41df173b2..71183a7159 100644 --- a/docs/manual/license.xml +++ b/docs/manual/license.xml @@ -2,68 +2,209 @@ + + -The Apache Software License, Version 1.1 +The Apache License, Version 2.0 -

Copyright (c) 2000-2004 The Apache Software Foundation. All rights - reserved.

- -

Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met:

- -
    -
  1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer.
    2. - -
  2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution.
    3. - -
  3. The end-user documentation included with the redistribution, - if any, must include the following acknowledgment: - - "This product includes software developed by the - Apache Software Foundation (http://www.apache.org/)." - - -

    Alternately, this acknowledgment may appear in the software itself, - if and wherever such third-party acknowledgments normally appear.

    4. - -
  4. The names "Apache" and "Apache Software Foundation" must - not be used to endorse or promote products derived from this - software without prior written permission. For written - permission, please contact apache@apache.org.
    5. - -
  5. Products derived from this software may not be called "Apache", - nor may "Apache" appear in their name, without prior written - permission of the Apache Software Foundation.
    6. -
- - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - -

This software consists of voluntary contributions made by many - individuals on behalf of the Apache Software Foundation. For more - information on the Apache Software Foundation, please see - <http://www.apache.org/>.

- -

Portions of this software are based upon public domain software - originally written at the National Center for Supercomputing Applications, - University of Illinois, Urbana-Champaign.

+

Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/

+ + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

+ +
    +
  1. Definitions
    + +

    "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document.

    + +

    "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License.

    + +

    "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity.

    + +

    "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License.

    + +

    "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files.

    + +

    "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types.

    + +

    "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below).

    + +

    "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof.

    + +

    "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution."

    + +

    "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work.

    2. + +
  2. Grant of Copyright License. Subject to the terms + and conditions of this License, each Contributor hereby grants to You + a perpetual, worldwide, non-exclusive, no-charge, royalty-free, + irrevocable copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form.
    3. + +
  3. Grant of Patent License. Subject to the terms + and conditions of this License, each Contributor hereby grants to You a + perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed.
    4. + +
  4. Redistribution. You may reproduce and distribute + copies of the Work or Derivative Works thereof in any medium, with or + without modifications, and in Source or Object form, provided that You + meet the following conditions: + +
      +
    1. You must give any other recipients of the Work or + Derivative Works a copy of this License; and
      2. + +
    2. You must cause any modified files to carry prominent notices + stating that You changed the files; and
      3. + +
    3. You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and
      4. + +
    4. If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License.
      5. +
    + +

    You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License.

    5. + +
  5. Submission of Contributions. Unless You explicitly + state otherwise, any Contribution intentionally submitted for inclusion + in the Work by You to the Licensor shall be under the terms and + conditions of this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions.
    6. + +
  6. Trademarks. This License does not grant permission + to use the trade names, trademarks, service marks, or product names of + the Licensor, except as required for reasonable and customary use in + describing the origin of the Work and reproducing the content of the + NOTICE file.
    7. + +
  7. Disclaimer of Warranty. Unless required by + applicable law or agreed to in writing, Licensor provides the Work (and + each Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License.
    8. + +
  8. Limitation of Liability. In no event and under no + legal theory, whether in tort (including negligence), contract, or + otherwise, unless required by applicable law (such as deliberate and + grossly negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages.
    9. + +
  9. Accepting Warranty or Additional Liability. While + redistributing the Work or Derivative Works thereof, You may choose to + offer, and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability.
    10. +
+ +

END OF TERMS AND CONDITIONS

 diff --git a/docs/manual/logs.xml b/docs/manual/logs.xml index 5502743a9f..33dfb32e71 100644 --- a/docs/manual/logs.xml +++ b/docs/manual/logs.xml @@ -2,6 +2,22 @@ + + Log Files diff --git a/docs/manual/logs.xml.ja b/docs/manual/logs.xml.ja index 59289f4d12..3ab7b753d6 100644 --- a/docs/manual/logs.xml.ja +++ b/docs/manual/logs.xml.ja @@ -3,6 +3,22 @@ + + $B%m%0%U%!%$%k(B diff --git a/docs/manual/logs.xml.ko b/docs/manual/logs.xml.ko index 6ff363d4ff..01e61dac6a 100644 --- a/docs/manual/logs.xml.ko +++ b/docs/manual/logs.xml.ko @@ -3,6 +3,22 @@ + + ·Î±×ÆÄÀÏ diff --git a/docs/manual/mpm.xml b/docs/manual/mpm.xml index 9d77ff7f4c..9fc55813d8 100644 --- a/docs/manual/mpm.xml +++ b/docs/manual/mpm.xml @@ -1,6 +1,23 @@ + + + Multi-Processing Modules (MPMs) diff --git a/docs/manual/mpm.xml.ja b/docs/manual/mpm.xml.ja index 2d0cf97aa4..757e17cf3a 100644 --- a/docs/manual/mpm.xml.ja +++ b/docs/manual/mpm.xml.ja @@ -1,9 +1,26 @@ - + + + + $B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM) diff --git a/docs/manual/mpm.xml.ko b/docs/manual/mpm.xml.ko index 3d03eff512..8dc58edd95 100644 --- a/docs/manual/mpm.xml.ko +++ b/docs/manual/mpm.xml.ko @@ -2,6 +2,23 @@ + + + ´ÙÁßó¸® ¸ðµâ (MPM) diff --git a/docs/manual/new_features_2_0.xml b/docs/manual/new_features_2_0.xml index 0a8a6cf379..9792bf6d9b 100644 --- a/docs/manual/new_features_2_0.xml +++ b/docs/manual/new_features_2_0.xml @@ -1,6 +1,23 @@ + + + Overview of new features in Apache 2.0 diff --git a/docs/manual/new_features_2_0.xml.de b/docs/manual/new_features_2_0.xml.de index 10cef81f51..99675495f8 100644 --- a/docs/manual/new_features_2_0.xml.de +++ b/docs/manual/new_features_2_0.xml.de @@ -3,6 +3,22 @@ + + Übersicht der neuen Funktionen in Apache 2.0 diff --git a/docs/manual/new_features_2_0.xml.ja b/docs/manual/new_features_2_0.xml.ja index e44f60d780..a68d26644e 100644 --- a/docs/manual/new_features_2_0.xml.ja +++ b/docs/manual/new_features_2_0.xml.ja @@ -1,9 +1,26 @@ - + + + + Apache 2.0 $B$N?75!G=$N35MW(B diff --git a/docs/manual/new_features_2_0.xml.ko b/docs/manual/new_features_2_0.xml.ko index 00a27d3e1a..279d64a067 100644 --- a/docs/manual/new_features_2_0.xml.ko +++ b/docs/manual/new_features_2_0.xml.ko @@ -2,6 +2,23 @@ + + + Apache 2.0ÀÇ »õ·Î¿î ±â´É °³¿ä diff --git a/docs/manual/new_features_2_0.xml.ru b/docs/manual/new_features_2_0.xml.ru index 1279f53470..0dbafa578b 100644 --- a/docs/manual/new_features_2_0.xml.ru +++ b/docs/manual/new_features_2_0.xml.ru @@ -1,6 +1,22 @@ + + diff --git a/docs/manual/sections.xml b/docs/manual/sections.xml index 78c46a74c3..93047491c8 100644 --- a/docs/manual/sections.xml +++ b/docs/manual/sections.xml @@ -2,6 +2,22 @@ + + Configuration Sections diff --git a/docs/manual/sections.xml.ja b/docs/manual/sections.xml.ja index b25b7baadd..cd6917f789 100644 --- a/docs/manual/sections.xml.ja +++ b/docs/manual/sections.xml.ja @@ -3,6 +3,22 @@ + + $B%;%/%7%g%s$N@_Dj(B diff --git a/docs/manual/sections.xml.ko b/docs/manual/sections.xml.ko index 2c5fce1f59..ab6b14b2d9 100644 --- a/docs/manual/sections.xml.ko +++ b/docs/manual/sections.xml.ko @@ -3,6 +3,22 @@ + + ¼½¼Ç ¼³Á¤ diff --git a/docs/manual/server-wide.xml b/docs/manual/server-wide.xml index 61b3dd8869..ae0b21e520 100644 --- a/docs/manual/server-wide.xml +++ b/docs/manual/server-wide.xml @@ -1,6 +1,23 @@ + + + Server-Wide Configuration diff --git a/docs/manual/server-wide.xml.ja b/docs/manual/server-wide.xml.ja index 69294b4e5b..d7ed979a7e 100644 --- a/docs/manual/server-wide.xml.ja +++ b/docs/manual/server-wide.xml.ja @@ -1,9 +1,26 @@ - + + + + $B%5!<%PA4BN$N@_Dj(B diff --git a/docs/manual/server-wide.xml.ko b/docs/manual/server-wide.xml.ko index a97dddea13..a7d5350162 100644 --- a/docs/manual/server-wide.xml.ko +++ b/docs/manual/server-wide.xml.ko @@ -2,6 +2,23 @@ + + + ¼­¹ö Àü¿ª ¼³Á¤ diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml index ac22550c97..7c8b8519f7 100644 --- a/docs/manual/sitemap.xml +++ b/docs/manual/sitemap.xml @@ -4,6 +4,22 @@ > + + Sitemap diff --git a/docs/manual/sitemap.xml.de b/docs/manual/sitemap.xml.de index fc0c293f96..d6c2754d7e 100644 --- a/docs/manual/sitemap.xml.de +++ b/docs/manual/sitemap.xml.de @@ -5,6 +5,22 @@ + + Seitenindex diff --git a/docs/manual/sitemap.xml.ja b/docs/manual/sitemap.xml.ja index cc25518545..82d57b718f 100644 --- a/docs/manual/sitemap.xml.ja +++ b/docs/manual/sitemap.xml.ja @@ -5,6 +5,22 @@ > + + Site Map diff --git a/docs/manual/sitemap.xml.ko b/docs/manual/sitemap.xml.ko index 51999b6ff1..05c73b126c 100644 --- a/docs/manual/sitemap.xml.ko +++ b/docs/manual/sitemap.xml.ko @@ -5,6 +5,22 @@ + + »çÀÌÆ®¸Ê diff --git a/docs/manual/stopping.xml b/docs/manual/stopping.xml index c8f14e45a8..deb91b0a0c 100644 --- a/docs/manual/stopping.xml +++ b/docs/manual/stopping.xml @@ -1,6 +1,23 @@ + + + Stopping and Restarting diff --git a/docs/manual/stopping.xml.de b/docs/manual/stopping.xml.de index e5eb80a0a8..9e4928a0f4 100644 --- a/docs/manual/stopping.xml.de +++ b/docs/manual/stopping.xml.de @@ -2,6 +2,23 @@ + + + Beenden und Neustarten diff --git a/docs/manual/stopping.xml.ja b/docs/manual/stopping.xml.ja index 246396683a..1fa88e1492 100644 --- a/docs/manual/stopping.xml.ja +++ b/docs/manual/stopping.xml.ja @@ -2,6 +2,23 @@ + + + $BDd;_$H:F5/F0(B diff --git a/docs/manual/stopping.xml.ko b/docs/manual/stopping.xml.ko index 9e52e48500..c05a989ac9 100644 --- a/docs/manual/stopping.xml.ko +++ b/docs/manual/stopping.xml.ko @@ -2,6 +2,23 @@ + + + Áß´Ü°ú Àç½ÃÀÛ diff --git a/docs/manual/style/css/manual.css b/docs/manual/style/css/manual.css index 00c803beee..a99225199d 100644 --- a/docs/manual/style/css/manual.css +++ b/docs/manual/style/css/manual.css @@ -534,6 +534,10 @@ ol.up-A { list-style-type: upper-alpha; } +ol.lo-A { + list-style-type: lower-alpha; +} + dd.separate { margin-bottom: 2em; } @@ -919,6 +923,10 @@ p.letters { margin: 1em 0 0 0; } +p.centered { + text-align: center; +} + .letters { text-align: center; background-color: inherit; diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl index 1ca8cb8890..e01af884af 100644 --- a/docs/manual/style/xsl/common.xsl +++ b/docs/manual/style/xsl/common.xsl @@ -779,9 +779,14 @@
    - + + up-A - + + + lo-A + +
diff --git a/docs/manual/suexec.xml b/docs/manual/suexec.xml index 653f2fa67f..91c41186d7 100644 --- a/docs/manual/suexec.xml +++ b/docs/manual/suexec.xml @@ -2,6 +2,22 @@ + + suEXEC Support diff --git a/docs/manual/suexec.xml.ja b/docs/manual/suexec.xml.ja index 2e6168fe8b..c2787848bf 100644 --- a/docs/manual/suexec.xml.ja +++ b/docs/manual/suexec.xml.ja @@ -3,6 +3,22 @@ + + suEXEC $B%5%]!<%H(B diff --git a/docs/manual/suexec.xml.ko b/docs/manual/suexec.xml.ko index 631b1a6826..8d0aad33e9 100644 --- a/docs/manual/suexec.xml.ko +++ b/docs/manual/suexec.xml.ko @@ -3,6 +3,22 @@ + + suEXEC Áö¿ø diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml index aa4bfdf55d..9cb03374dd 100644 --- a/docs/manual/upgrading.xml +++ b/docs/manual/upgrading.xml @@ -1,6 +1,23 @@ + + + Upgrading to 2.0 from 1.3 diff --git a/docs/manual/upgrading.xml.de b/docs/manual/upgrading.xml.de index 4f5033eaed..09c36fb827 100644 --- a/docs/manual/upgrading.xml.de +++ b/docs/manual/upgrading.xml.de @@ -3,6 +3,22 @@ + + Upgrade von 1.3 auf 2.0 diff --git a/docs/manual/upgrading.xml.ja b/docs/manual/upgrading.xml.ja index a22534789e..dc68fe3f6e 100644 --- a/docs/manual/upgrading.xml.ja +++ b/docs/manual/upgrading.xml.ja @@ -1,9 +1,26 @@ - + + + + 1.3 $B$+$i(B 2.0 $B$X$N%"%C%W%0%l!<%I(B diff --git a/docs/manual/upgrading.xml.ko b/docs/manual/upgrading.xml.ko index 202217d624..2bd1727bd9 100644 --- a/docs/manual/upgrading.xml.ko +++ b/docs/manual/upgrading.xml.ko @@ -2,6 +2,23 @@ + + + 1.3¿¡¼­ 2.0À¸·Î ¾÷±×·¹À̵å diff --git a/docs/manual/upgrading.xml.ru b/docs/manual/upgrading.xml.ru index 1df0b16a71..fa7a30c2ba 100644 --- a/docs/manual/upgrading.xml.ru +++ b/docs/manual/upgrading.xml.ru @@ -1,6 +1,22 @@ + + diff --git a/docs/manual/urlmapping.xml b/docs/manual/urlmapping.xml index 986a2fb3b6..15cd4ae782 100644 --- a/docs/manual/urlmapping.xml +++ b/docs/manual/urlmapping.xml @@ -2,6 +2,22 @@ + + Mapping URLs to Filesystem Locations diff --git a/docs/manual/urlmapping.xml.ja b/docs/manual/urlmapping.xml.ja index 3e475f9c83..00eea41ed5 100644 --- a/docs/manual/urlmapping.xml.ja +++ b/docs/manual/urlmapping.xml.ja @@ -3,6 +3,22 @@ + + URL $B$+$i%U%!%$%k%7%9%F%`>e$N0LCV$X$N%^%C%W(B diff --git a/docs/manual/urlmapping.xml.ko b/docs/manual/urlmapping.xml.ko index 4b2110196e..1f8689cb4c 100644 --- a/docs/manual/urlmapping.xml.ko +++ b/docs/manual/urlmapping.xml.ko @@ -3,6 +3,22 @@ + + URLÀ» ÆÄÀϽýºÅÛ À§Ä¡·Î ´ëÀÀÇϱâ -- 2.50.1