Merge remote-tracking branch 'flubber/master' into gsoc

Conflicts:
	user/jkoenig/java.mdwn

1 files changed, 7 insertions, 24 deletions

diff --git a/contributing/web_pages/news/moth_next.mdwn b/contributing/web_pages/news/moth_next.mdwn
index 766207f2..82933f94 100644
--- a/contributing/web_pages/news/moth_next.mdwn
+++ b/contributing/web_pages/news/moth_next.mdwn
@@ -15,7 +15,7 @@ Will be set by tschwinge when publishing.
 
 <!-- This is just a skeleton.  Use it to create a new MotH.  -->
 
-A month of the Hurd: *TODO*, *TODO*, and *TODO*.
+A month of the Hurd: *graphical installer*, *GSoC*, and *Debian inclusion plan*.
 [[!if test="included()" then="""[[!toggle id=full_news
 text="Details."]][[!toggleable id=full_news text="[[!paste id=full_news]]"]]"""
 else="
@@ -25,37 +25,20 @@ else="
 
 <!--basic structure of a MotH entry. Adapt, reduce and add points as needed. At the end, try to make the text flow as a unified whole.-->
 
-* Jeremie Koenig works on Java on Hurd as his GSoC project, bringing not only Java to the Hurd but also adding missing parts in Hurd pthreads which helps gcj. As first treat he added signal improvements³.
-    - ¹: http://www.bddebian.com/~hurd-web/user/jkoenig/java/
-    - ³: http://lists.gnu.org/archive/html/bug-hurd/2011-05/msg00182.html
+The last two months Samuel Thibault [created](http://lists.gnu.org/archive/html/bug-hurd/2011-05/msg00189.html) the first Debian GNU/Hurd CD set with a graphical installer. You can dowload it at [the usual place for debian cdimages](http://people.debian.org/~sthibault/hurd-i386/installer/cdimage/).
 
-* Samuel Thibault created the first Debian GNU/Hurd CD set with a graphical installer http://lists.gnu.org/archive/html/bug-hurd/2011-05/msg00189.html . Dowload it at [the usual place for debian cdimages](http://people.debian.org/~sthibault/hurd-i386/installer/cdimage/).
+Also Jeremie Koenig started working on his [[Google_Summer_of_Code_project|user/jkoenig/java]]: bringing not only Java to the Hurd but also adding missing parts in Hurd pthreads. As first treat he [added signal improvements](http://lists.gnu.org/archive/html/bug-hurd/2011-05/msg00182.html).
 
-* Tanguy LE CARROUR offered to sponsor some Hurd work, and followed up on his offer by adding Hurd bounties on FOSS factory - claim them if you can! http://www.gnu.org/software/hurd/news/2011-05-02-foss_factory.html
+Meanwhile Tanguy le Carrour offered to sponsor some Hurd work, and followed up on his offer by adding Hurd bounties on FOSS factory - [[claim_them_if_you_can|news/2011-05-02-foss_factory]]! It’s no full additional GSoC, but a step in the right direction. So, if you have more money than time and want the Hurd to succeed, why don’t you join Tanguy?
 
-* Samuel Thibault fixed a port-leak in file_reparent which got visible in the debian builder. http://lists.gnu.org/archive/html/bug-hurd/2011-05/msg00025.html
+On the technical side, Samuel Thibault [fixed a port-leak](http://lists.gnu.org/archive/html/bug-hurd/2011-05/msg00025.html) in file_reparent which got visible in the debian builder.
 
-* The respective next MotH is now prepared [[publicly_in_the_wiki|contributing/web_pages/news/moth_next]], lowering the barrier of entry for news-writing. Feel free to [[contribute|contributing/web_pages/news]].
+And on the organizational side, the Hurd now has a clear path to full inclusion in Debian: Since we now have a graphical installer, the next goal is to get as many packages ported as freekbsd (85%) for Wheezy, sometime between mid 2012 and beginning of 2013. We currently are at about 65%, so, if you always wanted to contribute to the Hurd and did not know how to help most effectively: [[Porting|contributing#porting]] is a great way to help improving the Hurd, especially now!
 
-* Plan for Debian GNU/Hurd: Get about 85% of packages ported and become a full Debian project for Wheezy (probably planed for something like between summer 2012 and winter 2013). We currently are at about 65%, so, if you always wanted to contribute to the Hurd and did not know how to help most effectively: [[Porting|contributing#porting]] is a great way to help improving the Hurd!
+Finally, if you think that the MotH needs some spice up or misses crucial information, it is now much easier to contribute to it, because from this version onward, it is prepared [[publicly_in_the_wiki|contributing/web_pages/news/moth_next]], lowering the barrier of entry for news-writing. Feel free to [[contribute|contributing/web_pages/news]]!
 
-* [[community/meetings/ghm2011]]
 
 
-This month [hurd hacker]  [item]
-
-Also …
-
-[our hackers] …
-
-Mainly thanks to …
-
-Additionally …
-
-And …
-
-[reason for contibuting to the Hurd]
-
 <!--see [[contributing/web_pages/news/writing_the_moth]] for additional information on writing the MotH.-->
 
 """]]