Mercurial > hg > nginx-site

changeset 922:9ad2770d3f28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Finished renaming development to mainline.
author Ruslan Ermilov <ru@nginx.com>
date Fri, 31 May 2013 12:55:09 +0400
parents d7991f499d9f
children 4f1e2120be5e
files dtd/content.dtd xml/cn/docs/windows.xml xml/en/docs/windows.xml xml/en/download.xml xml/he/docs/windows.xml xml/ru/docs/windows.xml xml/ru/download.xml xml/tr/docs/windows.xml xml/versions.xml xsls/versions.xsls
diffstat 10 files changed, 44 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/dtd/content.dtd
+++ b/dtd/content.dtd
@@ -13,7 +13,7 @@
 <!ELEMENT  para         (#PCDATA | link | links | br | list | note |
                          i | b | nobr | table | literal | command |
                          path | header | value | programlisting |
-                         initial | development_version | stable_version |
+                         initial | mainline_version | stable_version |
                          registered | c-func | http-status)* >
 
 <!ELEMENT  links        (link)+ >
@@ -30,7 +30,7 @@
 <!ELEMENT  i            (#PCDATA) >
 <!ELEMENT  b            (#PCDATA) >
 <!ELEMENT  command      (#PCDATA | value)* >
-<!ELEMENT  path         (#PCDATA | value | development_version | stable_version)* >
+<!ELEMENT  path         (#PCDATA | value | mainline_version | stable_version)* >
 <!ELEMENT  literal      (#PCDATA | value)* >
 <!ELEMENT  header       (#PCDATA) >
 <!ELEMENT  initial      (#PCDATA) >
@@ -47,7 +47,7 @@
 >
 
 <!ELEMENT  programlisting  (#PCDATA | i | b | path |
-                            development_version | stable_version)* >
+                            mainline_version | stable_version)* >
 
 <!ELEMENT  nobr         (#PCDATA | b | command | i | literal | path)* >
 
@@ -67,7 +67,7 @@
 <!ELEMENT  note         (#PCDATA | para | br | list | i | b | link |
                          nobr | table | literal | command | path |
                          header | programlisting | initial | paypal |
-                         development_version | stable_version )* >
+                         mainline_version | stable_version )* >
 
 <!ELEMENT  table        (tr+) >
 <!ATTLIST  table
@@ -83,8 +83,8 @@
 
 <!ELEMENT  paypal       EMPTY >
 
-<!ELEMENT  development_version  EMPTY >
-<!ELEMENT  stable_version       EMPTY >
+<!ELEMENT  mainline_version  EMPTY >
+<!ELEMENT  stable_version    EMPTY >
 
 <!ELEMENT  book         EMPTY >
 <!ATTLIST  book
@@ -101,7 +101,7 @@
 <!ELEMENT  download     EMPTY >
 <!ATTLIST  download
            last         CDATA #REQUIRED
-           tag          (development | stable | legacy) #REQUIRED
+           tag          (mainline | stable | legacy) #REQUIRED
 >
 
 <!ELEMENT  security     (item+) >
--- a/xml/cn/docs/windows.xml
+++ b/xml/cn/docs/windows.xml
@@ -18,19 +18,19 @@ nginx的Windows版本使用原生Win32 API（非Cygwin模拟层）。当前nginx/Windows只使用<i>select</i>作为通知方法，所以不要期待它有很高的性能和扩展性。鉴于这点和一些已知问题，nginx/Windows目前还处于<i>beta</i>阶段。nginx/Windows和Unix版本相比，功能几乎已经齐全，除了XSLT过滤器、图像过滤器、GeoIP模块和嵌入Perl语言支持以外。
 </para>
 
 <para>
-安装nginx/Windows，需要<link doc="../download.xml">下载</link>最新的<development_version />开发版本，因为开发分支上包含了所有已知的问题修复，尤其是针对Windows版本的问题修复。解压缩下载得到的zip文件，进入nginx-<development_version />目录，运行nginx。下面给出一个在C盘根目录下安装的例子：
+安装nginx/Windows，需要<link doc="../download.xml">下载</link>最新的<mainline_version />开发版本，因为开发分支上包含了所有已知的问题修复，尤其是针对Windows版本的问题修复。解压缩下载得到的zip文件，进入nginx-<mainline_version />目录，运行nginx。下面给出一个在C盘根目录下安装的例子：
 
 <programlisting>
 cd c:\
-unzip nginx-<development_version />.zip
-cd nginx-<development_version />
+unzip nginx-<mainline_version />.zip
+cd nginx-<mainline_version />
 start nginx
 </programlisting>
 
 可以在命令行运行<command>tasklist</command>命令来查看nginx进程：
 
 <programlisting>
-C:\nginx-<development_version />&gt;tasklist /fi "imagename eq nginx.exe"
+C:\nginx-<mainline_version />&gt;tasklist /fi "imagename eq nginx.exe"
 
 Image Name           PID Session Name     Session#    Mem Usage
 =============== ======== ============== ========== ============
@@ -42,7 +42,7 @@ nginx.exe           1332 Console                 0      3 112 K
 </para>
 
 <para>
-nginx/Windows使用工作目录作为前缀将配置文件中设置的相对目录补齐。就上面安装的例子而言，工作目录应该是<path>C:\nginx-<development_version />\</path>（工作目录基本上与运行文件所在的目录相同）。配置文件中的目录请使用“/”，而不是“\”做目录分隔：
+nginx/Windows使用工作目录作为前缀将配置文件中设置的相对目录补齐。就上面安装的例子而言，工作目录应该是<path>C:\nginx-<mainline_version />\</path>（工作目录基本上与运行文件所在的目录相同）。配置文件中的目录请使用“/”，而不是“\”做目录分隔：
 
 <programlisting>
 access_log   logs/site.log;
--- a/xml/en/docs/windows.xml
+++ b/xml/en/docs/windows.xml
@@ -8,7 +8,7 @@
 <article name="nginx for Windows"
          link="/en/docs/windows.html"
          lang="en"
-         rev="1">
+         rev="2">
 
 <section>
 
@@ -26,17 +26,17 @@ XSLT filter, image filter, GeoIP module,
 
 <para>
 To install nginx/Windows, <link doc="../download.xml">download</link>
-the latest development version distribution (<development_version/>),
-since the development branch of nginx contains all known fixes.
+the latest mainline version distribution (<mainline_version/>),
+since the mainline branch of nginx contains all known fixes.
 Then unpack the distribution, go to the
-nginx-<development_version/>
+nginx-<mainline_version/>
 directory, and run <command>nginx</command>.
 Here is an example for the drive C: root directory:
 
 <programlisting>
 cd c:\
-unzip nginx-<development_version/>.zip
-cd nginx-<development_version/>
+unzip nginx-<mainline_version/>.zip
+cd nginx-<mainline_version/>
 start nginx
 </programlisting>
 
@@ -44,7 +44,7 @@ Run the <command>tasklist</command> comm
 to see nginx processes:
 
 <programlisting>
-C:\nginx-<development_version/>&gt;tasklist /fi "imagename eq nginx.exe"
+C:\nginx-<mainline_version/>&gt;tasklist /fi "imagename eq nginx.exe"
 
 Image Name           PID Session Name     Session#    Mem Usage
 =============== ======== ============== ========== ============
@@ -65,7 +65,7 @@ for the reason in the <path>logs\error.l
 nginx/Windows uses the directory where it has been run as the prefix
 for relative paths in the configuration.
 In the example above, the prefix is
-<path>C:\nginx-<development_version/>\</path>.
+<path>C:\nginx-<mainline_version/>\</path>.
 Paths in a configuration file must be specified in UNIX-style using
 forward slashes:
 
--- a/xml/en/download.xml
+++ b/xml/en/download.xml
@@ -13,7 +13,7 @@
 
 <section name="Mainline version">
 
-<download last="1" tag="development" />
+<download last="1" tag="mainline" />
 
 </section>
 
--- a/xml/he/docs/windows.xml
+++ b/xml/he/docs/windows.xml
@@ -16,16 +16,16 @@ nginx/Windows משתמש ב API הטבעי של חלונות, Win32 API (ולא בשכבת אמולציה של Cygwin).
 
 <para>
 כדי להתקין את nginx/Windows, יש <link doc="../../en/download.xml">להוריד</link>
-את קובץ הזיפ של גירסת הפיתוח האחרונה <development_version />,
+את קובץ הזיפ של גירסת הפיתוח האחרונה <mainline_version />,
 כיוון שענף הפיתוח מכיל את כל התיקונים הידועים, בייחוד אלו הקשורים לחלונות.
 אחרי ההורדה, יש לפרוס את קובץ הזיפ,
-להיכנס לתיקיה nginx-<development_version />, ולהריץ את nginx.
+להיכנס לתיקיה nginx-<mainline_version />, ולהריץ את nginx.
 הנה דוגמא עבור תיקיית השורש של כונן C:
 
 <programlisting>
 cd c:\
-unzip nginx-<development_version />.zip
-cd nginx-<development_version />
+unzip nginx-<mainline_version />.zip
+cd nginx-<mainline_version />
 start nginx
 </programlisting>
 
@@ -33,7 +33,7 @@ start nginx
 של nginx:
 
 <programlisting>
-C:\nginx-<development_version />&gt;tasklist /fi "imagename eq nginx.exe"
+C:\nginx-<mainline_version />&gt;tasklist /fi "imagename eq nginx.exe"
 
 Image Name           PID Session Name     Session#    Mem Usage
 =============== ======== ============== ========== ============
@@ -52,7 +52,7 @@ nginx.exe           1332 Console                 0      3 112 K
 nginx/Windows משתמש בתיקייה שממנה הוא הופעל בתור תיקיית הקידומת לכל
 הנתיבים היחסיים שבקובץ התצורה.
 בדוגמה שלעיל, תיקיית הקידומת תהיה
-<path>C:\nginx-<development_version />\</path>.
+<path>C:\nginx-<mainline_version />\</path>.
 על נתיבים בקובץ התצורה להיות בסגנון Unix בלבד, באמצעות לוכסנים קדמיים:
 
 <programlisting>
--- a/xml/ru/docs/windows.xml
+++ b/xml/ru/docs/windows.xml
@@ -8,7 +8,7 @@
 <article name="nginx под Windows"
          link="/ru/docs/windows.html"
          lang="ru"
-         rev="1">
+         rev="2">
 
 <section>
 
@@ -26,17 +26,17 @@ XSLT-фильтра, фильтра изображений, модуля GeoIP и встроенного языка Perl.
 
 <para>
 Чтобы установить nginx/Windows, <link doc="../download.xml">скачайте</link>
-дистрибутив последней разрабатываемой версии (<development_version/>),
-поскольку ветвь разработки nginx содержит все известные исправления.
+дистрибутив последней основной версии (<mainline_version/>),
+поскольку основная ветвь nginx содержит все известные исправления.
 Затем распакуйте дистрибутив, перейдите в каталог
-nginx-<development_version/>
+nginx-<mainline_version/>
 и запустите <command>nginx</command>.
 Вот пример для корневого каталога на диске C:
 
 <programlisting>
 cd c:\
-unzip nginx-<development_version/>.zip
-cd nginx-<development_version/>
+unzip nginx-<mainline_version/>.zip
+cd nginx-<mainline_version/>
 start nginx
 </programlisting>
 
@@ -44,7 +44,7 @@ start nginx
 <command>tasklist</command>:
 
 <programlisting>
-C:\nginx-<development_version/>&gt;tasklist /fi "imagename eq nginx.exe"
+C:\nginx-<mainline_version/>&gt;tasklist /fi "imagename eq nginx.exe"
 
 Image Name           PID Session Name     Session#    Mem Usage
 =============== ======== ============== ========== ============
@@ -65,7 +65,7 @@ nginx.exe           1332 Console                 0      3 112 K
 nginx/Windows использует каталог, в котором он был запущен, в качестве
 префикса для относительных путей в конфигурации.
 В вышеприведённом примере префиксом является
-<path>C:\nginx-<development_version/>\</path>.
+<path>C:\nginx-<mainline_version/>\</path>.
 Пути в конфигурационном файле должны задаваться в UNIX-стиле с использованием
 прямых слэшей:
 
--- a/xml/ru/download.xml
+++ b/xml/ru/download.xml
@@ -13,7 +13,7 @@
 
 <section name="Основная версия">
 
-<download last="1" tag="development" />
+<download last="1" tag="mainline" />
 
 </section>
 
--- a/xml/tr/docs/windows.xml
+++ b/xml/tr/docs/windows.xml
@@ -14,20 +14,20 @@ Unix versiyonu ile karşılaştırıldığında, XSLT filtresi, imaj filtresi, GeoIP modülü ve gömülü Perl dili hariç tam fonklsiyoneldir.
 </para>
 
 <para>
-nginx/Windows versiyonunu yüklemek için <link doc="../../en/download.xml">indir</link> bağlantısından zip formatındaki <development_version /> geliştirme versiyonunu indirebilirsiniz. Geliştirme versiyonu, özellikle Windows ile ilgili en son yamaları içerir. Dosyayı indirdikten sonra açarak, nginx-<development_version /> klasörü içerisinden nginx&rsquo;i çalıştırabilirsiniz. 
+nginx/Windows versiyonunu yüklemek için <link doc="../../en/download.xml">indir</link> bağlantısından zip formatındaki <mainline_version /> geliştirme versiyonunu indirebilirsiniz. Geliştirme versiyonu, özellikle Windows ile ilgili en son yamaları içerir. Dosyayı indirdikten sonra açarak, nginx-<mainline_version /> klasörü içerisinden nginx&rsquo;i çalıştırabilirsiniz. 
 C sürücüsü için örnek. root dizini:
 
 <programlisting>
 cd c:\
-unzip nginx-<development_version />.zip
-cd nginx-<development_version />
+unzip nginx-<mainline_version />.zip
+cd nginx-<mainline_version />
 start nginx
 </programlisting>
 
 Ayrıca <path>tasklist</path> komutu ile nginx işlemlerini takip edebilirsiniz:
 
 <programlisting>
-C:\nginx-<development_version />&gt;tasklist /fi "imagename eq nginx.exe"
+C:\nginx-<mainline_version />&gt;tasklist /fi "imagename eq nginx.exe"
 
 Image Name           PID Session Name     Session#    Mem Usage
 =============== ======== ============== ========== ============
@@ -44,7 +44,7 @@ Eğer beklenen sayfa yerine hata sayfası ile karşılaşırsanız, yine <path>logs\error.log</path> dosyasını kontrol etmelisiniz.
 <para>
 nginx/Windows, yapılandırmada yer alan nisbi dizin yolları için yürütüldüğü klasörü, önek klasör olarak kullanır.
 Buna örnek olarak, önek klasör şu şekildedir:
-<path>C:\nginx-<development_version />\</path>.
+<path>C:\nginx-<mainline_version />\</path>.
 Ayarlarda yer alan dizin yolları Unix-stili kesme işaretleri ile belirtilir:
 
 <programlisting>
--- a/xml/versions.xml
+++ b/xml/versions.xml
@@ -7,7 +7,7 @@
 
 <versions>
 
-<download tag="development" changes="">
+<download tag="mainline" changes="">
 
 <item ver="1.5.0" />
 
--- a/xsls/versions.xsls
+++ b/xsls/versions.xsls
@@ -5,9 +5,9 @@
 
 X:stylesheet {
 
-X:template = "development_version" {
+X:template = "mainline_version" {
    !! "document(concat($XML, '/versions.xml'))
-                /versions/download[@tag='development'][1]/item[1]/@ver";
+                /versions/download[@tag='mainline'][1]/item[1]/@ver";
 }
 
 X:template = "stable_version" {