From c811b25017f7bd4f43d1f068a974812ae62e045b Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@schwinge.name>
Date: Mon, 25 Jan 2010 10:17:13 +0100
Subject: Fix spelling (skeleton), make it a subpage of news, only refer to
 skeleton, some fixes in the news skeleton.

---
 contributing/web_pages/news-skelleton.mdwn | 32 -----------------------------
 contributing/web_pages/news.mdwn           |  9 ++++----
 contributing/web_pages/news/skeleton.mdwn  | 33 ++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 contributing/web_pages/news-skelleton.mdwn
 create mode 100644 contributing/web_pages/news/skeleton.mdwn

(limited to 'contributing/web_pages')

diff --git a/contributing/web_pages/news-skelleton.mdwn b/contributing/web_pages/news-skelleton.mdwn
deleted file mode 100644
index 8d888ea3..00000000
--- a/contributing/web_pages/news-skelleton.mdwn
+++ /dev/null
@@ -1,32 +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="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 d79e710c..a9a33170 100644
--- a/contributing/web_pages/news.mdwn
+++ b/contributing/web_pages/news.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2009 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2009, 2010 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
@@ -53,14 +53,13 @@ For practical work that means to use the following commands:
 
       * at the beginning of a month: create a new news entry
 
-            $ cp news/2009-12-31.mdwn news/YYYY-MM-DD.mdwn
+            $ cp contributing/web_pages/news/skeleton.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-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)*.  
+        That is, use the [[news_skelleton|skeleton]] as a template for the new
+        news snippet.
 
   * check the outgoing changes
 
diff --git a/contributing/web_pages/news/skeleton.mdwn b/contributing/web_pages/news/skeleton.mdwn
new file mode 100644
index 00000000..0d0af8de
--- /dev/null
+++ b/contributing/web_pages/news/skeleton.mdwn
@@ -0,0 +1,33 @@
+[[!meta copyright="Copyright © 2010 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"]]
+-->
+
+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 
+> 
+
+"""]]
-- 
cgit v1.2.3