Re: [PATCH] Fix typo in faq-programming.xml

[Corinna Vinschen <corinna-cygwin@cygwin.com>]

Hi Hamish,

Thanks for the patch.

On Oct 25 19:50, Hamish McIntyre-Bhatty wrote:
> Hi there,
> 
> This is my first time submitting a patch over email, so hopefully I'll get
> it right. Are there eventually plans for submitting merge requests directly
> with git in some way?

No, but by email is usually simple by using `git format-patch' and
`git send-email'.

> This is a simple one-line patch to fix a typo I noticed in the programming
> FAQ. Patch follows below. I follow the list via GMANE, but to make sure I
> see any replies, it's probably best to reply to cygwin at hamishmb dot com.

The only problem with your patch is that all this text will become
part of the commit message.  What you should do is this:

- Hack your patch

- Commit it locally with a headline, an empty line, and a bit of
  descriptive text as commit message.  if it's an obvious patch,
  the headline may be sufficient.

- git format-patch -1
  This creates a file like 0001-foo.patch

- Now, if you want to add text to your mail which is *not* supposed
  to become part of the commit message, open the 0001-foo.patch file
  in your editor and add the editoral notes *after* the line consisting
  of only three dashes.

- Last, but not least, send the patch to the mailing list.  Assuming
  you did set user.email in your git config:

  git send-email --to='cygwin-patches@...' 0001-foo.patch

Do you want to try that or shall I push this with just the headline as
commit?


Thanks,
Corinna

> 
> Hamish
> 
> diff --git a/winsup/doc/faq-programming.xml b/winsup/doc/faq-programming.xml
> index c2c4004c1..7945b6b88 100644
> --- a/winsup/doc/faq-programming.xml
> +++ b/winsup/doc/faq-programming.xml
> @@ -1051,7 +1051,7 @@ a Windows environment which Cygwin handles
> automatically.
>  <question><para>How should I port my Unix GUI to Windows?</para></question>
>  <answer>
> 
> -<para>Like other Unix-like platforms, the Cygwin distribtion includes many
> of
> +<para>Like other Unix-like platforms, the Cygwin distribution includes many
> of
>  the common GUI toolkits, including X11, X Athena widgets, Motif, Tk, GTK+,
>  and Qt. Many programs which rely on these toolkits will work with little,
> if
>  any, porting work if they are otherwise portable.  However, there are a few