Merge remote-tracking branch 'dirichlet.SCHWINGE/master'

4 files changed, 4 insertions, 55 deletions

diff --git a/microkernel/faq.mdwn b/microkernel/faq.mdwn
deleted file mode 100644
index fe259f05..00000000
--- a/microkernel/faq.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-[[!meta copyright="Copyright © 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 title="Microkernel FAQ"]]
-
-See also other [[/FAQ]].
-
-[[!inline
-pages="microkernel/faq/* and !*/discussion"
-show=0
-feeds=no
-actions=yes
-rootpage="microkernel/faq" postformtext="Add a new item titled:"]]
diff --git a/microkernel/faq/multiserver_microkernel.mdwn b/microkernel/faq/multiserver_microkernel.mdwn
deleted file mode 100644
index ca9b2179..00000000
--- a/microkernel/faq/multiserver_microkernel.mdwn
+++ /dev/null
@@ -1,26 +0,0 @@
-[[!meta copyright="Copyright © 2001, 2002, 2003, 2004, 2005, 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]]."]]"""]]
-
-[[!meta title="What is a Multiserver Microkernel?"]]
-
-A Microkernel has nothing to do with the size of the kernel.  Rather, it refers
-to the functionality that the kernel provides.  It is generally agreed that
-this is; a set of interfaces to allow processes to communicate and a way to
-talk to the hardware.  *Software drivers*, as we like to call them, are then
-implemented in user space as servers.  The most obvious examples of these are
-the TCP/IP stack, the ext2 filesystem and NFS.  In the case of the Hurd, users
-now have access to functionality that, in a monolithic kernel, they could never
-use, but now, because the server runs in user space as the user that started
-it, they may, for instance, mount an FTP filesystem in their home directory.
-
-For more information about the design of the Hurd, read the paper by Thomas
-Bushnell, BSG:
-[[Towards_a_New_Strategy_of_OS_Design|hurd-paper]].
diff --git a/microkernel/mach/gnumach/building.mdwn b/microkernel/mach/gnumach/building.mdwn
index 427fb083..0f328bb7 100644
--- a/microkernel/mach/gnumach/building.mdwn
+++ b/microkernel/mach/gnumach/building.mdwn
@@ -1,5 +1,5 @@
-[[!meta copyright="Copyright © 2006, 2007, 2008, 2011 Free Software Foundation,
-Inc."]]
+[[!meta copyright="Copyright © 2006, 2007, 2008, 2011, 2013 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
@@ -28,8 +28,6 @@ You can either use the git repository (see <http://git.savannah.gnu.org/cgit/hur
 
     $ apt-get source gnumach
 
-Please see the Debian [[running/debian/FAQ]] before using `apt-get source`.
-
 ## On Debian Systems:
 
 ### Preparing for the Build
diff --git a/microkernel/mach/mig/gnu_mig/building.mdwn b/microkernel/mach/mig/gnu_mig/building.mdwn
index e7d3c150..be79b02d 100644
--- a/microkernel/mach/mig/gnu_mig/building.mdwn
+++ b/microkernel/mach/mig/gnu_mig/building.mdwn
@@ -1,5 +1,5 @@
-[[!meta copyright="Copyright © 2006, 2007, 2008, 2011 Free Software Foundation,
-Inc."]]
+[[!meta copyright="Copyright © 2006, 2007, 2008, 2011, 2013 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
@@ -26,8 +26,6 @@ RCS](http://git.savannah.gnu.org/cgit/hurd/):
 
     $ apt-get source mig
 
-Please see the Debian [[hurd/running/debian/FAQ]] before using _apt-get source_.
-
 The unpacked source tree is around 1 MiB, and the build tree also is around 1 MiB.
 
 ## <a name="_on_Debian_systems"> On Debian Systems: </a>