diff options
| -rw-r--r-- | contributing/copyright_assignment.mdwn | 28 | ||||
| -rw-r--r-- | rules/savannah_group.mdwn | 18 | ||||
| -rw-r--r-- | source_repositories.mdwn | 7 |
3 files changed, 35 insertions, 18 deletions
diff --git a/contributing/copyright_assignment.mdwn b/contributing/copyright_assignment.mdwn new file mode 100644 index 00000000..b65594de --- /dev/null +++ b/contributing/copyright_assignment.mdwn @@ -0,0 +1,28 @@ +[[!meta copyright="Copyright © 2006, 2007, 2008, 2009, 2011 Free Software +Foundation, Inc."]] + +[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable +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]]."]]"""]] + +If you have pieces of code or documentation to contribute, then, in order to +install them into our [[source_repositories]], you have to assign the copyright +of your changes to the [Free Software Foundation](http://www.fsf.org/). + +The assignment for [[GNU Mach|microkernel/mach/gnumach]] additionally covers +[[microkernel/mach/mig/GNU_MIG]] (which used to be a component of GNU Mach, and +logically still is). + +The assignment for [[GNU Hurd|hurd]] additionally covers the separate +[[source_repositories/incubator]], [[libpthread]], [[hurd/translator/procfs]], +[[hurd/translator/unionfs]], [[microkernel/viengoos]], +[[web|contributing/web_pages]] repositories, and possibly more. + +Amongst others, the assignments for [[binutils]], [[GCC]], [[GDB]], [[glibc]] +are separate ones. + +Please [[contact_us]] to request the needed forms. diff --git a/rules/savannah_group.mdwn b/rules/savannah_group.mdwn index 4e2cf357..9ade863e 100644 --- a/rules/savannah_group.mdwn +++ b/rules/savannah_group.mdwn @@ -1,13 +1,13 @@ -[[!meta copyright="Copyright © 2006, 2007, 2008, 2009 Free Software Foundation, -Inc."]] +[[!meta copyright="Copyright © 2006, 2007, 2008, 2009, 2011 Free Software +Foundation, Inc."]] [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable 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]]."]]"""]] <http://savannah.gnu.org/projects/hurd/> @@ -27,13 +27,3 @@ the [[contributing/questionnaire]]. The list of members can be seen at <http://savannah.gnu.org/project/memberlist.php?group=hurd>. - -<a name="copyright_assignment"> -## Copyright assignment -</a> - -If you have pieces of code or documentation to contribute, then, in order to -install them into our [[source_repositories]], you have to assign the copyright -of your changes to the [Free Software Foundation](http://www.fsf.org/). - -Please [[contact_us]] to request the needed forms. 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 |