# HG changeset patch # User Ruslan Ermilov # Date 1344660925 0 # Node ID af3f38e349eb3c6e748802f0c89599e4485e52dd # Parent 4b5163be537fad78765e454242f483f20dea5a49 Removed terminal whitespace and fixed apostrophes used. diff -r 4b5163be537f -r af3f38e349eb xml/en/docs/control.xml --- a/xml/en/docs/control.xml Fri Aug 10 11:50:59 2012 +0000 +++ b/xml/en/docs/control.xml Sat Aug 11 04:55:25 2012 +0000 @@ -78,7 +78,7 @@ -Let's illustrate this by example. +Let’s illustrate this by example. Imagine that nginx is run on FreeBSD 4.x and the command ps ax -o pid,ppid,user,%cpu,vsz,wchan,command | egrep '(nginx|PID)' diff -r 4b5163be537f -r af3f38e349eb xml/en/docs/faq/accept_failed.xml --- a/xml/en/docs/faq/accept_failed.xml Fri Aug 10 11:50:59 2012 +0000 +++ b/xml/en/docs/faq/accept_failed.xml Sat Aug 11 04:55:25 2012 +0000 @@ -28,10 +28,10 @@ A: Such errors stem from the connections that the clients managed to close before nginx was able to process them. For instance, this can -happen in a situation when the user didn't wait for a page +happen in a situation when the user didn’t wait for a page heavily populated with images to load fully, and clicked on a -different link. In this case user's browser would close all of -the prior connections which aren't longer necessary. +different link. In this case user’s browser would close all of +the prior connections which aren’t longer necessary. It is a non-critical error. diff -r 4b5163be537f -r af3f38e349eb xml/en/docs/faq/chunked_encoding_from_backend.xml --- a/xml/en/docs/faq/chunked_encoding_from_backend.xml Fri Aug 10 11:50:59 2012 +0000 +++ b/xml/en/docs/faq/chunked_encoding_from_backend.xml Sat Aug 11 04:55:25 2012 +0000 @@ -4,7 +4,7 @@ -
Q: My backend server appears to send HTTP/1.0 responses using -chunked encoding but nginx doesn't handle it correctly. -For instance, I'm using nginx as a frontend to my node.js +chunked encoding but nginx doesn’t handle it correctly. +For instance, I’m using nginx as a frontend to my node.js application and instead of pure JSON from backend, nginx returns something framed in decimal numbers like @@ -38,7 +38,7 @@ RFC 2616, "3.6 Transfer Codings"). The "chunked" transfer-codings must not be used with HTTP/1.0. -You'd need to either fix your backend application or upgrade +You’d need to either fix your backend application or upgrade to nginx version 1.1.4 and newer, where an additional code was introduced to handle such erratic backend behavior. diff -r 4b5163be537f -r af3f38e349eb xml/en/docs/faq/daemon_master_process_off.xml --- a/xml/en/docs/faq/daemon_master_process_off.xml Fri Aug 10 11:50:59 2012 +0000 +++ b/xml/en/docs/faq/daemon_master_process_off.xml Sat Aug 11 04:55:25 2012 +0000 @@ -30,7 +30,7 @@ -While many people use "daemon off" in production it wasn't really meant for +While many people use "daemon off" in production it wasn’t really meant for that. Since version 1.0.9 it is now quite safe to run nginx in production with "daemon off", though. Bear in mind that non-stop upgrade is not an option with "daemon off". diff -r 4b5163be537f -r af3f38e349eb xml/en/docs/faq/license_copyright.xml --- a/xml/en/docs/faq/license_copyright.xml Fri Aug 10 11:50:59 2012 +0000 +++ b/xml/en/docs/faq/license_copyright.xml Sat Aug 11 04:55:25 2012 +0000 @@ -15,7 +15,7 @@ Q: -I'd like to use nginx distribution as part of my proprietary +I’d like to use nginx distribution as part of my proprietary software package. How can nginx copyright be acknowledged when using nginx as part of a proprietary software distribution? @@ -38,7 +38,7 @@ Also, if your build of nginx includes any of the following 3rd party -products: zlib, PCRE, OpenSSL — it's worth including their +products: zlib, PCRE, OpenSSL — it’s worth including their copyright acknowledgements and disclaimers as well. diff -r 4b5163be537f -r af3f38e349eb xml/en/docs/hash.xml --- a/xml/en/docs/hash.xml Fri Aug 10 11:50:59 2012 +0000 +++ b/xml/en/docs/hash.xml Sat Aug 11 04:55:25 2012 +0000 @@ -14,7 +14,7 @@ To quickly process static sets of data such as server names, - directive's values, + directive’s values, MIME types, names of request header strings, nginx uses hash tables. During the start and each re-configuration nginx selects the @@ -32,10 +32,10 @@ The hash bucket size parameter is aligned to the size that is a -multiple of the processor's cache line size. This speeds up +multiple of the processor’s cache line size. This speeds up key search in a hash on modern processors by reducing the number of memory accesses. -If hash bucket size is equal to one processor's cache line size +If hash bucket size is equal to one processor’s cache line size then the number of memory accesses during the key search will be two in the worst case—first to compute the bucket address, and second during the key search inside the bucket. diff -r 4b5163be537f -r af3f38e349eb xml/en/docs/http/ngx_http_core_module.xml --- a/xml/en/docs/http/ngx_http_core_module.xml Fri Aug 10 11:50:59 2012 +0000 +++ b/xml/en/docs/http/ngx_http_core_module.xml Sat Aug 11 04:55:25 2012 +0000 @@ -125,7 +125,7 @@ can only be used for reading blocks that are aligned on 512-byte boundaries (or 4K for XFS). -Reading of unaligned file's end is still made in blocking mode. +Reading of unaligned file’s end is still made in blocking mode. The same holds true for byte range requests, and for FLV requests not from the beginning of a file: reading of unaligned data at the beginning and end of a file will be blocking. @@ -176,7 +176,7 @@ -When location matches the last part of the directive's value: +When location matches the last part of the directive’s value: location /images/ { alias /data/w3/images/; @@ -1167,7 +1167,7 @@ setfib=number -this parameter (0.8.44) sets an associated routing table, FIB +this parameter (0.8.44) sets an associated routing table, FIB (the SO_SETFIB option) for the listening socket. This currently works only on FreeBSD. @@ -1397,7 +1397,7 @@ -Let's illustrate the above by example: +Let’s illustrate the above by example: location = / { [ configuration A ] @@ -2135,7 +2135,7 @@ If the parameter equals “$hostname” (0.9.4), the -machine's hostname is substituted. +machine’s hostname is substituted. @@ -2203,7 +2203,7 @@ header field, instead of the default server for the given address:port pair. This is the default setting. -Before 0.8.48, the machine's hostname was used by default. +Before 0.8.48, the machine’s hostname was used by default. @@ -2269,7 +2269,7 @@ Sets the bucket size for the server names hash tables. -Default value depends on the size of the processor's cache line. +Default value depends on the size of the processor’s cache line. For more information, please refer to Setting Up Hashes. @@ -2546,7 +2546,7 @@ Sets the bucket size for the types hash tables. -Default value depends on the size of the processor's cache line. +Default value depends on the size of the processor’s cache line. For more information, please refer to Setting Up Hashes. @@ -2646,7 +2646,7 @@ $binary_remote_addr -client address in a binary form, value's length is always 4 bytes +client address in a binary form, value’s length is always 4 bytes $body_bytes_sent @@ -2671,7 +2671,7 @@ $document_root - or directive's value + or directive’s value for the current request @@ -2734,7 +2734,7 @@ $realpath_root an absolute pathname corresponding to the - or directive's value + or directive’s value for the current request, with all symbolic links resolved to real paths @@ -2763,7 +2763,7 @@ request body -The variable's value is made available in locations +The variable’s value is made available in locations processed by the and diff -r 4b5163be537f -r af3f38e349eb xml/en/docs/http/ngx_http_limit_conn_module.xml --- a/xml/en/docs/http/ngx_http_limit_conn_module.xml Fri Aug 10 11:50:59 2012 +0000 +++ b/xml/en/docs/http/ngx_http_limit_conn_module.xml Sat Aug 11 04:55:25 2012 +0000 @@ -147,11 +147,11 @@ Here, an IP address of the client serves as a key. Note that instead of $remote_addr, the $binary_remote_addr variable is used here. -The length of the $remote_addr variable's value can +The length of the $remote_addr variable’s value can range from 7 to 15 bytes, and the stored state occupies either 32 or 64 bytes of memory on 32-bit platforms, and always 64 bytes on 64-bit platforms. -The length of the $binary_remote_addr variable's value +The length of the $binary_remote_addr variable’s value is always 4 bytes, and the stored state always occupies 32 bytes on 32-bit platforms, and 64 bytes on 64-bit platforms. One megabyte zone can keep about 32 thousand 32-byte states, diff -r 4b5163be537f -r af3f38e349eb xml/en/docs/http/ngx_http_map_module.xml --- a/xml/en/docs/http/ngx_http_map_module.xml Fri Aug 10 11:50:59 2012 +0000 +++ b/xml/en/docs/http/ngx_http_map_module.xml Sat Aug 11 04:55:25 2012 +0000 @@ -178,7 +178,7 @@ Sets the bucket size for the variables hash tables. -Default value depends on the size of the processor's cache line. +Default value depends on the size of the processor’s cache line. For more information, please refer to Setting Up Hashes. diff -r 4b5163be537f -r af3f38e349eb xml/en/docs/http/server_names.xml --- a/xml/en/docs/http/server_names.xml Fri Aug 10 11:50:59 2012 +0000 +++ b/xml/en/docs/http/server_names.xml Sat Aug 11 04:55:25 2012 +0000 @@ -85,7 +85,7 @@ name="Wildcard names"> -A wildcard name may contain an asterisk only on the name's start or end, +A wildcard name may contain an asterisk only on the name’s start or end, and only on a dot border. The names “www.*.example.org” and “w*.example.org” are invalid. However, these names can be specified using regular expressions, diff -r 4b5163be537f -r af3f38e349eb xml/en/docs/install.xml --- a/xml/en/docs/install.xml Fri Aug 10 11:50:59 2012 +0000 +++ b/xml/en/docs/install.xml Sat Aug 11 04:55:25 2012 +0000 @@ -183,7 +183,7 @@ The library distribution (version 4.4—8.30) needs to be downloaded from the PCRE site and extracted. -The rest is done by nginx's ./configure and make. +The rest is done by nginx’s ./configure and make. The library is required for regular expressions support in the directive and for the @@ -207,7 +207,7 @@ The library distribution (version 1.1.3—1.2.5) needs to be downloaded from the zlib site and extracted. -The rest is done by nginx's ./configure and make. +The rest is done by nginx’s ./configure and make. The library is required for the ngx_http_gzip_module module. diff -r 4b5163be537f -r af3f38e349eb xml/en/docs/welcome_nginx_facebook.xml --- a/xml/en/docs/welcome_nginx_facebook.xml Fri Aug 10 11:50:59 2012 +0000 +++ b/xml/en/docs/welcome_nginx_facebook.xml Sat Aug 11 04:55:25 2012 +0000 @@ -43,14 +43,14 @@ “Welcome to nginx!” is just a diagnostics response that can be produced by any of the websites out there, running nginx web server. Currently, nginx is the 2nd most popular open source -web server in the world, it's being used by over 70,000,000 (or +web server in the world, it’s being used by over 70,000,000 (or 10% of the Internet) websites. Most of these websites are -legitimate, but some aren't. Our software was created with a good +legitimate, but some aren’t. Our software was created with a good reason of enabling performance and scalability on the Internet, it is licensed under popular open source license, and has nothing to do with any kind of threatening or malicious activity per se — -nginx is NOT a malware, and it is NOT on your computer. But someone's +nginx is NOT a malware, and it is NOT on your computer. But someone’s malware could have indeed tampered with your computer or router, redirecting you to a fraudulent Internet server. @@ -65,7 +65,7 @@ (Disclaimer: at nginx we are not responsible for any negative impact or effects that the actions below might cause. Use the following recommendations at your own risk, especially if -you aren't an experienced user of your operating system and/or +you aren’t an experienced user of your operating system and/or Internet applications. In no event shall nginx be liable for any direct, indirect, incidental, special, exemplary, or consequential damages, including, but not limited to loss of @@ -82,7 +82,7 @@ Use Google -Public DNS, and see if it fixes the problem. From Google's +Public DNS, and see if it fixes the problem. From Google’s description of its Public DNS — "Google Public DNS is a free, global Domain Name System (DNS) resolution service, that you can use as an alternative to your current DNS @@ -110,11 +110,11 @@ -Check if the "hosts" file doesn't contain entries other +Check if the "hosts" file doesn’t contain entries other than "127.0.0.1 localhost", and if so — if these entries are for -the web site you're trying to reach. The "hosts" files is located in +the web site you’re trying to reach. The "hosts" files is located in C:\WINDOWS\system32\drivers\etc directory. Typically there should -be just one entry in it, for "127.0.0.1 localhost", that's it. The +be just one entry in it, for "127.0.0.1 localhost", that’s it. The "hosts" file can be viewed and edited with your standard Notepad application. @@ -138,7 +138,7 @@ If changing DNS servers to Google Public DNS, flushing DNS resolver cache, fixing your browser configuration, or cleaning "hosts" file -(when applicable) have helped, it might be that there's a malware +(when applicable) have helped, it might be that there’s a malware somewhere on your PC or around. Find and clean it using your preferred anti-virus and anti-malware tools. diff -r 4b5163be537f -r af3f38e349eb xml/en/support.xml --- a/xml/en/support.xml Fri Aug 10 11:50:59 2012 +0000 +++ b/xml/en/support.xml Sat Aug 11 04:55:25 2012 +0000 @@ -123,7 +123,7 @@
-If you're looking for a commercial support option +If you’re looking for a commercial support option please refer to the support page on our nginx.com web site. diff -r 4b5163be537f -r af3f38e349eb xml/ru/docs/http/ngx_http_core_module.xml --- a/xml/ru/docs/http/ngx_http_core_module.xml Fri Aug 10 11:50:59 2012 +0000 +++ b/xml/ru/docs/http/ngx_http_core_module.xml Sat Aug 11 04:55:25 2012 +0000 @@ -141,7 +141,7 @@ location -Задаёт замену для указанного location'а. +Задаёт замену для указанного location’а. Например, при такой конфигурации location /i/ { @@ -159,7 +159,7 @@ -Если alias используется внутри location'а, заданного +Если alias используется внутри location’а, заданного регулярным выражением, то регулярное выражение должно содержать выделения, а сам alias — ссылки на эти выделения (0.7.40), например: @@ -1330,18 +1330,18 @@ (для поиска совпадения без учёта регистра символов), либо с префиксом “~” (с учётом регистра). Чтобы найти location, соответствующий запросу, вначале проверяются -location'ы, заданные префиксными строками (префиксные location'ы). +location’ы, заданные префиксными строками (префиксные location’ы). Среди них ищется максимальное совпадение. Затем проверяются регулярные выражения, в порядке их следования в конфигурационном файле. Проверка регулярных выражений прекращается после первого же совпадения, и используется соответствующая конфигурация. Если совпадение с регулярным выражением не найдено, то используется -конфигурация максимально совпавшего префиксного location'а. +конфигурация максимально совпавшего префиксного location’а. -location'ы могут быть вложенными, с некоторыми исключениями, +location’ы могут быть вложенными, с некоторыми исключениями, о которых говорится ниже. @@ -1349,7 +1349,7 @@ Для операционных систем, нечувствительных к регистру символов, таких как Mac OS X и Cygwin, сравнение с префиксными строками производится без учёта регистра (0.7.7). -Однако, сравнение ограничено только однобайтными locale'ями. +Однако, сравнение ограничено только однобайтными locale’ями. @@ -1358,7 +1358,7 @@ -Если у максимального совпавшего префиксного location'а указан префикс +Если у максимального совпавшего префиксного location’а указан префикс “^~”, то регулярные выражения не проверяются. @@ -1369,13 +1369,13 @@ Например, если запрос “/” случается часто, то указав “location = /”, можно ускорить обработку этих запросов, так как поиск прекратится после первого же сравнения. -Очевидно, что такой location не может иметь вложенные location'ы. +Очевидно, что такой location не может иметь вложенные location’ы. В версиях с 0.7.1 по 0.8.41, если запрос точно совпал с префиксным -location'ом без префиксов “=” и “^~”, +location’ом без префиксов “=” и “^~”, то поиск тоже сразу же прекращается и регулярные выражения также не проверяются. @@ -1410,8 +1410,8 @@ Префикс “@” задаёт именованный location. Такой location не используется при обычной обработке запросов, а предназначен только для перенаправления в него запросов. -Такие location'ы не могут быть вложенными и не могут содержать -вложенные location'ы. +Такие location’ы не могут быть вложенными и не могут содержать +вложенные location’ы.