From 46f309ed68a35f70d36f8297fad17fee149dba76 Mon Sep 17 00:00:00 2001 From: Daniel Gruno Date: Sat, 21 Apr 2012 06:15:04 +0000 Subject: [PATCH] xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1328590 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/custom-error.html.en | 4 +- docs/manual/custom-error.xml.es | 2 +- docs/manual/custom-error.xml.fr | 2 +- docs/manual/custom-error.xml.ja | 2 +- docs/manual/custom-error.xml.ko | 2 +- docs/manual/custom-error.xml.meta | 4 +- docs/manual/custom-error.xml.tr | 2 +- docs/manual/getting-started.html.en | 436 ++++++++++++++-------------- docs/manual/install.html.en | 2 +- docs/manual/install.xml.de | 2 +- docs/manual/install.xml.es | 2 +- docs/manual/install.xml.fr | 2 +- docs/manual/install.xml.ja | 2 +- docs/manual/install.xml.ko | 2 +- docs/manual/install.xml.meta | 4 +- docs/manual/install.xml.tr | 2 +- docs/manual/ssl/ssl_faq.html.en | 4 +- docs/manual/ssl/ssl_faq.xml.fr | 2 +- docs/manual/ssl/ssl_faq.xml.meta | 2 +- docs/manual/ssl/ssl_howto.html.en | 2 +- docs/manual/ssl/ssl_howto.xml.fr | 2 +- docs/manual/ssl/ssl_intro.html.en | 2 +- docs/manual/ssl/ssl_intro.xml.fr | 2 +- docs/manual/ssl/ssl_intro.xml.ja | 2 +- docs/manual/suexec.html.en | 2 +- docs/manual/suexec.xml.fr | 2 +- docs/manual/suexec.xml.ja | 2 +- docs/manual/suexec.xml.ko | 2 +- docs/manual/suexec.xml.meta | 4 +- docs/manual/suexec.xml.tr | 2 +- 30 files changed, 252 insertions(+), 252 deletions(-) diff --git a/docs/manual/custom-error.html.en b/docs/manual/custom-error.html.en index f6ace8b257..a1b63e2936 100644 --- a/docs/manual/custom-error.html.en +++ b/docs/manual/custom-error.html.en @@ -102,7 +102,7 @@ 'REDIRECT_' onto the original header name. This provides the error document the context of the original request.

-

For example, you might recieve, in addition to more usual +

For example, you might receive, in addition to more usual environment variables, the following.

@@ -141,7 +141,7 @@

If you point your ErrorDocument to some variety of dynamic handler such as a server-side include document, CGI script, or some variety of other handler, you may wish to use the - available custom environent variables to customize this + available custom environment variables to customize this response.

If the ErrorDocument specifies a local redirect to a CGI diff --git a/docs/manual/custom-error.xml.es b/docs/manual/custom-error.xml.es index 927572133f..4accfe7d59 100644 --- a/docs/manual/custom-error.xml.es +++ b/docs/manual/custom-error.xml.es @@ -1,7 +1,7 @@ - + + diff --git a/docs/manual/custom-error.xml.ja b/docs/manual/custom-error.xml.ja index d72e8843cb..cd28ce8eb6 100644 --- a/docs/manual/custom-error.xml.ja +++ b/docs/manual/custom-error.xml.ja @@ -1,7 +1,7 @@ - + + + -Getting Started - Apache HTTP Server - - - - -

-

Modules | Directives | FAQ | Glossary | Sitemap

-

Apache HTTP Server Version 2.5

-
-
<-
-

Getting Started

-
-

Available Languages:  en 

-
- -

If you're completely new to the Apache HTTP Server, or even to running -a website at all, you might not know where to start, or what questions to -ask. This document walks you through the basics.

-
- -
top
-
-

Clients, Servers, and URLs

- - -

-Addresses on the Web are expressed with URLs - Uniform Resource Locators -- which specify a protocol (e.g. http), a servername (e.g. -www.apache.org), a URL-path (e.g. -/docs/current/getting-started.html), and possibly a query -string (e.g. ?arg=value) used to pass additional -arguments to the server. -

- -

A client (e.g., a web browser) connects to a server (e.g., your Apache HTTP Server), -with the specified protocol, and makes a request for a resource using the -URL-path.

- -

The URL-path may represent any number of things on the server. It may -be a file (like getting-started.html) a handler (like server-status) or some kind of program -file (like index.php). We'll discuss this more below in -the Web Site Content section.

- -

-The server will send a response consisting of a status -code and, optionally, a response body. -The status code indicates whether the request was successful, and, if not, what -kind of error condition there was. This tells the client what it should -do with the response. You can read about the possible response codes in -HTTP Server -wiki.

- -

Details of the transaction, and any error conditions, are written to -log files. This is discussed in greater detail below in the Logs Files and Troubleshooting section.

- -
top
-
-

Hostnames and DNS

- - -

In order to connect to a server, the client will first have to resolve -the servername to an IP address - the location on the Internet where the -server resides. Thus, in order for your web server to be reachable, it -is necessary that the servername be in DNS.

- -

More than one hostname may point to the same IP address, and more -than one IP address can be attached to the same physical server. Thus, you -can run more than one web site on the same physical server, using a -feature called virtual hosts.

- -

If you don't know how to do this, you'll need to contact your network -administrator, or Internet service provider, to perform this step for -you.

- -

If you are testing a server that is not Internet-accessible, you -can put host names in your hosts file in order to do local resolution. -For example, you might want to put a record in your hosts file to map a -request for www.example.com to your local system, for -testing purposes. This entry would look like:

- -

-127.0.0.1 www.example.com -

- -

A hosts file will probably be located at /etc/hosts or -C:\Windows\system32\drivers\etc\hosts.

- -

You can read more about the hosts file at Wikipedia.org/wiki/Hosts_(file), and -more about DNS at Wikipedia.org/wiki/Domain_Name_System.

-
top
-
-

Configuration Files and Directives

- - -

The Apache HTTP Server is configured via simple text files. -These files may be located any of a variety of places, depending on how -exactly you installed the server. Common locations for these files may -be found in -the httpd wiki. If you installed httpd from source, the default -location of the configuration files is -/usr/local/apache2/conf. The default configuration file is -usually called httpd.conf. This, too, can vary in -third-party distributions of the server.

- -

The configuration is frequently broken into multiple smaller files, -for ease of management. These files are loaded via the Include directive. The names or locations of -these sub-files are not magical, and may vary greatly from one -installation to another. Arrange and subdivide these files as -makes the most sense to you. If the file arrangement -you have by default doesn't make sense to you, feel free to rerrange it.

- -

The server is configured by placing configuration directives in these -configuration files. A directive is a keyword followed by one or more -arguments that set its value.

- -

The question of "Where should I put that -directive?" is generally answered by considering where you want a -directive to be effective. If it is a global setting, it should appear -in the configuration file, outside of any <Directory>, <Location>, <VirtualHost>, or other section. If it is to -apply only to a particular directory, then it should go inside a -<Directory> section referring to -that directory, and so on. See the Configuration -Sections document for further discussion of these sections.

- -

In addition to the main configuration files, certain directives may go in -.htaccess files located in the content directories. -.htaccess files are primarily for people who do not have -access to the main server configuration file(s). You can read more about -.htaccess files in the .htaccess howto.

- -
top
-
-

Web Site Content

- - -

Web site content can take many different forms, but may be broadly -divided into static and dynamic content.

- -

Static content is things like HTML files, image files, CSS files, -and other files that reside in the filesystem. The DocumentRoot directive specifies where in your -filesystem you should place these files. This directive is either set -globally, or per virual host. Look in your configuration file(s) to -determine how this is set for your server.

- -

Typically, a document called index.html will be served -when a directory is requested without a file name being specified. For -example, if DocumentRoot is set to -/var/www/html and a request is made for -http://www.example.com/work/, the file -/var/www/html/work/index.html will be served to the -client.

- -

Dynamic content is anything that is generated at request -time, and may change from one request to another. There are numerous -ways that dynamic content may be generated. Various handlers are available to generate content. CGI programs may be written to generate -content for your site.

- -

Third-party modules like mod_php may be used to write code that does a -variety of things. Many third-party applications, written using a -variety of languages and tools, are available for download and -installation on your Apache HTTP Server. Support of these third-party -things is beyond the scope of this documentation, and you should find -their documentation or other support forums to answer your questions -about them.

-
top
-
-

Log Files and Troubleshooting

- -

As an Apache HTTP Server administrator, your most valuable assets are -the log files, and, in particular, the error log. Troubleshooting any -problem without the error log is like driving with your eyes closed.

- -

The location of the error log is defined by the ErrorLog directive, which may be set globally, -or per virtual host. Entries in the error log tell you what went wrong, -and when. They often also tell you how to fix it. Each error log message -contains a error code, which you can search for online for even more -detailed descriptions of how to address the problem. You can also -configure your error log to contain a log ID which you can then -correlate to an access log entry, so that you can determine what request -caused the error condition.

- -

You can read more about logging in the logs -documentation.

-
top
-
-

What Else Do I Need To Know?

- -

This document covers only the bare basics. We hope that this gets you -started, but there are many other things that you might need to know. -Here's a partial list of what you might be looking for:

- - - -
-
-

Available Languages:  en 

-
+ + + +Getting Started - Apache HTTP Server + + + + +
+

Modules | Directives | FAQ | Glossary | Sitemap

+

Apache HTTP Server Version 2.5

+
+
<-
+

Getting Started

+
+

Available Languages:  en 

+
+ +

If you're completely new to the Apache HTTP Server, or even to running +a website at all, you might not know where to start, or what questions to +ask. This document walks you through the basics.

+
+ +
top
+
+

Clients, Servers, and URLs

+ + +

+Addresses on the Web are expressed with URLs - Uniform Resource Locators +- which specify a protocol (e.g. http), a servername (e.g. +www.apache.org), a URL-path (e.g. +/docs/current/getting-started.html), and possibly a query +string (e.g. ?arg=value) used to pass additional +arguments to the server. +

+ +

A client (e.g., a web browser) connects to a server (e.g., your Apache HTTP Server), +with the specified protocol, and makes a request for a resource using the +URL-path.

+ +

The URL-path may represent any number of things on the server. It may +be a file (like getting-started.html) a handler (like server-status) or some kind of program +file (like index.php). We'll discuss this more below in +the Web Site Content section.

+ +

+The server will send a response consisting of a status +code and, optionally, a response body. +The status code indicates whether the request was successful, and, if not, what +kind of error condition there was. This tells the client what it should +do with the response. You can read about the possible response codes in +HTTP Server +wiki.

+ +

Details of the transaction, and any error conditions, are written to +log files. This is discussed in greater detail below in the Logs Files and Troubleshooting section.

+ +
top
+
+

Hostnames and DNS

+ + +

In order to connect to a server, the client will first have to resolve +the servername to an IP address - the location on the Internet where the +server resides. Thus, in order for your web server to be reachable, it +is necessary that the servername be in DNS.

+ +

More than one hostname may point to the same IP address, and more +than one IP address can be attached to the same physical server. Thus, you +can run more than one web site on the same physical server, using a +feature called virtual hosts.

+ +

If you don't know how to do this, you'll need to contact your network +administrator, or Internet service provider, to perform this step for +you.

+ +

If you are testing a server that is not Internet-accessible, you +can put host names in your hosts file in order to do local resolution. +For example, you might want to put a record in your hosts file to map a +request for www.example.com to your local system, for +testing purposes. This entry would look like:

+ +

+127.0.0.1 www.example.com +

+ +

A hosts file will probably be located at /etc/hosts or +C:\Windows\system32\drivers\etc\hosts.

+ +

You can read more about the hosts file at Wikipedia.org/wiki/Hosts_(file), and +more about DNS at Wikipedia.org/wiki/Domain_Name_System.

+
top
+
+

Configuration Files and Directives

+ + +

The Apache HTTP Server is configured via simple text files. +These files may be located any of a variety of places, depending on how +exactly you installed the server. Common locations for these files may +be found in +the httpd wiki. If you installed httpd from source, the default +location of the configuration files is +/usr/local/apache2/conf. The default configuration file is +usually called httpd.conf. This, too, can vary in +third-party distributions of the server.

+ +

The configuration is frequently broken into multiple smaller files, +for ease of management. These files are loaded via the Include directive. The names or locations of +these sub-files are not magical, and may vary greatly from one +installation to another. Arrange and subdivide these files as +makes the most sense to you. If the file arrangement +you have by default doesn't make sense to you, feel free to rerrange it.

+ +

The server is configured by placing configuration directives in these +configuration files. A directive is a keyword followed by one or more +arguments that set its value.

+ +

The question of "Where should I put that +directive?" is generally answered by considering where you want a +directive to be effective. If it is a global setting, it should appear +in the configuration file, outside of any <Directory>, <Location>, <VirtualHost>, or other section. If it is to +apply only to a particular directory, then it should go inside a +<Directory> section referring to +that directory, and so on. See the Configuration +Sections document for further discussion of these sections.

+ +

In addition to the main configuration files, certain directives may go in +.htaccess files located in the content directories. +.htaccess files are primarily for people who do not have +access to the main server configuration file(s). You can read more about +.htaccess files in the .htaccess howto.

+ +
top
+
+

Web Site Content

+ + +

Web site content can take many different forms, but may be broadly +divided into static and dynamic content.

+ +

Static content is things like HTML files, image files, CSS files, +and other files that reside in the filesystem. The DocumentRoot directive specifies where in your +filesystem you should place these files. This directive is either set +globally, or per virual host. Look in your configuration file(s) to +determine how this is set for your server.

+ +

Typically, a document called index.html will be served +when a directory is requested without a file name being specified. For +example, if DocumentRoot is set to +/var/www/html and a request is made for +http://www.example.com/work/, the file +/var/www/html/work/index.html will be served to the +client.

+ +

Dynamic content is anything that is generated at request +time, and may change from one request to another. There are numerous +ways that dynamic content may be generated. Various handlers are available to generate content. CGI programs may be written to generate +content for your site.

+ +

Third-party modules like mod_php may be used to write code that does a +variety of things. Many third-party applications, written using a +variety of languages and tools, are available for download and +installation on your Apache HTTP Server. Support of these third-party +things is beyond the scope of this documentation, and you should find +their documentation or other support forums to answer your questions +about them.

+
top
+
+

Log Files and Troubleshooting

+ +

As an Apache HTTP Server administrator, your most valuable assets are +the log files, and, in particular, the error log. Troubleshooting any +problem without the error log is like driving with your eyes closed.

+ +

The location of the error log is defined by the ErrorLog directive, which may be set globally, +or per virtual host. Entries in the error log tell you what went wrong, +and when. They often also tell you how to fix it. Each error log message +contains a error code, which you can search for online for even more +detailed descriptions of how to address the problem. You can also +configure your error log to contain a log ID which you can then +correlate to an access log entry, so that you can determine what request +caused the error condition.

+ +

You can read more about logging in the logs +documentation.

+
top
+
+

What Else Do I Need To Know?

+ +

This document covers only the bare basics. We hope that this gets you +started, but there are many other things that you might need to know. +Here's a partial list of what you might be looking for:

+ + + +
+
+

Available Languages:  en 

+
\ No newline at end of file diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en index 822e8caf4f..f5a87802d4 100644 --- a/docs/manual/install.html.en +++ b/docs/manual/install.html.en @@ -362,7 +362,7 @@ $ tar xvf httpd-NN.tar major releases (for example, from 2.0 to 2.2 or from 2.2 to 2.3), there will likely be major differences in the compile-time and run-time configuration that will require manual adjustments. All - modules will also need to be upgraded to accomodate changes in the + modules will also need to be upgraded to accommodate changes in the module API.

Upgrading from one minor version to the next (for example, from diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de index 7fdc54cf6d..68cde19148 100644 --- a/docs/manual/install.xml.de +++ b/docs/manual/install.xml.de @@ -1,7 +1,7 @@ - + + - + + + + + diff --git a/docs/manual/ssl/ssl_faq.xml.meta b/docs/manual/ssl/ssl_faq.xml.meta index 61db826966..a5d5a97804 100644 --- a/docs/manual/ssl/ssl_faq.xml.meta +++ b/docs/manual/ssl/ssl_faq.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/ssl/ssl_howto.html.en b/docs/manual/ssl/ssl_howto.html.en index b4f02b8d77..507125abe4 100644 --- a/docs/manual/ssl/ssl_howto.html.en +++ b/docs/manual/ssl/ssl_howto.html.en @@ -38,7 +38,7 @@ before progressing to the advanced techniques.

Basic Configuration Example

-

Your SSL configuration will need to contain, at a minumum, the +

Your SSL configuration will need to contain, at minimum, the following directives.

diff --git a/docs/manual/ssl/ssl_howto.xml.fr b/docs/manual/ssl/ssl_howto.xml.fr index c784fecf5f..12cc992dd4 100644 --- a/docs/manual/ssl/ssl_howto.xml.fr +++ b/docs/manual/ssl/ssl_howto.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/ssl/ssl_intro.html.en b/docs/manual/ssl/ssl_intro.html.en index f200347201..644127b8ea 100644 --- a/docs/manual/ssl/ssl_intro.html.en +++ b/docs/manual/ssl/ssl_intro.html.en @@ -437,7 +437,7 @@ the Internet Engineering Task Force (IETF).

to start a session. To do this, the server assigns each SSL session a unique session identifier which is cached in the server and which the client can use in future connections to reduce the handshake time - (until the session identifer expires from the cache of the server).

+ (until the session identifier expires from the cache of the server).

diff --git a/docs/manual/ssl/ssl_intro.xml.fr b/docs/manual/ssl/ssl_intro.xml.fr index 65e8f7abdd..f9186ac47c 100644 --- a/docs/manual/ssl/ssl_intro.xml.fr +++ b/docs/manual/ssl/ssl_intro.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/ssl/ssl_intro.xml.ja b/docs/manual/ssl/ssl_intro.xml.ja index bffeb03f5f..99bbfc8e65 100644 --- a/docs/manual/ssl/ssl_intro.xml.ja +++ b/docs/manual/ssl/ssl_intro.xml.ja @@ -1,7 +1,7 @@ - + - + + + +