Merge issue #9583: Document startup option/environment interaction.

author Andrew Svetlov <andrew.svetlov@gmail.com>

Wed, 17 Oct 2012 14:16:19 +0000 (17:16 +0300)

committer Andrew Svetlov <andrew.svetlov@gmail.com>

Wed, 17 Oct 2012 14:16:19 +0000 (17:16 +0300)
author Andrew Svetlov <andrew.svetlov@gmail.com>
Wed, 17 Oct 2012 14:16:19 +0000 (17:16 +0300)
committer Andrew Svetlov <andrew.svetlov@gmail.com>
Wed, 17 Oct 2012 14:16:19 +0000 (17:16 +0300)
diff --cc Doc/using/cmdline.rst
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Andrew Svetlov <andrew.svetlov@gmail.com>
	Wed, 17 Oct 2012 14:16:19 +0000 (17:16 +0300)
committer	Andrew Svetlov <andrew.svetlov@gmail.com>
	Wed, 17 Oct 2012 14:16:19 +0000 (17:16 +0300)
		1	2
Doc/using/cmdline.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history