emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Giovanni Ridolfi <giovanni.ridolfi@yahoo.it>
To: Jeffrey Horn <jrhorn424@gmail.com>
Cc: emacs-orgmode@gnu.org, Carsten Dominik <carsten.dominik@gmail.com>
Subject: Re: [PATCH] Update conflict documentation
Date: Wed, 12 Jan 2011 12:27:59 +0100	[thread overview]
Message-ID: <83bp3ml5ts.fsf@yahoo.it> (raw)
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")

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

next prev parent reply	other threads:[~2011-01-12 11:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-11 19:21 [PATCH] Update conflict documentation Jeffrey Horn
2011-01-12 11:27 ` Giovanni Ridolfi [this message]
2011-01-15 11:40   ` Bastien

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=83bp3ml5ts.fsf@yahoo.it \
    --to=giovanni.ridolfi@yahoo.it \
    --cc=carsten.dominik@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=jrhorn424@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).