changeset 141:2a88f137b1c6

ru proposed changes: * long lines reformated. * pathname and code elements added to dtd.
author Sergey Budnevitch <sb@waeme.net>
date Mon, 24 Oct 2011 15:28:45 +0000
parents b9e5155d8f5d
children 568b4e77c0d0
files dtd/content.dtd xml/en/download.xml
diffstat 2 files changed, 25 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/dtd/content.dtd	Mon Oct 24 13:01:12 2011 +0000
+++ b/dtd/content.dtd	Mon Oct 24 15:28:45 2011 +0000
@@ -9,7 +9,7 @@
                          i | b | nobr | table | url | code | command |
                          dirname | path | header | value | programlisting |
                          initial | development_version | stable_version |
-                         registered)* >
+                         registered | pathname)* >
 
 <!ELEMENT  a            (#PCDATA) >
 <!ATTLIST  a
@@ -30,6 +30,7 @@
 <!ELEMENT  command      (#PCDATA | value)* >
 <!ELEMENT  dirname      (#PCDATA | i)* >
 <!ELEMENT  path         (#PCDATA | development_version | stable_version)* >
+<!ELEMENT  pathname     (#PCDATA)* >
 <!ELEMENT  code         (#PCDATA | i)* >
 <!ELEMENT  header       (#PCDATA) >
 <!ELEMENT  initial      (#PCDATA) >
@@ -47,7 +48,7 @@
 <!ELEMENT  orderedlist  (item+) >
 <!ELEMENT  item         (#PCDATA | para | a | br | nobr | list | i | b | url |
                          dirname | path | command | value | programlisting |
-                         link | registered)* >
+                         link | registered | code)* >
 <!ELEMENT  listitem     (#PCDATA | para | a | br | nobr | list | i | b | url |
                          dirname | path | command | value | programlisting)* >
 
--- a/xml/en/download.xml	Mon Oct 24 13:01:12 2011 +0000
+++ b/xml/en/download.xml	Mon Oct 24 15:28:45 2011 +0000
@@ -134,13 +134,15 @@
 
 </section>
 
+
 <section name="Source Repository">
 
 <para>
 <list>
 
 <item>
-Read-only Subversion repository: <programlisting>svn://svn.nginx.org/nginx</programlisting>
+Read-only Subversion repository:
+<code>svn://svn.nginx.org/nginx</code>
 </item>
 
 <item>
@@ -152,10 +154,12 @@
 
 </section>
 
+
 <section name="Prebuilt Packages">
+
 <para>
-For automatic updates of the prebuilt Linux packages it is possible to configure yum repository
-for RHEL/CentOS or apt repository for Debian/Ubuntu.
+For automatic updates of the prebuilt Linux packages it is possible to
+configure yum repository for RHEL/CentOS, or apt repository for Debian/Ubuntu.
 </para>
 
 <para>
@@ -177,15 +181,18 @@
 <item>
 <link url="http://nginx.org/packages/centos/6/noarch/RPMS/nginx-release-centos-6-0.el6.ngx.noarch.rpm">CentOS 6</link>
 </item>
+
 </list>
-install nginx-release package containing the yum config and the public key necessary to check signed rpms.
-Then run the command:
+install the <code>nginx-release</code> package containing the yum config
+and the public key necessary to check signed RPMs,
+then run the following command:
 <programlisting>
 yum install nginx
 </programlisting>
 
-As an alternative, a repository config can be added manually. Create the file named nginx.repo in /etc/yum.repos.d and
-add configuration, like this:
+As an alternative, a repository config can be added manually.
+Create the file named <pathname>/etc/yum.repos.d/nginx.repo</pathname>
+with the following contents:
 
 <programlisting>
 [nginx]
@@ -195,20 +202,23 @@
 enabled=1
 </programlisting>
 
-Replace OS with rhel or centos, depending on the distribution you are running, and OSRELEASE with 5 or 6, for 5.x and 6.x
-versions accordingly.
-
+Replace “<code>OS</code>” with “<code>rhel</code>” or “<code>centos</code>”,
+depending on the distribution used, and “<code>OSRELEASE</code>”
+with “<code>5</code>” or “<code>6</code>”,
+for 5.x or 6.x versions, respectively.
 </para>
 
 <para>
-For Debian/Ubuntu append /etc/apt/sources.list with:
+For supported Debian/Ubuntu versions append the following contents to
+<pathname>/etc/apt/sources.list</pathname>:
 
 <programlisting>
 deb http://nginx.org/packages/debian/ squeeze nginx
 deb-src http://nginx.org/packages/debian/ squeeze nginx
 </programlisting>
 
-in case of Debian 6, or for Ubuntu 10.04 with:
+in case of Debian 6, or for Ubuntu 10.04 with
+the following contents instead:
 
 <programlisting>
 deb http://nginx.org/packages/ubuntu/ lucid nginx