From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bastien <bzg@altern.org>
Subject: Re: Merge org-7.7 into emacs
Date: Mon, 15 Aug 2011 15:57:31 +0200
Message-ID: <87fwl23hh0.fsf@gnu.org>
References: <87hb5tun28.fsf@mean.albasani.net>
	<CAMXnza1HgLhvqw5u_sEKkfzt6w8HVmCqob0QL=ivUaFMfbA=zg@mail.gmail.com>
	<87obzyhhy0.fsf@gmail.com> <87wrem1qth.fsf@mean.albasani.net>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:59882)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bastienguerry@googlemail.com>) id 1Qsxew-0000gq-9M
	for emacs-orgmode@gnu.org; Mon, 15 Aug 2011 09:56:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bastienguerry@googlemail.com>) id 1Qsxev-0008Ur-4D
	for emacs-orgmode@gnu.org; Mon, 15 Aug 2011 09:56:54 -0400
Received: from mail-wy0-f169.google.com ([74.125.82.169]:51732)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bastienguerry@googlemail.com>) id 1Qsxeu-0008Um-U4
	for emacs-orgmode@gnu.org; Mon, 15 Aug 2011 09:56:53 -0400
Received: by wyi11 with SMTP id 11so4094397wyi.0
	for <emacs-orgmode@gnu.org>; Mon, 15 Aug 2011 06:56:51 -0700 (PDT)
In-Reply-To: <87wrem1qth.fsf@mean.albasani.net> (Memnon Anon's message of
	"Tue, 9 Aug 2011 16:42:03 +0000 (UTC)")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: </archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Memnon Anon <gegendosenfleisch@googlemail.com>
Cc: emacs-orgmode@gnu.org

Hi Memnon and Eric,

Memnon Anon <gegendosenfleisch@googlemail.com> writes:

> Eric Schulte <schulte.eric@gmail.com> writes:
>
>> I believe 10 lines is the cutoff for whether a patch may be considered
>> "tiny" and thus whether it requires copyright attribution to the FSF.
>
> ,----[ http://orgmode.org/worg/org-contribute.html ]
> | If your patch is against a file that is part of Emacs, then your total
> | contribution (all patches you submit) should change less than 20 lines.
> | If you contribute more, you have to assign the copyright of your
> | contribution to the Free Software Foundation (see below).
> `----

Emacs says "fewer than 15 lines":

  http://bzr.savannah.gnu.org/lh/emacs/trunk/annotate/head:/etc/CONTRIBUTE

  We can accept small changes (roughly, fewer than 15 lines) without
  legal papers.  Anything more substantial requires a copyright
  disclaimer or assignment (the latter is preferred, especially for
  larger changes).  Both of these involved filling out a short form and
  filing it with the FSF.  The process is straightforward -- contact us
  at emacs-devel@gnu.org to obtain the relevant forms.

I've updated worg/org-contribute.org to reflect this.

-- 
 Bastien