From mboxrd@z Thu Jan  1 00:00:00 1970
From: Giovanni Ridolfi <giovanni.ridolfi@yahoo.it>
Subject: Re: [PATCH] Update conflict documentation
Date: Wed, 12 Jan 2011 12:27:59 +0100
Message-ID: <83bp3ml5ts.fsf@yahoo.it>
References: <1294773678-45568-1-git-send-email-jrhorn424@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=37377 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Pcyqo-0000yw-Ro
	for emacs-orgmode@gnu.org; Wed, 12 Jan 2011 06:26:52 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <giovanni.ridolfi@yahoo.it>) id 1Pcyqk-0002da-EJ
	for emacs-orgmode@gnu.org; Wed, 12 Jan 2011 06:26:47 -0500
Received: from nm19.bullet.mail.ukl.yahoo.com ([217.146.183.193]:21113)
	by eggs.gnu.org with smtp (Exim 4.71)
	(envelope-from <giovanni.ridolfi@yahoo.it>) id 1Pcyqk-0002cu-5e
	for emacs-orgmode@gnu.org; Wed, 12 Jan 2011 06:26:46 -0500
In-Reply-To: <1294773678-45568-1-git-send-email-jrhorn424@gmail.com> (Jeffrey
	Horn's message of "Tue, 11 Jan 2011 14:21:18 -0500")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Jeffrey Horn <jrhorn424@gmail.com>
Cc: emacs-orgmode@gnu.org, Carsten Dominik <carsten.dominik@gmail.com>

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