Merge branch 'master' into external_pager_mechanism

Conflicts:
	microkernel/mach/external_pager_mechanism.mdwn

2 files changed, 51 insertions, 0 deletions

diff --git a/rules/savannah_group.mdwn b/rules/savannah_group.mdwn
new file mode 100644
index 00000000..4e2cf357
--- /dev/null
+++ b/rules/savannah_group.mdwn
@@ -0,0 +1,39 @@
+[[!meta copyright="Copyright © 2006, 2007, 2008, 2009 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]]."]]"""]]
+
+<http://savannah.gnu.org/projects/hurd/>
+
+# Group membership
+
+There is no need to be a formal member of the GNU Hurd Savannah group in order
+to be able to contribute to the system.  In fact, if we added every single soul
+that was interested in the Hurd to the Savannah group it'd probably have
+exploded by now.  We have the policy of adding people as soon as they are
+beginning to make substantial contributions.  Simply use the [[mailing lists]]
+for sending your contributions, for asking questions, and so on.
+
+Have a look at the page for [[contributing]].  Also be sure to have a look at
+the [[contributing/questionnaire]].
+
+## List of members
+
+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/rules/source_repositories.mdwn b/rules/source_repositories.mdwn
new file mode 100644
index 00000000..8215af3b
--- /dev/null
+++ b/rules/source_repositories.mdwn
@@ -0,0 +1,12 @@
+[[!meta copyright="Copyright © 2007, 2008, 2009, 2010 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]]."]]"""]]
+
+[[!meta redir=/source_repositories]]