[nginx] svn commit: r4787 - in branches/stable-1.2: . docs/xml/nginx

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-08-06 14:58:36 +0000 (Mon, 06 Aug 2012)
New Revision: 4787
URL: http://trac.nginx.org/nginx/changeset/4787/nginx

Log:
Merge of r4736: typo fixed.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/docs/xml/nginx/changes.xml

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-08-06 14:04:06 UTC (rev 4786)
+++ branches/stable-1.2	2012-08-06 14:58:36 UTC (rev 4787)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736
\ No newline at end of property
Modified: branches/stable-1.2/docs/xml/nginx/changes.xml
===================================================================
--- branches/stable-1.2/docs/xml/nginx/changes.xml	2012-08-06 14:04:06 UTC (rev 4786)
+++ branches/stable-1.2/docs/xml/nginx/changes.xml	2012-08-06 14:58:36 UTC (rev 4787)
@@ -50,7 +50,7 @@
 задавать IPv6-адреса DNS-серверов.
 </para>
 <para lang="en">
-the "resolver" directive now support IPv6 addresses and
+the "resolver" directive now supports IPv6 addresses and
 an optional port specification.
 </para>
 </change>