Mercurial > hg > nginx-site

changeset 817:4fecf0715bbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introducing "worker_processes auto" in SSL configuration examples.
author Andrei Belov <defan@nginx.com>
date Tue, 22 Jan 2013 17:45:12 +0400
parents c711c50bdcf4
children c3fcad8e5e46
files xml/en/docs/http/configuring_https_servers.xml xml/en/docs/http/ngx_http_ssl_module.xml xml/ru/docs/http/configuring_https_servers.xml xml/ru/docs/http/ngx_http_ssl_module.xml
diffstat 4 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/configuring_https_servers.xml
+++ b/xml/en/docs/http/configuring_https_servers.xml
@@ -8,7 +8,7 @@
 <article name="Configuring HTTPS servers"
          link="/en/docs/http/configuring_https_servers.html"
          lang="en"
-         rev="5"
+         rev="6"
          author="Igor Sysoev"
          editor="Brian Mercer">
 
@@ -98,11 +98,11 @@ The default cache timeout is 5 minutes.
 It can be increased by using the
 <link doc="ngx_http_ssl_module.xml" id="ssl_session_timeout"/>
 directive.
-Here is a sample configuration optimized for a quad core system
+Here is a sample configuration optimized for a multi-core system
 with 10 megabyte shared session cache:
 
 <programlisting>
-<b>worker_processes 4</b>;
+<b>worker_processes auto</b>;
 
 http {
     <b>ssl_session_cache   shared:SSL:10m</b>;
--- a/xml/en/docs/http/ngx_http_ssl_module.xml
+++ b/xml/en/docs/http/ngx_http_ssl_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_ssl_module"
         link="/en/docs/http/ngx_http_ssl_module.html"
         lang="en"
-        rev="6">
+        rev="7">
 
 <section id="summary">
 
@@ -61,7 +61,7 @@ and possibly increase the session lifeti
 </list>
 
 <example>
-<emphasis>worker_processes 2;</emphasis>
+<emphasis>worker_processes auto;</emphasis>
 
 http {
 
--- a/xml/ru/docs/http/configuring_https_servers.xml
+++ b/xml/ru/docs/http/configuring_https_servers.xml
@@ -8,7 +8,7 @@
 <article name="Настройка HTTPS-серверов"
          link="/ru/docs/http/configuring_https_servers.html"
          lang="ru"
-         rev="5"
+         rev="6"
          author="Игорь Сысоев"
          editor="Brian Mercer">
 
@@ -98,11 +98,11 @@ SSL handshake для параллельных и последующих соединений.
 Таймаут кэша по умолчанию равен 5 минутам.
 Он может быть увеличен с помощью директивы
 <link doc="ngx_http_ssl_module.xml" id="ssl_session_timeout"/>.
-Вот пример конфигурации, оптимизированной под 4-ядерную систему
+Вот пример конфигурации, оптимизированной под многоядерную систему
 с 10-мегабайтным разделяемым кэшем сессий:
 
 <programlisting>
-<b>worker_processes 4</b>;
+<b>worker_processes auto</b>;
 
 http {
     <b>ssl_session_cache   shared:SSL:10m</b>;
--- a/xml/ru/docs/http/ngx_http_ssl_module.xml
+++ b/xml/ru/docs/http/ngx_http_ssl_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_ssl_module"
         link="/ru/docs/http/ngx_http_ssl_module.html"
         lang="ru"
-        rev="6">
+        rev="7">
 
 <section id="summary">
 
@@ -61,7 +61,7 @@
 </list>
 
 <example>
-<emphasis>worker_processes 2;</emphasis>
+<emphasis>worker_processes auto;</emphasis>
 
 http {