Re: [PATCH] Update conflict documentation

[Giovanni Ridolfi <giovanni.ridolfi@yahoo.it>]

Jeffrey Horn <jrhorn424@gmail.com> writes:

> This patch updates the conflict documentation regarding yasnippet to use Eric Schulte's fix.
> ---
>  doc/org.texi |   21 ++++++++++++++++++++-
>  1 files changed, 20 insertions(+), 1 deletions(-)
>
> diff --git a/doc/org.texi b/doc/org.texi
> index e83909d..b0667e4 100644
> --- a/doc/org.texi
> +++ b/doc/org.texi
> @@ -13423,7 +13423,7 @@ to have other replacement keys, look at the variable
>  
>  @item @file{yasnippet.el}
>  @cindex @file{yasnippet.el}
> -The way Org-mode binds the TAB key (binding to @code{[tab]} instead of
> +The way Org mode binds the TAB key (binding to @code{[tab]} instead
>  of

IIRC we have already discussed the right way to refer to our beloved 
Unique ;-)  GNU/Emacs mode:

"Org-mode" or "Org mode" ? 

I think Carsten wrote something but, I can't get any reference, sorry :-( 

In the site I thik that it is (almost) always written "Org-mode" or "Org".

In the info file of my version[1] there are both the two strings.

So  
1. What is the correct way?
2. I'm willing to make a patch replacing, in the latest org.texi,
   M-% wrong-string right-string         ;-)
  
cheers,
Giovanni

[1] a bit old I know:
Org-mode version 7.4 commit-de39bf05bea84b842711faa49e560ea4bc087211