diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-08-06 15:52:02 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-08-06 15:52:02 +0000 |
| commit | 5f4fbaf71cd443a7f99094bc2e3e6c6115d7ff13 (patch) | |
| tree | 5c50fe3486d39479a7afb8bc2dc53190ae3968ab | |
| parent | 1c1cccf6732d5cd7335923d6b9ef3f47722dbd7c (diff) | |
| download | nginx-5f4fbaf71cd443a7f99094bc2e3e6c6115d7ff13.tar.gz nginx-5f4fbaf71cd443a7f99094bc2e3e6c6115d7ff13.tar.bz2 | |
Merge of r4754: synchronized the license text.
Synchronized the license text with the FreeBSD's bsd-style-copyright.
| -rw-r--r-- | docs/text/LICENSE | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/text/LICENSE b/docs/text/LICENSE index 1bfc054da..c78be7e37 100644 --- a/docs/text/LICENSE +++ b/docs/text/LICENSE @@ -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) |