Merge branch 'master' into master-news_next

2 files changed, 10 insertions, 32 deletions

diff --git a/news/2009-08-30.mdwn b/news/2009-09-30.mdwn
index 8b28b410..5deeb7f5 100644
--- a/news/2009-08-30.mdwn
+++ b/news/2009-09-30.mdwn
@@ -8,25 +8,27 @@ 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 date="2009-09-01 00:00 UTC"]]
+[[!meta date="2009-10-01 11:52 UTC"]]
 
-[[!meta updated="2009-09-01 00:00 UTC"]]
+[[!meta updated="2009-10-01 11:52 UTC"]]
 
-A month of the Hurd: *Successful Summer of Code: unionmount*.
+A month of the Hurd: *Successful Google Summer of Code project: unionmount*.
 [[!if test="included()" then="""[[!toggle id=full_news
 text="Details."]][[!toggleable id=full_news text="[[!paste id=full_news]]"]]"""
 else="[[!paste id=full_news]]"]]
 
 [[!cut id="full_news" text="""
-> This month saw the successful pencils down of the Google Summer of Code 2009, 
-> for which [[Sergiu_Ivanov|user/scolobb]] created a 
+> This month saw the successful completion of the Google Summer of Code 2009, 
+> for which [[Sergiu Ivanov|scolobb]] created a 
 > [[unionmount_translator|hurd/translator/unionmount]]. 
 > His work allows you to simply union one directory or translator into another one, 
 > so you see the files of both of them side by side. 
 > 
 > He was mentored by Olaf Buddenhagen and both are now working on polishing the code 
-> and extending the namespace based translator selection (nsmux) which allows you to 
-> read a node with a selected translator by simply appending ",,<translator>" to its name. 
+> and extending the namespace based translator selection ([[hurd/translator/nsmux]]) which allows you to 
+> read a node with a selected translator by simply appending `,,<translator>` to its name. 
 > 
-
+> That aside, we saw the usual steady rate of enhancement discussions, as well
+> as bugs getting fixed: X server crashing, preventing that GCC versions after
+> 4.2 optimize too much, etc.
 """]]
diff --git a/news/2009-09-31.mdwn b/news/2009-09-31.mdwn
deleted file mode 100644
index 04fdedb2..00000000
--- a/news/2009-09-31.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-[[!meta copyright="Copyright © 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 date="2009-09-01 00:00 UTC"]]
-
-[[!meta updated="2009-09-01 00:00 UTC"]]
-
-A month of the Hurd: ... .
-[[!if test="included()" then="""[[!toggle id=full_news
-text="Details."]][[!toggleable id=full_news text="[[!paste id=full_news]]"]]"""
-else="[[!paste id=full_news]]"]]
-
-[[!cut id="full_news" text="""
-> This month ...
-> 
-
-"""]]