diff options
Diffstat (limited to 'contributing')
| -rw-r--r-- | contributing/web_pages.mdwn | 4 | ||||
| -rw-r--r-- | contributing/web_pages/news.mdwn | 54 |
2 files changed, 58 insertions, 0 deletions
diff --git a/contributing/web_pages.mdwn b/contributing/web_pages.mdwn index f1388bc2..db8ab4d6 100644 --- a/contributing/web_pages.mdwn +++ b/contributing/web_pages.mdwn @@ -48,6 +48,10 @@ we do have some simple requests. Please try to match the *tone* of your topics and edits with the existing topics. If we all pull in the same direction these pages will be more useful for everyone, especially for our own use. +### News Items + +There are [[more detailed instructions about editing news items|news]]. + ## Staging Area When you commit changes, either using the web interface or checking them in diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn new file mode 100644 index 00000000..f365bc79 --- /dev/null +++ b/contributing/web_pages/news.mdwn @@ -0,0 +1,54 @@ +[[!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 title="HowTo prepare and publish 'a month of the Hurd' for the next month"]] + +We prepare the month of the Hurd in a public git branch (master-news_next) and merge it once we want to publish the news. + +For practical work that means, we use the following commands: + +* create a local branch for news_next + + git fetch && git checkout -b master-news_next origin/master-news_next + +* get the latest version of news_next when you already created a local version of the branch + + git fetch && git checkout master-news_next + +Always do check which branch you're on (asterisk in the first column of +``git branch'''s output), and only then begin to do your changes and +commit them. + +* create a new news entry + + cp news/yyyy-mm-dd.mdwn news/YYYY-MM-DD.mdwn + (edit the new file) + git add news/YYYY-MM-DD.mdwn + git commit -m "Begun the news entry for YYYY-MM-DD." + +(just copy the most recent news file) + +* check the outgoing changes + + git log --reverse -p -C origin/master-news_next..master-news_next + +* push the changes + + git push origin master-news_next:master-news_next + +* if push fails, pull and rebase + + git pull --rebase + +* publish the news + + git checkout master && git merge master-news_next + +That means, for publishing we merge master-news_next into master. |