Hi Brian,
I'd like to suggest to merge the two patches into one. Also, check your log message of patch 2. It looks like there's an empty line missing in line 2. Thanks, Corinna On Jul 9 19:15, Brian Inglis wrote: > --- > faq/faq.html | 25 ++++++++++++++----------- > 1 file changed, 14 insertions(+), 11 deletions(-) > > diff --git a/faq/faq.html b/faq/faq.html > index 846e087e..8659db5d 100644 > --- a/faq/faq.html > +++ b/faq/faq.html > @@ -57,10 +57,12 @@ freedoms, so it is free software. > <tr class="question"><td align="left" valign="top"><a > name="faq.what.version"></a><p><b>1.5.</b></p></td> > <td align="left" valign="top"><p>What version of Cygwin <span > class="emphasis"><em>is</em></span> this, anyway?</p></td></tr> > <tr class="answer"><td align="left" valign="top"></td><td align="left" > valign="top"> > - <p>As the Cygwin DLL takes the place of a Unix kernel, > - to find the version of the Cygwin DLL installed, > - you can use any of the Unix compatible commands: > + <p>To find the version of the Cygwin DLL installed, > + you can use: > <code class="command"><strong>uname -a</strong></code>; > + as you would for a Unix kernel. > + As the Cygwin DLL takes the place of a Unix kernel, > + you can also use any of the Unix compatible commands: > <code class="command"><strong>uname -srvm</strong></code>; > <code class="command"><strong>head /proc/version</strong></code>; > or the Cygwin command: > @@ -72,17 +74,18 @@ freedoms, so it is free software. > <p>If you are looking for the version number for the whole Cygwin > release, > there is none. > Each package in the Cygwin release has its own version, and the > - <code class="package">cygwin</code> package containing the Cygwin DLL > and > - Cygwin system specific utilities is just another (but very important!) > package. > + <code class="package">cygwin</code> package containing the Cygwin DLL > + and Cygwin system specific utilities is just another (but very > + important!) package. > The packages in Cygwin are continually improving, thanks to > the efforts of net volunteers who maintain the Cygwin binary ports. > Each package has its own version numbers and its own release process. > </p><p>So, how do you get the most up-to-date version of Cygwin? Easy. Just > download the Cygwin Setup program by following the instructions > <a class="ulink" href="https://cygwin.com/install.html"; > target="_top">here</a>. > -The setup program will handle the task of updating the packages on your > system > -to the latest version. For more information about using Cygwin's > -<code class="filename">setup.exe</code>, see > +The Setup program will handle the task of updating the packages on your > system > +to the latest version. For more information about using Cygwin's Setup > program, > +see > <a class="ulink" href="https://cygwin.com/cygwin-ug-net/setup-net.html"; > target="_top">Setting Up Cygwin</a> > in the Cygwin User's Guide. > </p></td></tr><tr class="question"><td align="left" valign="top"><a > name="faq.what.who"></a><p><b>1.6.</b></p></td><td align="left" > valign="top"><p>Who's behind the project?</p></td></tr><tr class="answer"><td > align="left" valign="top"></td><td align="left" valign="top"><p><span > class="bold"><strong>(Please note that if you have cygwin-specific > @@ -706,7 +709,8 @@ user with <code class="literal">cygrunsrv -u</code> (see > information). > </p></td></tr><tr class="question"><td align="left" valign="top"><a > name="faq.using.path"></a><p><b>4.5.</b></p></td><td align="left" > valign="top"><p>How should I set my PATH?</p></td></tr><tr class="answer"><td > align="left" valign="top"></td><td align="left" valign="top"><p>This is done > for you in the file /etc/profile, which is sourced by bash > when you start it from the Desktop or Start Menu shortcut, created by > -<code class="literal">setup.exe</code>. The line is > +the Cygwin Setup program. > +The line is > </p><pre class="screen"> > PATH="/usr/local/bin:/usr/bin:/bin:$PATH" > </pre><p>Effectively, this <span > class="bold"><strong>prepends</strong></span> /usr/local/bin and /usr/bin to > your > @@ -903,8 +907,7 @@ services like sshd) beforehand.</p><p>The only DLL that > is sanctioned by the Cyg > you get by running <a class="ulink" href="https://cygwin.com/install.html"; > target="_top">setup-x86.exe or setup-x86_64.exe</a>, > installed in a directory controlled by this program. If you have other > versions on your system and desire help from the cygwin project, you should > -delete or rename all DLLs that are not installed by > -<code class="filename">setup.exe</code>. > +delete or rename all DLLs that are not installed by the Cygwin Setup program. > </p><p>If you're trying to find multiple versions of the DLL that are causing > this problem, reboot first, in case DLLs still loaded in memory are the > cause. Then use the Windows System find utility to search your whole > -- > 2.27.0 -- Corinna Vinschen Cygwin Maintainer
