From a5a9125e150036c21f0571e03cd6095eaad22fa1 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Thu, 1 Sep 2011 18:18:22 +0200 Subject: contributing/copyright_assignment: Clarify different GNU projects. --- source_repositories.mdwn | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source_repositories.mdwn') diff --git a/source_repositories.mdwn b/source_repositories.mdwn index 5ac90b5e..9f2f2e71 100644 --- a/source_repositories.mdwn +++ b/source_repositories.mdwn @@ -6,8 +6,8 @@ id="license" text="Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license -is included in the section entitled -[[GNU Free Documentation License|/fdl]]."]]"""]] +is included in the section entitled [[GNU Free Documentation +License|/fdl]]."]]"""]] This page is meant to give some guidelines. Please use good sense or ask on [[mailing_lists/bug-hurd]] if there are any questions. @@ -135,8 +135,7 @@ mainline changes. Merging from working branches into the mainline branches will usually be done by one of the project administrators, unless negotiated otherwise. For this to happen, the copyright of your changes has to be assigned to the Free Software -Foundation; read about the -[[copyright assignment_process|rules/savannah group#copyright_assignment]]. +Foundation; read about the [[contributing/copyright_assignment]] process. It is explicitly encouraged to *merge* changes from working branches into the mainline branches (as opposed to *rebase* them on top), as the former mode -- cgit v1.2.3