From c25b99ab435d8241ab247ef0d86b33b41457f6dd Mon Sep 17 00:00:00 2001
From: Arne Babenhauserheide <arne_bab@web.de>
Date: Mon, 25 Jan 2010 09:32:41 +0100
Subject: news: Added a news-skelleton page in contributing/web_pages and a
 note that the merge can be done more conveniently by using a small shell
 script.

---
 contributing/web_pages/news-skelleton.mdwn | 32 ++++++++++++++++++++++++++++++
 contributing/web_pages/news.mdwn           | 25 +++++++++++++++++++----
 2 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 contributing/web_pages/news-skelleton.mdwn

(limited to 'contributing')

diff --git a/contributing/web_pages/news-skelleton.mdwn b/contributing/web_pages/news-skelleton.mdwn
new file mode 100644
index 00000000..8d888ea3
--- /dev/null
+++ b/contributing/web_pages/news-skelleton.mdwn
@@ -0,0 +1,32 @@
+[[!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="2010-01-31 00:00 UTC"]]
+
+[[!meta updated="2010-01-31 00:00 UTC"]]
+
+A month of the Hurd: **, ** and **. 
+[[!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 
+> 
+> Also 
+> 
+> Mainly thanks to 
+> 
+> Additionally 
+> 
+> And 
+> 
+
+"""]]
diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn
index f5cb4344..d79e710c 100644
--- a/contributing/web_pages/news.mdwn
+++ b/contributing/web_pages/news.mdwn
@@ -53,13 +53,14 @@ For practical work that means to use the following commands:
 
       * at the beginning of a month: create a new news entry
 
-            $ cp news/2009-07-31.mdwn news/YYYY-MM-DD.mdwn
+            $ cp news/2009-12-31.mdwn news/YYYY-MM-DD.mdwn
             $ # edit the new file, then add the changes in git
             $ git add news/YYYY-MM-DD.mdwn
             $ git commit -m "Begun the news entry for YYYY-MM-DD."
 
-        That is, use the *2009-07-31* news snippet as a template for the new
-        one.
+        That is, use the *2009-12-31* news snippet as a template for the new
+        one. Alternately you can use the [[news_skelleton|news-skelleton]] 
+        *(contributing/web_pages/news-skelleton.mdwn)*.  
 
   * check the outgoing changes
 
@@ -107,4 +108,20 @@ For practical work that means to use the following commands:
     After that merge, work for the next month's news item can continue on
     `master-news_next`.
 
-And since we're working in a branch anyway: Please commit often, push often and pull often! Few things would be nastier than having to do heavy merging on a news release date with little time at hand. 
\ No newline at end of file
+And since we're working in a branch anyway: Please commit often, push often and pull often! Few things would be nastier than having to do heavy merging on a news release date with little time at hand. 
+
+PS: If you're lazy, you can just use the following shell-script to merge the news into master: 
+
+> \#!/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
-- 
cgit v1.2.3