Mercurial > hg > nginx-site

changeset 1423:b3d7cd8d7c06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated with Netcraft February 2015 Web Server Survey stats.
author Yaroslav Zhuravlev <yar@nginx.com>
date Tue, 24 Feb 2015 19:49:37 +0300
parents 895ed8e6f5a8
children 410e0683b6b4
files xml/en/docs/http/ngx_http_upstream_module.xml xml/en/index.xml xml/ru/index.xml
diffstat 3 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_upstream_module.xml	Sun Feb 22 17:58:51 2015 +0000
+++ b/xml/en/docs/http/ngx_http_upstream_module.xml	Tue Feb 24 19:49:37 2015 +0300
@@ -32,8 +32,10 @@
 <para>
 <example>
 upstream <emphasis>backend</emphasis> {
+    least conn;
+
     server backend1.example.com       weight=5;
-    server backend2.example.com:8080;
+    server backend2.example.com:8080  max_fails=3 fail_timeout=30s;
     server unix:/tmp/backend3;
 
     server backup1.example.com:8080   backup;
--- a/xml/en/index.xml	Sun Feb 22 17:58:51 2015 +0000
+++ b/xml/en/index.xml	Tue Feb 24 19:49:37 2015 +0300
@@ -8,7 +8,7 @@
 <article name="nginx"
          link="/en/"
          lang="en"
-         rev="32">
+         rev="33">
 
 
 <section>
@@ -24,8 +24,8 @@
 <link url="http://vk.com">VK</link>, and
 <link url="http://www.rambler.ru">Rambler</link>.
 According to Netcraft, nginx served or proxied
-<link url="http://news.netcraft.com/archives/2015/01/15/january-2015-web-server-survey.html">21.09%
-busiest sites in January 2015</link>.
+<link url="http://news.netcraft.com/archives/2015/02/24/february-2015-web-server-survey.html">21.21%
+busiest sites in February 2015</link>.
 Here are some of the success stories:
 <link url="https://www.netflix.com/openconnect/software">Netflix</link>,
 <link url="http://nginx.com/news/choosing-nginx-growth-wordpresscom/">Wordpress.com</link>,
--- a/xml/ru/index.xml	Sun Feb 22 17:58:51 2015 +0000
+++ b/xml/ru/index.xml	Tue Feb 24 19:49:37 2015 +0300
@@ -8,7 +8,7 @@
 <article name="nginx"
          link="/ru/"
          lang="ru"
-         rev="32">
+         rev="33">
 
 
 <section>
@@ -24,8 +24,8 @@
 <link url="http://vk.com">ВКонтакте</link> и
 <link url="http://www.rambler.ru">Рамблер</link>.
 Согласно статистике Netcraft nginx обслуживал или проксировал
-<link url="http://news.netcraft.com/archives/2015/01/15/january-2015-web-server-survey.html">21.09%
-самых нагруженных сайтов в январе 2015 года</link>.
+<link url="http://news.netcraft.com/archives/2015/02/24/february-2015-web-server-survey.html">21.21%
+самых нагруженных сайтов в феврале 2015 года</link>.
 Вот некоторые примеры успешного внедрения nginx (тексты на английском языке):
 <link url="https://www.netflix.com/openconnect/software">Netflix</link>,
 <link url="http://nginx.com/news/choosing-nginx-growth-wordpresscom/">Wordpress.com</link>,