summaryrefslogtreecommitdiff
path: root/contributing
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2009-11-24 00:35:43 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2009-11-24 00:35:43 +0100
commitd7004cc2b51a394da631fc58b5194b48c945ee6c (patch)
tree9fe2dddc1596cf83b342584adc2167fb922c9cff /contributing
parentdd26273133b630bd1dab1474efde36a4ec31d26d (diff)
parent81caacd9b518558f95cd3283eb119d66bc73fc5f (diff)
Merge branch 'master' of flubber:~hurd-web/hurd-web
Diffstat (limited to 'contributing')
-rw-r--r--contributing/web_pages/news.mdwn13
1 files changed, 8 insertions, 5 deletions
diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn
index 4c09e1ab..f5cb4344 100644
--- a/contributing/web_pages/news.mdwn
+++ b/contributing/web_pages/news.mdwn
@@ -54,7 +54,7 @@ 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
- $ # edit the new file
+ $ # 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."
@@ -89,9 +89,12 @@ For practical work that means to use the following commands:
* at the end of the month: prepare for publishing the news
- Edit the news entry's *meta date* and *meta updated* time values. For
- stability, we set these two explicitly instead of relying on ikiwiki's
- method of using the files' creation and modification dates.
+ 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.
* ... and publish
@@ -104,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 enws 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. \ No newline at end of file