Mercurial > hg > nginx-site
changeset 200:19c060caf965
- Figured out how to add new faq entries to makefile
- Aligned sys_errlist style with the other entries
- Minor typos corrected in the other entries
| author | Andrey Alexeev <andrew@nginx.com> |
|---|---|
| date | Wed, 23 Nov 2011 17:19:40 +0000 |
| parents | 8796246b31e1 |
| children | e58be01b1f4a |
| files | xml/en/GNUmakefile xml/en/docs/faq/chunked_encoding_from_backend.xml xml/en/docs/faq/daemon_master_process_off.xml xml/en/docs/faq/license_copyright.xml xml/en/docs/sys_errlist.xml |
| diffstat | 5 files changed, 19 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/GNUmakefile +++ b/xml/en/GNUmakefile @@ -37,7 +37,12 @@ HOWTO_EN_XML = $(foreach name, $(HOWTO_E HOWTO_EN_HTML = $(foreach name, $(HOWTO_EN), $(OUT)/$(name).html) FAQ_EN = en/docs/sys_errlist \ - en/docs/welcome_nginx_facebook + en/docs/welcome_nginx_facebook \ + en/docs/faq/accept_failed \ + en/docs/faq/daemon_master_process_off \ + en/docs/faq/variables_in_config \ + en/docs/faq/chunked_encoding_from_backend \ + en/docs/faq/license_copyright FAQ_EN_XML = $(foreach name, $(FAQ_EN), xml/$(name).xml) FAQ_EN_HTML = $(foreach name, $(FAQ_EN), $(OUT)/$(name).html)
--- a/xml/en/docs/faq/chunked_encoding_from_backend.xml +++ b/xml/en/docs/faq/chunked_encoding_from_backend.xml @@ -12,7 +12,7 @@ My backend server appears to send HTTP/1.0 responses using chunked encoding but nginx doesn't handle it correctly. For instance, I'm using nginx as a frontend to my node.js -application and instead of pure JSON from backend nginx +application and instead of pure JSON from backend, nginx returns something framed in decimal numbers like <programlisting>
--- a/xml/en/docs/faq/daemon_master_process_off.xml +++ b/xml/en/docs/faq/daemon_master_process_off.xml @@ -21,7 +21,7 @@ in a production environment? <para> <initial>A:</initial> First of all, both "daemon on|off" and "master_process on|off" directives were -intended to be used primarily for nginx code develpment. +intended to be used primarily for nginx code development. </para> <para> @@ -35,7 +35,7 @@ option with "daemon off". In a development environment, using "master_process off", nginx can run in the foreground without the master process and can be terminated simply with ^C (SIGINT). This is somewhat similar to running Apache with -an 'X' commandline option. However you should NEVER run nginx in production +an 'X' command-line option. However you should NEVER run nginx in production with "master_process off". </para>
--- a/xml/en/docs/faq/license_copyright.xml +++ b/xml/en/docs/faq/license_copyright.xml @@ -24,6 +24,11 @@ when using nginx as part of a proprietar 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>. + +<programlisting> +This product contains software provided by Nginx, Inc. and its contributors. +</programlisting> + </para> <para> @@ -32,10 +37,6 @@ products: zlib, PCRE, OpenSSL — it copyright acknowledgements and disclaimers as well. </para> -<programlisting> -This product contains software provided by Nginx, Inc. and its contributors. -</programlisting> - </section> </article>
--- a/xml/en/docs/sys_errlist.xml +++ b/xml/en/docs/sys_errlist.xml @@ -11,6 +11,7 @@ <section> <para> +<initial>Q:</initial> While building nginx version 0.7.66, 0.8.35 or higher on Linux the following warning messages are issued: @@ -21,6 +22,10 @@ warning: `sys_nerr' is deprecated; use `strerror' or `strerror_r' instead </programlisting> +</para> + +<para> +<initial>A:</initial> This is normal: nginx has to use the deprecated sys_errlist[] and sys_nerr in signal handlers because strerror() and strerror_r() functions are not Async-Signal-Safe.