summaryrefslogtreecommitdiff
path: root/source_repositories.mdwn
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@schwinge.name>2011-09-01 18:18:22 +0200
committerThomas Schwinge <thomas@schwinge.name>2011-09-01 18:18:22 +0200
commita5a9125e150036c21f0571e03cd6095eaad22fa1 (patch)
tree92c27b27489ff44f3d1cc655cc273a8cb449ffc2 /source_repositories.mdwn
parent68050298fb0802235af8449c4b08c4b06b20f697 (diff)
contributing/copyright_assignment: Clarify different GNU projects.
Diffstat (limited to 'source_repositories.mdwn')
-rw-r--r--source_repositories.mdwn7
1 files changed, 3 insertions, 4 deletions
diff --git a/source_repositories.mdwn b/source_repositories.mdwn
index 5ac90b5..9f2f2e7 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