Apres-merge

docs/foundation-module/1-wp.html

@@ -155,8 +155,10 @@ just that installation and use of Foundation-built tools is less convenient.)
 <span class="plain-syntax">    </span><span class="identifier-syntax">start</span><span class="plain-syntax">.</span><span class="identifier-syntax">wShowWindow</span><span class="plain-syntax"> = </span><span class="identifier-syntax">SW_HIDE</span><span class="plain-syntax">;</span>
 
 <span class="plain-syntax">    </span><span class="identifier-syntax">PROCESS_INFORMATION</span><span class="plain-syntax"> </span><span class="identifier-syntax">process</span><span class="plain-syntax">;</span>
-<span class="plain-syntax">    </span><span class="reserved-syntax">if</span><span class="plain-syntax"> (</span><span class="identifier-syntax">CreateProcessA</span><span class="plain-syntax">(0, </span><span class="identifier-syntax">cmd_line</span><span class="plain-syntax">, </span><span class="constant-syntax">0</span><span class="plain-syntax">, </span><span class="constant-syntax">0</span><span class="plain-syntax">, </span><span class="constant-syntax">FALSE</span><span class="plain-syntax">, </span><span class="identifier-syntax">CREATE_NO_WINDOW</span><span class="plain-syntax">, </span><span class="constant-syntax">0</span><span class="plain-syntax">, </span><span class="constant-syntax">0</span><span class="plain-syntax">, &amp;</span><span class="identifier-syntax">start</span><span class="plain-syntax">, &amp;</span><span class="identifier-syntax">process</span><span class="plain-syntax">) == </span><span class="constant-syntax">0</span><span class="plain-syntax">)</span>
+<span class="plain-syntax">    </span><span class="reserved-syntax">if</span><span class="plain-syntax"> (</span><span class="identifier-syntax">CreateProcessA</span><span class="plain-syntax">(0, </span><span class="identifier-syntax">cmd_line</span><span class="plain-syntax">, </span><span class="constant-syntax">0</span><span class="plain-syntax">, </span><span class="constant-syntax">0</span><span class="plain-syntax">, </span><span class="constant-syntax">FALSE</span><span class="plain-syntax">, </span><span class="identifier-syntax">CREATE_NO_WINDOW</span><span class="plain-syntax">, </span><span class="constant-syntax">0</span><span class="plain-syntax">, </span><span class="constant-syntax">0</span><span class="plain-syntax">, &amp;</span><span class="identifier-syntax">start</span><span class="plain-syntax">, &amp;</span><span class="identifier-syntax">process</span><span class="plain-syntax">) == </span><span class="constant-syntax">0</span><span class="plain-syntax">) {</span>
+<span class="plain-syntax">        </span><span class="identifier-syntax">fprintf</span><span class="plain-syntax">(</span><span class="identifier-syntax">stderr</span><span class="plain-syntax">, </span><span class="string-syntax">"A Unix-like shell 'sh' (e.g. Cygwin or MinGW) must be in the path to run commands.\n"</span><span class="plain-syntax">);</span>
 <span class="plain-syntax">        </span><span class="reserved-syntax">return</span><span class="plain-syntax"> -1;</span>
+<span class="plain-syntax">    }</span>
 
 <span class="plain-syntax">    </span><span class="identifier-syntax">CloseHandle</span><span class="plain-syntax">(</span><span class="identifier-syntax">process</span><span class="plain-syntax">.</span><span class="identifier-syntax">hThread</span><span class="plain-syntax">);</span>
 <span class="plain-syntax">    </span><span class="reserved-syntax">if</span><span class="plain-syntax"> (</span><span class="identifier-syntax">WaitForSingleObject</span><span class="plain-syntax">(</span><span class="identifier-syntax">process</span><span class="plain-syntax">.</span><span class="identifier-syntax">hProcess</span><span class="plain-syntax">, </span><span class="identifier-syntax">INFINITE</span><span class="plain-syntax">) != </span><span class="identifier-syntax">WAIT_OBJECT_0</span><span class="plain-syntax">) {</span>

docs/foundation-module/3-cla.html

@@ -283,7 +283,7 @@ through the file if one has by that point been provided.
 <span class="plain-syntax">    }</span>
 <span class="plain-syntax">}</span>
 </pre>
-<ul class="endnotetexts"><li>The structure clf_reader_state is accessed in 2/dl, 2/mmr, 6/id, 6/sd, 8/ws and here.</li></ul>
+<ul class="endnotetexts"><li>The structure clf_reader_state is accessed in 1/wp, 2/dl, 2/mmr, 6/id, 6/sd, 8/ws and here.</li></ul>
 <p class="commentary firstcommentary"><a id="SP9"></a><b>&#167;9.  </b>We can also read the "command line" from a file. The following variable
 holds the filename to read from.
 </p>