Mercurial > hg > nginx-site

changeset 534:6761e05e5128

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
List of supported Debian and Ubuntu versions added.
author Sergey Budnevitch <sb@waeme.net>
date Wed, 13 Jun 2012 15:05:11 +0000
parents fb630c3c5039
children f8652d663b62
files xml/en/download.xml xml/ru/download.xml
diffstat 2 files changed, 110 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/download.xml	Fri Jun 08 19:05:36 2012 +0000
+++ b/xml/en/download.xml	Wed Jun 13 15:05:11 2012 +0000
@@ -261,26 +261,74 @@
 </para>
 
 <para>
-For Debian 6 append the following to the end of the
+For Debian replace <i>codename</i> with Debian distribution
+codename, and append the following to the end of the
 <path>/etc/apt/sources.list</path> file:
 
 <programlisting>
-deb http://nginx.org/packages/debian/ squeeze nginx
-deb-src http://nginx.org/packages/debian/ squeeze nginx
+deb http://nginx.org/packages/debian/ <i>codename</i> nginx
+deb-src http://nginx.org/packages/debian/ <i>codename</i> nginx
 </programlisting>
 </para>
 
 <para>
-For Ubuntu 10.04 append the following to the end of the
+Supported Debian versions:
+
+<table note="yes">
+
+<tr>
+<td width="20%">Version</td>
+<td>Codename</td>
+</tr>
+
+<tr>
+<td width="20%">6.x</td>
+<td>squeeze</td>
+</tr>
+
+</table>
+</para>
+
+<para>
+For Ubuntu replace <i>codename</i> with Ubuntu distribution
+codename, and append the following to the end of the
 <path>/etc/apt/sources.list</path> file:
 
 <programlisting>
-deb http://nginx.org/packages/ubuntu/ lucid nginx
-deb-src http://nginx.org/packages/ubuntu/ lucid nginx
+deb http://nginx.org/packages/ubuntu/ <i>codename</i> nginx
+deb-src http://nginx.org/packages/ubuntu/ <i>codename</i> nginx
 </programlisting>
 </para>
 
 <para>
+Supported Ubuntu versions:
+
+<table note="yes">
+
+<tr>
+<td width="20%">Version</td>
+<td>Codename</td>
+</tr>
+
+<tr>
+<td width="20%">10.04</td>
+<td>lucid</td>
+</tr>
+
+<tr>
+<td width="20%">11.10</td>
+<td>oneiric</td>
+</tr>
+
+<tr>
+<td width="20%">12.04</td>
+<td>precise</td>
+</tr>
+
+</table>
+</para>
+
+<para>
 For Debian/Ubuntu then run the following commands:
 <programlisting>
 apt-get update
--- a/xml/ru/download.xml	Fri Jun 08 19:05:36 2012 +0000
+++ b/xml/ru/download.xml	Wed Jun 13 15:05:11 2012 +0000
@@ -261,26 +261,74 @@
 </para>
 
 <para>
-Для Debian 6 добавьте в конец файла
-<path>/etc/apt/sources.list</path> следующее:
+Для Debian замените <i>codename</i> на кодовое имя дистрибутива,
+и добавьте в конец файла <path>/etc/apt/sources.list</path>
+следующее:
 
 <programlisting>
-deb http://nginx.org/packages/debian/ squeeze nginx
-deb-src http://nginx.org/packages/debian/ squeeze nginx
+deb http://nginx.org/packages/debian/ <i>codename</i> nginx
+deb-src http://nginx.org/packages/debian/ <i>codename</i> nginx
 </programlisting>
 </para>
 
 <para>
-Для Ubuntu 10.04 добавьте в конец файла
-<path>/etc/apt/sources.list</path> следующее:
+Поддерживаемые версии Debian:
+
+<table note="yes">
+
+<tr>
+<td width="20%">Версия</td>
+<td>Кодовое имя</td>
+</tr>
+
+<tr>
+<td width="20%">6.x</td>
+<td>squeeze</td>
+</tr>
+
+</table>
+</para>
+
+<para>
+Для Ubuntu замените <i>codename</i> на кодовое имя дистрибутива,
+и добавьте в конец файла <path>/etc/apt/sources.list</path>
+следующее:
 
 <programlisting>
-deb http://nginx.org/packages/ubuntu/ lucid nginx
-deb-src http://nginx.org/packages/ubuntu/ lucid nginx
+deb http://nginx.org/packages/ubuntu/ <i>codename</i> nginx
+deb-src http://nginx.org/packages/ubuntu/ <i>codename</i> nginx
 </programlisting>
 </para>
 
 <para>
+Поддерживаемые версии Ubuntu:
+
+<table note="yes">
+
+<tr>
+<td width="20%">Версия</td>
+<td>Кодовое имя</td>
+</tr>
+
+<tr>
+<td width="20%">10.04</td>
+<td>lucid</td>
+</tr>
+
+<tr>
+<td width="20%">11.10</td>
+<td>oneiric</td>
+</tr>
+
+<tr>
+<td width="20%">12.04</td>
+<td>precise</td>
+</tr>
+
+</table>
+</para>
+
+<para>
 Для Debian/Ubuntu затем выполните команды:
 <programlisting>
 apt-get update