# HG changeset patch
# User Andrey Alexeev <andrew@nginx.com>
# Date 1322068780 0
# Node ID 19c060caf9655ace013bef50d303abb475da61ed
# Parent  8796246b31e14a9adb74bc8382e3698874e59a2f
- 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

diff -r 8796246b31e1 -r 19c060caf965 xml/en/GNUmakefile
--- a/xml/en/GNUmakefile	Wed Nov 23 16:42:05 2011 +0000
+++ b/xml/en/GNUmakefile	Wed Nov 23 17:19:40 2011 +0000
@@ -37,7 +37,12 @@
 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)
diff -r 8796246b31e1 -r 19c060caf965 xml/en/docs/faq/chunked_encoding_from_backend.xml
--- a/xml/en/docs/faq/chunked_encoding_from_backend.xml	Wed Nov 23 16:42:05 2011 +0000
+++ b/xml/en/docs/faq/chunked_encoding_from_backend.xml	Wed Nov 23 17:19:40 2011 +0000
@@ -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>
diff -r 8796246b31e1 -r 19c060caf965 xml/en/docs/faq/daemon_master_process_off.xml
--- a/xml/en/docs/faq/daemon_master_process_off.xml	Wed Nov 23 16:42:05 2011 +0000
+++ b/xml/en/docs/faq/daemon_master_process_off.xml	Wed Nov 23 17:19:40 2011 +0000
@@ -21,7 +21,7 @@
 <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 @@
 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>
 
diff -r 8796246b31e1 -r 19c060caf965 xml/en/docs/faq/license_copyright.xml
--- a/xml/en/docs/faq/license_copyright.xml	Wed Nov 23 16:42:05 2011 +0000
+++ b/xml/en/docs/faq/license_copyright.xml	Wed Nov 23 17:19:40 2011 +0000
@@ -24,6 +24,11 @@
 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 @@
 copyright acknowledgements and disclaimers as well.
 </para>
 
-<programlisting>
-This product contains software provided by Nginx, Inc. and its contributors.
-</programlisting>
-
 </section>
 
 </article>
diff -r 8796246b31e1 -r 19c060caf965 xml/en/docs/sys_errlist.xml
--- a/xml/en/docs/sys_errlist.xml	Wed Nov 23 16:42:05 2011 +0000
+++ b/xml/en/docs/sys_errlist.xml	Wed Nov 23 17:19:40 2011 +0000
@@ -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 @@
     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.