[nginx] svn commit: r4792 - in branches/stable-1.2: . docs/text

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-08-06 15:52:02 +0000 (Mon, 06 Aug 2012)
New Revision: 4792
URL: http://trac.nginx.org/nginx/changeset/4792/nginx

Log:
Merge of r4754: synchronized the license text.

Synchronized the license text with the FreeBSD's bsd-style-copyright.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/docs/text/LICENSE

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-08-06 15:47:15 UTC (rev 4791)
+++ branches/stable-1.2	2012-08-06 15:52:02 UTC (rev 4792)

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,4736-4738,4740-4741
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4738,4740-4741,4754
\ No newline at end of property
Modified: branches/stable-1.2/docs/text/LICENSE
===================================================================
--- branches/stable-1.2/docs/text/LICENSE	2012-08-06 15:47:15 UTC (rev 4791)
+++ branches/stable-1.2/docs/text/LICENSE	2012-08-06 15:52:02 UTC (rev 4792)
@@ -1,6 +1,7 @@
 /* 
  * Copyright (C) 2002-2012 Igor Sysoev
  * Copyright (C) 2011,2012 Nginx, Inc.
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -11,10 +12,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)