Mercurial > hg > nginx-site

changeset 339:8f6a70f9d3c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Key section goes first
author Andrey Alexeev <andrew@nginx.com>
date Fri, 20 Jan 2012 16:05:14 +0000
parents a4076cdff964
children 18615631462e
files xml/en/download.xml
diffstat 1 files changed, 15 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/download.xml
+++ b/xml/en/download.xml
@@ -197,9 +197,9 @@ To set up the yum repository for RHEL/Ce
 
 </list>
 
-The package contains the yum configuration file
-and the public PGP key necessary to authenticate signed RPMs.
-Download and install it, then run the command:
+This package contains yum configuration file
+and a public PGP key necessary to authenticate signed RPMs.
+Download and install it, then run the following:
 <programlisting>
 yum install nginx
 </programlisting>
@@ -225,6 +225,17 @@ for 5.x or 6.x versions, respectively.
 </para>
 
 <para>
+In order to add repository signature checking and to eliminate gpg warnings during
+the installation on Debian or Ubuntu, it is necessary to import nginx signing key
+into apt keyring. Please download <link url="http://nginx.org/keys/nginx_signing.key">
+nginx signing key</link> from our web site, and add it to the apt keyring with the
+following  command:
+<programlisting>
+cat nginx_signing.key | sudo apt-key add -
+</programlisting>
+</para>
+
+<para>
 For Debian 6 append the following to the end of the
 <path>/etc/apt/sources.list</path> file:
 
@@ -233,12 +244,6 @@ deb http://nginx.org/packages/debian/ sq
 deb-src http://nginx.org/packages/debian/ squeeze nginx
 </programlisting>
 
-Then run the commands:
-<programlisting>
-apt-get update
-apt-get install nginx
-</programlisting>
-
 </para>
 
 <para>
@@ -251,19 +256,9 @@ deb-src http://nginx.org/packages/ubuntu
 </programlisting>
 </para>
 
-<para>
-In order to add repository signature checking and to eliminate gpg warnings during
-the installation on Debian or Ubuntu, it is necessary to import nginx signing key
-into apt keyring. Please download <link url="http://nginx.org/keys/nginx_signing.key">
-nginx signing key</link> from our web site, and add it to the apt keyring with the
-following command:
-<programlisting>
-cat nginx_signing.key | sudo apt-key add -
-</programlisting>
-</para>
 
 <para>
-Then run the commands:
+Then run the following commands:
 <programlisting>
 apt-get update
 apt-get install nginx