summaryrefslogtreecommitdiff
path: root/contributing/web_pages/news
diff options
context:
space:
mode:
Diffstat (limited to 'contributing/web_pages/news')
-rw-r--r--contributing/web_pages/news/merge-news13
-rw-r--r--contributing/web_pages/news/moth_next.mdwn44
-rw-r--r--contributing/web_pages/news/skeleton.mdwn44
-rw-r--r--contributing/web_pages/news/writing_the_moth.mdwn77
4 files changed, 133 insertions, 45 deletions
diff --git a/contributing/web_pages/news/merge-news b/contributing/web_pages/news/merge-news
deleted file mode 100644
index 33c01b7b..00000000
--- a/contributing/web_pages/news/merge-news
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# merge into master
-git checkout master
-git pull --rebase
-git merge master-news_next
-
-# push master
-git push origin master
-
-# switch back to master-news_next
-git checkout master-news_next
-git pull --rebase
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/skeleton.mdwn b/contributing/web_pages/news/skeleton.mdwn
index 9867fd21..1d543634 100644
--- a/contributing/web_pages/news/skeleton.mdwn
+++ b/contributing/web_pages/news/skeleton.mdwn
@@ -13,7 +13,9 @@ Will be set by tschwinge when publishing.
[[!meta date="YYYY-MM-DD HH:MM UTC"]]
-->
-A month of the Hurd: *TODO* / *TODO* / *TODO*.
+<!-- 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="
@@ -21,44 +23,22 @@ else="
[[!cut id="full_news" text="""
-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.
+<!--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.-->
- * <http://lists.gnu.org/archive/html/l4-hurd/YYYY-MM/threads.html>
+This month [hurd hacker] [item]
- * Debian
+Also …
- * <http://lists.debian.org/debian-hurd/YYYY/MM/>
+[our hackers] …
- * <http://lists.debian.org/debian-glibc/YYYY/MM/>
+Mainly thanks to …
- * Arch Hurd
+Additionally …
- * <http://www.archhurd.org/news.php>
+And …
- * <http://planet.archhurd.org/>
+[reason for contibuting to the Hurd]
- * (<http://lists.archhurd.org/devel/maillist.html>)
+<!--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
new file mode 100644
index 00000000..82a25088
--- /dev/null
+++ b/contributing/web_pages/news/writing_the_moth.mdwn
@@ -0,0 +1,77 @@
+[[!meta copyright="Copyright © 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
+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]]."]]"""]]
+
+# Short Guide for Writing the MotH
+
+
+## Individual News Items
+
+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
+[[community/weblogs/antrik/hurd-mission-statement]] you can
+glean the following basic goals:
+
+ * 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:
+
+ * 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>)