Mercurial > hg > nginx-site

changeset 1640:442efe0268db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Translated example configuration into English.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 14 Jan 2016 13:20:19 +0300
parents 202f1d671398
children c0d1026e7e7b
files xml/en/GNUmakefile xml/en/docs/example.xml xml/en/index.xml xml/ru/index.xml
diffstat 4 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/GNUmakefile
+++ b/xml/en/GNUmakefile
@@ -4,6 +4,7 @@ DOCS =									\
 		windows							\
 		events							\
 		syntax							\
+		example							\
 		switches						\
 		control							\
 		hash							\
copy from xml/ru/docs/example.xml
copy to xml/en/docs/example.xml
--- a/xml/ru/docs/example.xml
+++ b/xml/en/docs/example.xml
@@ -5,16 +5,16 @@
 
 <!DOCTYPE article SYSTEM "../../../dtd/article.dtd">
 
-<article name="Пример конфигурации nginx"
-         link="/ru/docs/example.html"
-         lang="ru"
+<article name="Example nginx configuration"
+         link="/en/docs/example.html"
+         lang="en"
          rev="2">
 
 <section>
 
 <para>
-Пример конфигурации сайта, который передаёт все запросы бэкенду, кроме
-картинок и запросов, начинающихся с "/download/".
+An example site configuration that passes all requests to the backend except
+images and requests starting with "/download/".
 <programlisting>
 user  www www;
 
--- a/xml/en/index.xml
+++ b/xml/en/index.xml
@@ -8,7 +8,7 @@
 <article name="nginx"
          link="/en/"
          lang="en"
-         rev="49">
+         rev="50">
 
 
 <section>
@@ -126,7 +126,7 @@ and pipelined connections support;
 </listitem>
 
 <listitem>
-Flexible configuration;
+<link doc="docs/example.xml">Flexible configuration</link>;
 </listitem>
 
 <listitem>
--- a/xml/ru/index.xml
+++ b/xml/ru/index.xml
@@ -8,7 +8,7 @@
 <article name="nginx"
          link="/ru/"
          lang="ru"
-         rev="49">
+         rev="50">
 
 
 <section>