Mercurial > hg > nginx-site
diff xml/en/docs/faq/license_copyright.xml @ 198:ec4626d04879
- Bulk commit following discussion in devrep
author | Andrey Alexeev <andrew@nginx.com> |
---|---|
date | Wed, 23 Nov 2011 16:31:50 +0000 |
parents | aafe530e7d6f |
children | 19c060caf965 |
line wrap: on
line diff
--- a/xml/en/docs/faq/license_copyright.xml +++ b/xml/en/docs/faq/license_copyright.xml @@ -21,7 +21,12 @@ when using nginx as part of a proprietar <para> <initial>A:</initial> -The section of text below should be added to your license descriptions. +The text below should be added to your license conditions, +followed by the text of the applicable 2-clause BSD license described +<a href="http://nginx.org/LICENSE">here</a>. +</para> + +<para> Also, if your build of nginx includes any of the following 3rd party products: zlib, PCRE, OpenSSL — it's worth including their copyright acknowledgements and disclaimers as well. @@ -29,29 +34,6 @@ copyright acknowledgements and disclaime <programlisting> This product contains software provided by Nginx, Inc. and its contributors. - -Copyright (c) 2002-2011, Igor Sysoev. All rights reserved. -Copyright (c) 2011, Nginx, Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are -permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright -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 NGINX, INC. 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 NGINX, INC. 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) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. </programlisting> </section>