annotate xml/en/docs/faq/license_copyright.xml @ 2060:237b67ef69a6

Improved win32 build instructions. Added "--with-openssl-opt=no-asm" argument which is required since OpenSSL 1.0.2, as OpenSSL started to use assembler by default in 1.0.0 and then broke builds with MASM in OpenSSL 1.0.2 (ticket #1396). While here, added "--with-debug", added missing "--http-scgi-temp-path" and "--http-uwsgi-temp-path", updated OpenSSL to 1.0.2l, switched to slightly more readable one-argument-per-line style in configure example, added indentation to continuation lines, removed useless "--builddir=objs" argument ("objs" is the default), and removed useless "-f objs/Makefile" argument in nmake (nginx generates appropriate Makefile in the current directory).
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 17 Oct 2017 17:57:36 +0300
parents ddec437b692b
children a841077735f9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
580
be54c443235a Added copyright markers to documentation sources.
Ruslan Ermilov <ru@nginx.com>
parents: 374
diff changeset
1 <!--
be54c443235a Added copyright markers to documentation sources.
Ruslan Ermilov <ru@nginx.com>
parents: 374
diff changeset
2 Copyright (C) Nginx, Inc.
be54c443235a Added copyright markers to documentation sources.
Ruslan Ermilov <ru@nginx.com>
parents: 374
diff changeset
3 -->
be54c443235a Added copyright markers to documentation sources.
Ruslan Ermilov <ru@nginx.com>
parents: 374
diff changeset
4
196
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
5 <!DOCTYPE article SYSTEM "../../../../dtd/article.dtd">
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
6
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
7 <article name="How can nginx copyright be acknowledged
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
8 when using nginx as part of a proprietary
747
ddec437b692b Fixed a number of typos.
Vladimir Homutov <vl@nginx.com>
parents: 625
diff changeset
9 software distribution?"
196
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
10 link="/en/docs/faq/license_copyright.html"
589
764fbac1b8b4 Added document revision.
Ruslan Ermilov <ru@nginx.com>
parents: 580
diff changeset
11 lang="en"
764fbac1b8b4 Added document revision.
Ruslan Ermilov <ru@nginx.com>
parents: 580
diff changeset
12 rev="1">
196
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
13
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
14 <section>
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
15
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
16 <para>
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
17 <initial>Q:</initial>
625
af3f38e349eb Removed terminal whitespace and fixed apostrophes used.
Ruslan Ermilov <ru@nginx.com>
parents: 589
diff changeset
18 I’d like to use nginx distribution as part of my proprietary
196
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
19 software package. How can nginx copyright be acknowledged
202
5219a1498a61 Fixed spelling.
Ruslan Ermilov <ru@nginx.com>
parents: 200
diff changeset
20 when using nginx as part of a proprietary software distribution?
196
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
21 </para>
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
22
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
23 <para>
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
24 &nbsp;
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
25 </para>
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
26
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
27 <para>
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
28 <initial>A:</initial>
198
ec4626d04879 - Bulk commit following discussion in devrep
Andrey Alexeev <andrew@nginx.com>
parents: 196
diff changeset
29 The text below should be added to your license conditions,
ec4626d04879 - Bulk commit following discussion in devrep
Andrey Alexeev <andrew@nginx.com>
parents: 196
diff changeset
30 followed by the text of the applicable 2-clause BSD license described
374
a413dffb0557 Replaced "a href" with "link doc" / "link url".
Ruslan Ermilov <ru@nginx.com>
parents: 202
diff changeset
31 <link url="http://nginx.org/LICENSE">here</link>.
200
19c060caf965 - Figured out how to add new faq entries to makefile
Andrey Alexeev <andrew@nginx.com>
parents: 198
diff changeset
32
19c060caf965 - Figured out how to add new faq entries to makefile
Andrey Alexeev <andrew@nginx.com>
parents: 198
diff changeset
33 <programlisting>
19c060caf965 - Figured out how to add new faq entries to makefile
Andrey Alexeev <andrew@nginx.com>
parents: 198
diff changeset
34 This product contains software provided by Nginx, Inc. and its contributors.
19c060caf965 - Figured out how to add new faq entries to makefile
Andrey Alexeev <andrew@nginx.com>
parents: 198
diff changeset
35 </programlisting>
19c060caf965 - Figured out how to add new faq entries to makefile
Andrey Alexeev <andrew@nginx.com>
parents: 198
diff changeset
36
198
ec4626d04879 - Bulk commit following discussion in devrep
Andrey Alexeev <andrew@nginx.com>
parents: 196
diff changeset
37 </para>
ec4626d04879 - Bulk commit following discussion in devrep
Andrey Alexeev <andrew@nginx.com>
parents: 196
diff changeset
38
ec4626d04879 - Bulk commit following discussion in devrep
Andrey Alexeev <andrew@nginx.com>
parents: 196
diff changeset
39 <para>
196
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
40 Also, if your build of nginx includes any of the following 3rd party
625
af3f38e349eb Removed terminal whitespace and fixed apostrophes used.
Ruslan Ermilov <ru@nginx.com>
parents: 589
diff changeset
41 products: zlib, PCRE, OpenSSL &#8212; it’s worth including their
196
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
42 copyright acknowledgements and disclaimers as well.
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
43 </para>
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
44
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
45 </section>
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
46
aafe530e7d6f - Added faq/ and more q&a as previously agreed
Andrey Alexeev <andrew@nginx.com>
parents:
diff changeset
47 </article>