Merge branch 'homepage'

1 files changed, 17 insertions, 17 deletions

diff --git a/contributing.mdwn b/contributing.mdwn
index 1946153e..aac255bd 100644
--- a/contributing.mdwn
+++ b/contributing.mdwn
@@ -20,9 +20,9 @@ There are various ways of contributing, read on about contributing to...
 
 # Documentation
 
-## These Wiki Pages
+## These Web Pages
 
-Please read about [[how_to_contribute_to_this_wiki|wiki]].
+Please read about [[how_to_contribute_to_these_web_pages|web_pages]].
 
 
 # The System Itself
@@ -33,12 +33,12 @@ There are essential two kinds of Hurd system designs.
 ## Hurd on Mach
 
 For one there's the implementation of the *[[Hurd]] running on the
-[[GNU_Mach_microkernel|microkernel/mach/gnumach]]*.  This is what is commonly
+[[microkernel/mach/GNU_Mach]] microkernel*.  This is what is commonly
 meant when people are talking about GNU/Hurd systems.
 
-This system has mostly been designed and implemented [in the
-'90s](http://www.gnu.org/software/hurd/history.html).  It works and is usable.
-For example, this wiki system [is running on a GNU/Hurd
+This system has mostly been designed and implemented
+[[in_the_'90s|hurd/history]].  It works and is usable.
+For example, these web pages are rendered on a [GNU/Hurd
 system](http://www.bddebian.com/cgi-bin/uptime).
 
 You can try it out for yourself: for getting access, installing
@@ -52,7 +52,7 @@ is another possibility, see the page about
 [[running_a_Hurd_system|hurd/running]] for the full story.
 
 Then you can either play around and eventually strive to do something
-useful or -- if you want -- ask us to assign something to you, depending
+useful or -- if you want -- [[ask_us|contact_us]] to assign something to you, depending
 on the skills you have and the resources you intend to invest.
 
 Please spend some time with thinking about the items in this [[questionnaire]].
@@ -62,10 +62,10 @@ system, e.g., [[microkernels_for_beginners|microkernel/for_beginners]].  Until
 you can do the basic exercises listed there, you won't be able to significantly
 contribute to the Hurd.
 
-For more reading resources, please see this whole wiki, and also
-<http://www.gnu.org/software/hurd/devel.html>,
-<http://www.gnu.org/software/hurd/docs.html> for links to a bunch of documents,
-and <http://www.gnu.org/software/hurd/> in general.
+For more reading resources, please see these web pages, for example,
+[[Hurd_documentation|hurd/documentation]] and
+[[Mach_documentation|microkernel/mach/documentation]] for links to a bunch of
+documents.
 
 ### Porting Packages
 
@@ -80,17 +80,17 @@ doesn't work or suit you and try to improve that.
 
 ### Open Issues: GNU Hurd
 
-Here is a [[list_of_open_issues|hurd/Open_Issues]] for the [[GNU_Hurd|hurd]].
+Here is a [[list_of_open_issues|hurd/open_issues]] for the [[GNU_Hurd|hurd]].
 
 ### Open Issues: GNU Mach
 
-Here is a [[list_of_open_issues|microkernel/mach/gnumach/Open_Issues]] for
-[[GNU_Mach|microkernel/mach/gnumach]].
+Here is a [[list_of_open_issues|microkernel/mach/gnu_mach/open_issues]] for
+[[microkernel/mach/GNU_Mach]].
 
 ### Open Issues: GNU MIG
 
-Here is a [[list_of_open_issues|microkernel/mach/mig/Open_Issues]] for
-[[GNU_MIG|microkernel/mach/mig]].
+Here is a [[list_of_open_issues|microkernel/mach/mig/gnu_mig/open_issues]] for
+[[microkernel/mach/mig/GNU_MIG]].
 
 
 <a name="hurd_on_modern_microkernel"> </a>
@@ -109,7 +109,7 @@ project.
 If you're interested in contributing in this area, knowing the *Hurd on Mach*
 system nevertheless is a prerequisite.  At least have a deep look at the
 documentation pointers given in the previous section.  Also read through the
-[[HurdNG|hurd/ng]] section of this wiki.
+[[HurdNG|hurd/ng]] section.
 
 Please send email to the [[mailing_lists/l4-hurd]] mailing list for discussing
 this post-Mach system design.