From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bastien <bastien.guerry@wikimedia.fr>
Subject: Re: [PATCH] Update conflict documentation
Date: Sat, 15 Jan 2011 12:40:50 +0100
Message-ID: <8762tqcrt1.fsf@altern.org>
References: <1294773678-45568-1-git-send-email-jrhorn424@gmail.com>
	<83bp3ml5ts.fsf@yahoo.it>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=38048 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Pe4bM-0003CG-ER
	for emacs-orgmode@gnu.org; Sat, 15 Jan 2011 06:47:25 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bastienguerry@googlemail.com>) id 1Pe4bK-0005Ng-AN
	for emacs-orgmode@gnu.org; Sat, 15 Jan 2011 06:47:23 -0500
Received: from mail-wy0-f169.google.com ([74.125.82.169]:51711)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bastienguerry@googlemail.com>) id 1Pe4bK-0005Mw-3j
	for emacs-orgmode@gnu.org; Sat, 15 Jan 2011 06:47:22 -0500
Received: by mail-wy0-f169.google.com with SMTP id 26so3728077wyj.0
	for <emacs-orgmode@gnu.org>; Sat, 15 Jan 2011 03:47:21 -0800 (PST)
In-Reply-To: <83bp3ml5ts.fsf@yahoo.it> (Giovanni Ridolfi's message of "Wed, 12
	Jan 2011 12:27:59 +0100")
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: Giovanni Ridolfi <giovanni.ridolfi@yahoo.it>
Cc: Jeffrey Horn <jrhorn424@gmail.com>, emacs-orgmode@gnu.org, Carsten Dominik <carsten.dominik@gmail.com>

Hi Giovanni,

Giovanni Ridolfi <giovanni.ridolfi@yahoo.it> writes:

> 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?

I'm not sure there is a correct and a wrong way.  

I tend to use "Org" when referring to the large set of Org-related
features and libraries, and I use "Org-mode" when referring to the core
features of the mode itself -- but it's not that easy to determine, and
context is important.  Let's keep this in mind and fix only the obvious
cases (if any!)

Thanks,

-- 
 Bastien