From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Eric Schulte" Subject: Re: [PATCH] Fix conflict doc Date: Tue, 11 Jan 2011 10:24:25 -0700 Message-ID: <87pqs3wdsd.fsf@gmail.com> References: Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from [140.186.70.92] (port=38891 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pci1H-0008JZ-Tn for emacs-orgmode@gnu.org; Tue, 11 Jan 2011 12:28:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pci1G-0002t4-Ml for emacs-orgmode@gnu.org; Tue, 11 Jan 2011 12:28:31 -0500 Received: from mail-yx0-f169.google.com ([209.85.213.169]:38943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pci1G-0002mm-KA for emacs-orgmode@gnu.org; Tue, 11 Jan 2011 12:28:30 -0500 Received: by mail-yx0-f169.google.com with SMTP id 31so9118233yxl.0 for ; Tue, 11 Jan 2011 09:28:30 -0800 (PST) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Jeff Horn Cc: Org-mode ml 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 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