Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/web

3 files changed, 4 insertions, 37 deletions

diff --git a/community/gsoc/project_ideas.mdwn b/community/gsoc/project_ideas.mdwn
index c7b5ab1a..10270612 100644
--- a/community/gsoc/project_ideas.mdwn
+++ b/community/gsoc/project_ideas.mdwn
@@ -88,8 +88,6 @@ other: language_bindings, gnat, gccgo, perl_python.  -->
 [[!inline pages="community/gsoc/project_ideas/gdb" show=0 feeds=no actions=yes]]
 [[!inline pages="community/gsoc/project_ideas/tcp_ip_stack" show=0 feeds=no actions=yes]]
 [[!inline pages="community/gsoc/project_ideas/nfs" show=0 feeds=no actions=yes]]
-<!-- Richard, This task actually looks too big for a GSoC project.
-[[!inline pages="community/gsoc/project_ideas/smp" show=0 feeds=no actions=yes]] -->
 [[!inline pages="community/gsoc/project_ideas/sound" show=0 feeds=no actions=yes]]
 [[!inline pages="community/gsoc/project_ideas/disk_io_performance" show=0 feeds=no actions=yes]]
 [[!inline pages="community/gsoc/project_ideas/vm_tuning" show=0 feeds=no actions=yes]]
diff --git a/community/gsoc/project_ideas/gnumach_cleanup.mdwn b/community/gsoc/project_ideas/gnumach_cleanup.mdwn
index 3be0d91e..11b4889f 100644
--- a/community/gsoc/project_ideas/gnumach_cleanup.mdwn
+++ b/community/gsoc/project_ideas/gnumach_cleanup.mdwn
@@ -1,12 +1,13 @@
-[[!meta copyright="Copyright © 2008, 2009 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2008, 2009, 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
 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]]."]]"""]]
 
 [[!meta title="GNU Mach Code Cleanup"]]
 
diff --git a/community/gsoc/project_ideas/smp.mdwn b/community/gsoc/project_ideas/smp.mdwn
deleted file mode 100644
index c6da2c41..00000000
--- a/community/gsoc/project_ideas/smp.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-[[!meta copyright="Copyright © 2012, 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
-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="SMP"]]
-
-See also the [[FAQ entry|faq/smp]].
-
-
-# IRC, freenode, #hurd, 2012-09-30
-
-    <braunr> i expect smp to be our next gsoc project
-
-
-## IRC, freenode, #hurd, 2013-01-02
-
-    <braunr> i'd like to mentor someone for adding smp to gnumach
-
-
-## IRC, freenode, #hurd, 2013-03-14
-
-    <braunr> but i'm afraid we'll have to fight obscur smp-safety issues
-    <braunr> for one, drivers are much probably not smp safe and would require
-      a big kernel lock
-    <braunr> userspace (such as signal delivery in libc) might be affected too
-    <braunr> smp isn't that easy