emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: "Eric Schulte" <schulte.eric@gmail.com>
To: Jeff Horn <jrhorn424@gmail.com>
Cc: Org-mode ml <emacs-orgmode@gnu.org>
Subject: Re: [PATCH] Fix conflict doc
Date: Tue, 11 Jan 2011 10:24:25 -0700	[thread overview]
Message-ID: <87pqs3wdsd.fsf@gmail.com> (raw)
In-Reply-To: AANLkTik+9Ga4246N5Edrf3QLxB+hQQt_kge8MNZ16Hon@mail.gmail.com

Hi Jeff,

Thanks for putting this patch together, I've just checked it out and it
looks great.  It is now applied to the repository.

Also, thanks for submitting a documentation patch, the manual is an
incredible resource, and constant attention like this issue pointed out
by Puneeth and yourself are required to maintain it's usefulness.

If you think you may be submitting more patches in the future you may
want to consider going through the FSF assignment process [1].  The
process takes a while so it's best to have it completed before you have
a patch waiting in the wings.  Normally I wouldn't have been able to
apply this patch without you going through the process because it is
over 10 lines long, but since much of the patch consists of code
originally written by myself, I think it is ok this time.

Thanks for the contribution! -- Eric

Jeff Horn <jrhorn424@gmail.com> writes:

> (Eric, mind glancing at the patch?)
>
> In regard to the following message:
>
>     http://article.gmane.org/gmane.emacs.orgmode/35931
>
> This patch incorporates Eric Schulte's method of making org-mode work
> with yasnippet into the documentation.

Footnotes: 
[1]  http://orgmode.org/worg/org-contribute.html

      parent reply	other threads:[~2011-01-11 17:28 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-11  6:19 [PATCH] Fix conflict doc Jeff Horn
2011-01-11 16:35 ` Jeff Horn
2011-01-11 17:25   ` Nick Dokos
2011-01-11 17:24 ` Eric Schulte [this message]

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=87pqs3wdsd.fsf@gmail.com \
    --to=schulte.eric@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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).