contributing/web_pages/news: Polish some more.

5 files changed, 108 insertions, 135 deletions

diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn
index 4edd491a..54fa788d 100644
--- a/contributing/web_pages/news.mdwn
+++ b/contributing/web_pages/news.mdwn
@@ -1,4 +1,5 @@
-[[!meta copyright="Copyright © 2009, 2010 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2009, 2010, 2011 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
@@ -8,34 +9,28 @@ 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="""How to prepare and publish "a month of the Hurd" for the last
+[[!meta title="""How to prepare and publish a "Month of the Hurd" for the last
 month"""]]
 
-We prepare *A Month of the Hurd* in the file [[contributing/web_pages/news/news_moth_next]].  The idea is
+We prepare a *Month of the Hurd* in the file [[moth_next]].  The idea is
 to record to-be-published changes in that file at they time they arise, and
-then publish them en bloc at the end of the month.
+then publish them en bloc at the end of the month.  There are instructions for
+[[writing_the_moth]].
 
-* At the end of the month: prepare for publishing the news
+  * At the end of the month: prepare for publishing the MotH, then send the raw
+    Markdown text to the mailing list, asking for feedback.
 
-    Edit the news entry's *meta date* value to the timestamp when the news
-    entry is [[published|news]].  We have to set that one manually, as
-    otherwise the timestamp of the news entry file's creation will be taken,
-    which is (much) earlier, and not what we want.  We do not set the *meta
-    updated* value, as it's correct to update that one upon further
-    modifications of the news entries. 
-
-* Then send it to the mailing list, include all feedback ... 
+  * ..., and publish.
 
-* ... and publish
+        $ git mv contributing/web_pages/news/moth_next.mdwn news/YYYY-MM.mdwn
 
-        $ git cp contributing/web_pages/news/news_moth_next.mdwn news/yyyy-mm.mdwn
-        $ git commit -m "Added MotH yyyy-mm"
+    Edit the news entry's *meta date* value to the timestamp when the news
+    entry is published.  We have to set that one manually, as otherwise the
+    timestamp of the news entry file's creation will be taken, which is (much)
+    earlier, and not what we want.  We do not set the *meta updated* value, as
+    it's correct to update that one upon further modifications of the news
+    entries.
+
+        $ git cp contributing/web_pages/news/skeleton.mdwn contributing/web_pages/news/moth_next.mdwn
+        $ git commit -m 'MotH YYYY-MM.'
         $ git push origin master
-
-## Information for *writing* the Month of the Hurd
-
-[[!inline
-pages="contributing/web_pages/news/*"
-show=5
-feeds=no
-actions=yes]]
diff --git a/contributing/web_pages/news/moth_next.mdwn b/contributing/web_pages/news/moth_next.mdwn
new file mode 100644
index 00000000..1d543634
--- /dev/null
+++ b/contributing/web_pages/news/moth_next.mdwn
@@ -0,0 +1,44 @@
+[[!meta copyright="Copyright © 2011 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]]."]]"""]]
+
+<!-- Date when the news item is (to be) pulished (important for RSS feeds).
+Will be set by tschwinge when publishing.
+[[!meta date="YYYY-MM-DD HH:MM UTC"]]
+-->
+
+<!-- This is just a skeleton.  Use it to create a new MotH.  -->
+
+A month of the Hurd: *TODO*, *TODO*, and *TODO*.
+[[!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="""
+
+<!--basic structure of a MotH entry. Adapt, reduce and add points as needed. At the end, try to make the text flow as a whole.-->
+
+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.-->
+
+"""]]
diff --git a/contributing/web_pages/news/news_moth_next.mdwn b/contributing/web_pages/news/news_moth_next.mdwn
deleted file mode 100644
index 3d7442ec..00000000
--- a/contributing/web_pages/news/news_moth_next.mdwn
+++ /dev/null
@@ -1,84 +0,0 @@
-[[!meta copyright="Copyright © 2011 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]]."]]"""]]
-
-<!-- Date when the news item is (to be) pulished (important for RSS feeds).
-Will be set by tschwinge when publishing.
-[[!meta date="YYYY-MM-DD HH:MM UTC"]]
--->
-
-*This is just the working draft. When it is finished, remove this line, adapt the meta tags, and copy it to /news/yyyy-mm.mdwn for publication. Then copy skelleton.mdwn to news-moth-next.mdwn (overwrite) to start the next moth. Feel free to add news items below, but know that the news are open to heavy reworking.*
-
-A month of the Hurd: *TODO*, *TODO* and *TODO*.
-[[!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="""
-
-<!--basic structure of a MotH entry-->
-
-> This month [hurd hacker]  [item]
-> 
-> Also …
-> 
-> [our hackers] …
-> 
-> Mainly thanks to …
-> 
-> Additionally …
-> 
-> And …
-> 
-> [reason for contibuting to the Hurd]
-
-
-
-Watch these places for news:
-
-  * GNU
-
-      * <http://lists.gnu.org/archive/html/bug-hurd/YYYY-MM/threads.html>
-
-      * <http://lists.gnu.org/archive/html/commit-hurd/YYYY-MM/threads.html>
-
-      * <http://lists.gnu.org/archive/html/help-hurd/YYYY-MM/threads.html>
-
-      * <http://lists.gnu.org/archive/html/web-hurd/YYYY-MM/threads.html>
-
-      * <http://lists.gnu.org/archive/html/hurd-devel/YYYY-MM/threads.html>
-
-      * <http://sourceware.org/ml/libc-alpha/YYYY-MM/>
-
-        Also Git log.
-
-      * (<http://sourceware.org/ml/libc-hacker/YYYY-MM/>)
-
-      * (<http://sourceware.org/ml/glibc-cvs/YYYY-qQ/>)
-
-        Better use the Git log.
-
-      * <http://lists.gnu.org/archive/html/l4-hurd/YYYY-MM/threads.html>
-
-  * Debian
-
-      * <http://lists.debian.org/debian-hurd/YYYY/MM/>
-
-      * <http://lists.debian.org/debian-glibc/YYYY/MM/>
-
-  * Arch Hurd
-
-      * <http://www.archhurd.org/news.php>
-
-      * <http://planet.archhurd.org/>
-
-      * (<http://lists.archhurd.org/devel/maillist.html>)
-
-"""]]
diff --git a/contributing/web_pages/news/skeleton.mdwn b/contributing/web_pages/news/skeleton.mdwn
index 2fe2578a..1d543634 100644
--- a/contributing/web_pages/news/skeleton.mdwn
+++ b/contributing/web_pages/news/skeleton.mdwn
@@ -13,9 +13,9 @@ Will be set by tschwinge when publishing.
 [[!meta date="YYYY-MM-DD HH:MM UTC"]]
 -->
 
-<!-- This is just a skelleton. Reuse it to create a news item. -->
+<!-- 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: *TODO*, *TODO*, and *TODO*.
 [[!if test="included()" then="""[[!toggle id=full_news
 text="Details."]][[!toggleable id=full_news text="[[!paste id=full_news]]"]]"""
 else="
@@ -25,19 +25,19 @@ 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 whole.-->
 
-> This month [hurd hacker]  [item]
-> 
-> Also …
-> 
-> [our hackers] …
-> 
-> Mainly thanks to …
-> 
-> Additionally …
-> 
-> And …
-> 
-> [reason for contibuting to the Hurd]
+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.-->
 
diff --git a/contributing/web_pages/news/writing_the_moth.mdwn b/contributing/web_pages/news/writing_the_moth.mdwn
index 56f570b2..d6fd03e3 100644
--- a/contributing/web_pages/news/writing_the_moth.mdwn
+++ b/contributing/web_pages/news/writing_the_moth.mdwn
@@ -1,22 +1,40 @@
-# Short guide to writing the MotH 
+[[!meta copyright="Copyright © 2010, 2011 Free Software Foundation, Inc."]]
 
-A simple guideline for writing the Month of the Hurd.
+[[!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]]."]]"""]]
 
-### individual news items
+# Short Guide for Writing the MotH 
 
-The basic structure for a news-item is as follows: [person with link] did [task with link to testable code/patch] which brings us further towards [goal] by [short, easily understandable description of the contribution].
 
-Each news item should show a step towards the mission of the Hurd. From our [[community/weblogs/antrik/hurd-mission-statement|mission_statement]] you can glean the following basic goals: 
+## Individual News Items
 
-* Better support for day-to-day desktop use (more packages, more stable, more drivers, easier to setup, …).
-* More user freedom and possibilities for programs/translators.
-* Technical advancement.
-* More unique or at least interesting features.
-* Attract more developers and/or users.
+The basic structure for a news item is as follows: *\[person with](link) did
+\[task with}(link to testable code/patch) which brings us further towards
+\[[goal]] by [short, easily understandable description of the contribution]*.
 
-The reason for this structure is to resolve the problem that many people think that the Hurd won’t ever be finished by concentrating on the improvements and the steps towards completing our mission - but only once they have actually been done (to avoid showing anything which might become vaporware).
+Each news item should show a step towards the mission of the Hurd.  From our
+[[mission statement|community/weblogs/antrik/hurd-mission-statement]] you can
+glean the following basic goals:
 
-### sources for news
+  * Better support for day-to-day desktop use (more packages, more stable, more
+    drivers, easier to setup, ...).
+  * More user freedom and possibilities for programs/translators.
+  * Technical advancement.
+  * More unique or at least interesting features.
+  * Attract more developers and/or users.
+
+The reason for this structure is to resolve the problem that many people think
+that the Hurd won't ever be finished by concentrating on the improvements and
+the steps towards completing our mission -- but only once they have actually
+been done (to avoid showing anything which might become vaporware).
+
+
+## Sources for News Items
 
 Watch these places for news: