Author: mdounin
Date: 2012-02-05 15:34:20 +0000 (Sun, 05 Feb 2012)
New Revision: 4440

Log:
Merge of r4379: duplicate words removed.


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


Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4298,4300-4309,4313,4315,4320-4321,4326-4327,4335-4336,4338-4343,4372-4375,4377,4382
+ /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4298,4300-4309,4313,4315,4320-4321,4326-4327,4335-4336,4338-4343,4372-4375,4377,4379,4382

Modified: branches/stable-1.0/docs/xml/nginx/changes.xml
===================================================================
--- branches/stable-1.0/docs/xml/nginx/changes.xml 2012-02-05 14:09:46 UTC (rev 4439)
+++ branches/stable-1.0/docs/xml/nginx/changes.xml 2012-02-05 15:34:20 UTC (rev 4440)
@@ -14431,7 +14431,7 @@
если в директиве proxy_pass отсутствовал URI, то всегда использовался порт 80.
</para>
<para lang="en">
-if the URI part is omitted in "proxy_pass" directive, the the 80 port was
+if the URI part is omitted in "proxy_pass" directive, the 80 port was
always used.
</para>
</change>
@@ -15220,7 +15220,7 @@
<para lang="en">
the segmentation fault may occurred if there were errors while
working with proxied or FastCGI server;
-in the proxied mode the the bug had appeared in 0.1.29.
+in the proxied mode the bug had appeared in 0.1.29.
</para>
</change>

@@ -15237,7 +15237,7 @@
the segmentation fault occurred or the worker process may got caught
in an endless loop if the proxied or FastCGI server sent the "Cache-Control"
header line and the "expires" directive was used;
-in the proxied mode the the bug had appeared in 0.1.29.
+in the proxied mode the bug had appeared in 0.1.29.
</para>
</change>

@@ -15474,7 +15474,7 @@
директива limit_rate поддерживается в режиме прокси и FastCGI.
</para>
<para lang="en">
-the "limit_rate" directive is supported in in proxy and FastCGI mode.
+the "limit_rate" directive is supported in proxy and FastCGI mode.
</para>
</change>

@@ -15981,7 +15981,7 @@
<para lang="en">
if the length of the response part received at once from proxied
or FastCGI server was equal to 500, then nginx returns the 500 response code;
-in proxy mode the the bug had appeared in 0.1.29 only.
+in proxy mode the bug had appeared in 0.1.29 only.
</para>
</change>

@@ -16801,7 +16801,7 @@
во время чтения тела запроса клиента в SSL соединении мог произойти таймаут.
</para>
<para lang="en">
-the timeout may occur while reading of the the client request body
+the timeout may occur while reading of the client request body
via SSL connections.
</para>
</change>

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel