diff options
Diffstat (limited to 'contributing/web_pages/news.mdwn')
| -rw-r--r-- | contributing/web_pages/news.mdwn | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index f5cb4344..a9a86d75 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,13 +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-07-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-07-31* news snippet as a template for the new - one. + That is, use the [[news_skelleton|skeleton]] as a template for the new + news snippet. * check the outgoing changes @@ -107,4 +107,4 @@ 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 + Arne Babenhauserheide uses a [[merge-news]] script for doing this. |