From 513908c16470b9a2b62e96d5866535dcdbd2d6df Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Sat, 14 May 2011 01:37:35 +0200 Subject: a bit of work on the news skelleton. --- contributing/web_pages/news/skeleton.mdwn | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'contributing') diff --git a/contributing/web_pages/news/skeleton.mdwn b/contributing/web_pages/news/skeleton.mdwn index 9867fd21..94fcf738 100644 --- a/contributing/web_pages/news/skeleton.mdwn +++ b/contributing/web_pages/news/skeleton.mdwn @@ -13,7 +13,9 @@ Will be set by tschwinge when publishing. [[!meta date="YYYY-MM-DD HH:MM UTC"]] --> -A month of the Hurd: *TODO* / *TODO* / *TODO*. + + +A month of the Hurd: *TODO*, *TODO* and *TODO*. [[!if test="included()" then="""[[!toggle id=full_news text="Details."]][[!toggleable id=full_news text="[[!paste id=full_news]]"]]""" else=" @@ -21,6 +23,22 @@ else=" [[!cut id="full_news" text=""" + + +> This month [hurd hacker] [item] +> +> Also … +> +> [our hackers] … +> +> Mainly thanks to … +> +> Additionally … +> +> And … +> +> [reason for contibuting to the Hurd] + Watch these places for news: * GNU -- cgit v1.2.3 From f7b9030ff3f335663ff3d252d2658ba539851b56 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Sat, 14 May 2011 01:45:13 +0200 Subject: guide to writing the moth --- contributing/web_pages/news/writing-the-moth.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 contributing/web_pages/news/writing-the-moth.mdwn (limited to 'contributing') diff --git a/contributing/web_pages/news/writing-the-moth.mdwn b/contributing/web_pages/news/writing-the-moth.mdwn new file mode 100644 index 00000000..64f7acdf --- /dev/null +++ b/contributing/web_pages/news/writing-the-moth.mdwn @@ -0,0 +1,17 @@ +# Short guide to writing the MotH + +A simple guideline for writing the Month of the Hurd. + +### individual news items + +The basic structure for a news-item is as follows: [person with link] did [task with link to testable code/patch] which brings us further towards [goal] by [short, easily understandable description of the contribution]. + +Each news item should show a step towards the mission of the Hurd. From our [[community/weblogs/antrik/hurd-mission-statement|mission_statement]] you can glean the following basic goals: + +* Better support for day-to-day desktop use (more packages, more stable, more drivers, easier to setup, …). +* More user freedom and possibilities for programs/translators. +* Technical advancement. +* More unique or at least interesting features. +* Attract more developers and/or users. + +The reason for this structure is to resolve the problem that many people think that the Hurd won’t ever be finished by concentrating on the improvements and the steps towards completing our mission - but only once they have actually been done (to avoid showing anything which might become vaporware). -- cgit v1.2.3 From 06c51f3b123128cb9db566fb5acdd722368d12f2 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Sat, 14 May 2011 01:53:38 +0200 Subject: use underscores in the moth_next --- contributing/web_pages/news/news_moth_next.mdwn | 84 +++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 contributing/web_pages/news/news_moth_next.mdwn (limited to 'contributing') diff --git a/contributing/web_pages/news/news_moth_next.mdwn b/contributing/web_pages/news/news_moth_next.mdwn new file mode 100644 index 00000000..3d7442ec --- /dev/null +++ b/contributing/web_pages/news/news_moth_next.mdwn @@ -0,0 +1,84 @@ +[[!meta copyright="Copyright © 2011 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]]."]]"""]] + + + +*This is just the working draft. When it is finished, remove this line, adapt the meta tags, and copy it to /news/yyyy-mm.mdwn for publication. Then copy skelleton.mdwn to news-moth-next.mdwn (overwrite) to start the next moth. Feel free to add news items below, but know that the news are open to heavy reworking.* + +A month of the Hurd: *TODO*, *TODO* and *TODO*. +[[!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 [hurd hacker] [item] +> +> Also … +> +> [our hackers] … +> +> Mainly thanks to … +> +> Additionally … +> +> And … +> +> [reason for contibuting to the Hurd] + + + +Watch these places for news: + + * GNU + + * + + * + + * + + * + + * + + * + + Also Git log. + + * () + + * () + + Better use the Git log. + + * + + * Debian + + * + + * + + * Arch Hurd + + * + + * + + * () + +"""]] -- cgit v1.2.3 From 58977d87fa6b9be17ebd5507cf8d3790ec824f1b Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Sat, 14 May 2011 02:00:36 +0200 Subject: moth writing cleanup --- contributing/web_pages/news.mdwn | 99 ++++------------------- contributing/web_pages/news/skeleton.mdwn | 40 +-------- contributing/web_pages/news/writing-the-moth.mdwn | 42 ++++++++++ 3 files changed, 58 insertions(+), 123 deletions(-) (limited to 'contributing') diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index a700c3ad..39d9dbde 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -11,100 +11,31 @@ License|/fdl]]."]]"""]] [[!meta title="""How to prepare and publish "a month of the Hurd" for the last month"""]] -We prepare *a month of the Hurd* in a public git branch (`master-news_next`), -and merge that one into `master` once we want to publish the news. The idea is -to record to-be-published changes on that branch at they time they arise, and +We prepare *A Month of the Hurd* in the file [[contributing/web_pages/news/news_moth_next]]. The idea is +to record to-be-published changes in that file at they time they arise, and then publish them en bloc at the end of the month. -As this is done on a separate branch, there are two options: you can have -separate repositories (*clones*, or *checkouts*; what you get from `git clone`) -for the `master` and `master-news_next` branches, or you can deal with both in -the same repository. Having separate repositories you don't have to remember -which branch you're on, and don't have to switch between branches before -beginning to edit files, and it doesn't matter -- as no switching between -branches is needed -- if you have uncomitted changes to some files. On the -other hand, you may want to keep it all in one repository, to save disk space, -and for shuffling different branches' commits being (a bit) easier. - -For practical work that means to use the following commands: - - * create a local branch for `master-news_next` - - $ git fetch - $ git checkout -b master-news_next origin/master-news_next - - * if you already have created a local branch `master-news_next`: update to - the latest version of it - - $ git checkout master-news_next - $ git pull --rebase - - * edit - - 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. - - We should not update news items that have already been published (that is, - on ; no problem for the - [[staging area|web_pages#staging_area]]), as the system will always also - update the RSS feeds, etc., causing the old news item to reappear on feeds, - which is a bit of a nuisance. - - * at the beginning of a month: create a new news entry - - $ cp contributing/web_pages/news/skeleton.mdwn news/YYYY-MM.mdwn - $ # edit the new file, then add the changes in git - $ git add news/YYYY-MM.mdwn - $ git commit -m "Begun the news entry for YYYY-MM." - - That is, use the [[news skeleton|skeleton]] as a template for the new - news snippet. It also includes a list of the places to watch for news. - - * 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 - - * if push fails, pull and rebase the local changes on top of the remote - changes - - $ git pull --rebase - - This will only happen if someone else has been installing commits into - `origin`'s `master-news_next` branch since the last time you - synchronized to it. - - Note that this might cause some conflicts to arise -- if the remote - repository contains commits that conflict with any that you've been - recording in your local repository. For this reason, you might want to - already do this *rebase* before beginning you local edits, simply to - shorten the time frame in which such conflicts can arise. - (Theoretically, in the very rare case of very much concurrent editing - going on, you'd have to repeat this again (and again...) before - succeeding to push your changes.) - - * at the end of the month: prepare for publishing the news +* At the end of the month: prepare for publishing the news 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. + modifications of the news entries. + +* Then send it to the mailing list, include all feedback ... - * ... and publish +* ... and publish - $ git checkout master - $ git pull --rebase - $ git merge master-news_next + $ git cp contributing/web_pages/news/news_moth_next news/yyyy-mm + $ git commit -m "Added MotH yyyy-mm" $ git push origin master - That means, for publishing we merge `master-news_next` into `master`. - After that merge, work for the next month's news item can continue on - `master-news_next`. +## Information for *writing* the Month of the Hurd - Arne Babenhauserheide uses a [[merge-news]] script for doing this. +[[!inline +pages="contributing/web_pages/news/*" +show=5 +feeds=no +actions=yes]] diff --git a/contributing/web_pages/news/skeleton.mdwn b/contributing/web_pages/news/skeleton.mdwn index 94fcf738..bf7a980c 100644 --- a/contributing/web_pages/news/skeleton.mdwn +++ b/contributing/web_pages/news/skeleton.mdwn @@ -39,44 +39,6 @@ else=" > > [reason for contibuting to the Hurd] -Watch these places for news: - - * GNU - - * - - * - - * - - * - - * - - * - - Also Git log. - - * () - - * () - - Better use the Git log. - - * - - * Debian - - * - - * - - * Arch Hurd - - * - - * - - * () + """]] diff --git a/contributing/web_pages/news/writing-the-moth.mdwn b/contributing/web_pages/news/writing-the-moth.mdwn index 64f7acdf..56f570b2 100644 --- a/contributing/web_pages/news/writing-the-moth.mdwn +++ b/contributing/web_pages/news/writing-the-moth.mdwn @@ -15,3 +15,45 @@ Each news item should show a step towards the mission of the Hurd. From our [[co * Attract more developers and/or users. The reason for this structure is to resolve the problem that many people think that the Hurd won’t ever be finished by concentrating on the improvements and the steps towards completing our mission - but only once they have actually been done (to avoid showing anything which might become vaporware). + +### sources for news + +Watch these places for news: + + * GNU + + * + + * + + * + + * + + * + + * + + Also Git log. + + * () + + * () + + Better use the Git log. + + * + + * Debian + + * + + * + + * Arch Hurd + + * + + * + + * () -- cgit v1.2.3 From 5eebd602c3e0625040ea5a714e68bfe8aa49e92c Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Sat, 14 May 2011 02:02:03 +0200 Subject: polish --- contributing/web_pages/news/skeleton.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contributing') diff --git a/contributing/web_pages/news/skeleton.mdwn b/contributing/web_pages/news/skeleton.mdwn index bf7a980c..2fe2578a 100644 --- a/contributing/web_pages/news/skeleton.mdwn +++ b/contributing/web_pages/news/skeleton.mdwn @@ -23,7 +23,7 @@ else=" [[!cut id="full_news" text=""" - + > This month [hurd hacker] [item] > -- cgit v1.2.3 From 68c34dd555fe52f38cc0e75483bb8fb688652c0a Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Sat, 14 May 2011 02:02:25 +0200 Subject: underscores for filenames --- contributing/web_pages/news/writing-the-moth.mdwn | 59 ----------------------- contributing/web_pages/news/writing_the_moth.mdwn | 59 +++++++++++++++++++++++ 2 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 contributing/web_pages/news/writing-the-moth.mdwn create mode 100644 contributing/web_pages/news/writing_the_moth.mdwn (limited to 'contributing') diff --git a/contributing/web_pages/news/writing-the-moth.mdwn b/contributing/web_pages/news/writing-the-moth.mdwn deleted file mode 100644 index 56f570b2..00000000 --- a/contributing/web_pages/news/writing-the-moth.mdwn +++ /dev/null @@ -1,59 +0,0 @@ -# Short guide to writing the MotH - -A simple guideline for writing the Month of the Hurd. - -### individual news items - -The basic structure for a news-item is as follows: [person with link] did [task with link to testable code/patch] which brings us further towards [goal] by [short, easily understandable description of the contribution]. - -Each news item should show a step towards the mission of the Hurd. From our [[community/weblogs/antrik/hurd-mission-statement|mission_statement]] you can glean the following basic goals: - -* Better support for day-to-day desktop use (more packages, more stable, more drivers, easier to setup, …). -* More user freedom and possibilities for programs/translators. -* Technical advancement. -* More unique or at least interesting features. -* Attract more developers and/or users. - -The reason for this structure is to resolve the problem that many people think that the Hurd won’t ever be finished by concentrating on the improvements and the steps towards completing our mission - but only once they have actually been done (to avoid showing anything which might become vaporware). - -### sources for news - -Watch these places for news: - - * GNU - - * - - * - - * - - * - - * - - * - - Also Git log. - - * () - - * () - - Better use the Git log. - - * - - * Debian - - * - - * - - * Arch Hurd - - * - - * - - * () diff --git a/contributing/web_pages/news/writing_the_moth.mdwn b/contributing/web_pages/news/writing_the_moth.mdwn new file mode 100644 index 00000000..56f570b2 --- /dev/null +++ b/contributing/web_pages/news/writing_the_moth.mdwn @@ -0,0 +1,59 @@ +# Short guide to writing the MotH + +A simple guideline for writing the Month of the Hurd. + +### individual news items + +The basic structure for a news-item is as follows: [person with link] did [task with link to testable code/patch] which brings us further towards [goal] by [short, easily understandable description of the contribution]. + +Each news item should show a step towards the mission of the Hurd. From our [[community/weblogs/antrik/hurd-mission-statement|mission_statement]] you can glean the following basic goals: + +* Better support for day-to-day desktop use (more packages, more stable, more drivers, easier to setup, …). +* More user freedom and possibilities for programs/translators. +* Technical advancement. +* More unique or at least interesting features. +* Attract more developers and/or users. + +The reason for this structure is to resolve the problem that many people think that the Hurd won’t ever be finished by concentrating on the improvements and the steps towards completing our mission - but only once they have actually been done (to avoid showing anything which might become vaporware). + +### sources for news + +Watch these places for news: + + * GNU + + * + + * + + * + + * + + * + + * + + Also Git log. + + * () + + * () + + Better use the Git log. + + * + + * Debian + + * + + * + + * Arch Hurd + + * + + * + + * () -- cgit v1.2.3 From 7ce2c78efeb15b913d85b316d8189cc91176003b Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Sat, 14 May 2011 02:18:20 +0200 Subject: removed now obsolete merge-news script. --- contributing/web_pages/news/merge-news | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 contributing/web_pages/news/merge-news (limited to 'contributing') diff --git a/contributing/web_pages/news/merge-news b/contributing/web_pages/news/merge-news deleted file mode 100644 index 33c01b7b..00000000 --- a/contributing/web_pages/news/merge-news +++ /dev/null @@ -1,13 +0,0 @@ -#!/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 From 9f655451eec77bd3ea11004177b59a8fd5fe7e77 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Sat, 14 May 2011 02:20:28 +0200 Subject: fix: publish instructions missed the file suffix. --- contributing/web_pages/news.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contributing') diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index 39d9dbde..4edd491a 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -28,7 +28,7 @@ then publish them en bloc at the end of the month. * ... and publish - $ git cp contributing/web_pages/news/news_moth_next news/yyyy-mm + $ git cp contributing/web_pages/news/news_moth_next.mdwn news/yyyy-mm.mdwn $ git commit -m "Added MotH yyyy-mm" $ git push origin master -- cgit v1.2.3 From 57e9bbae7d991901c770d9bc3b83b06d43a20d25 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Sat, 14 May 2011 11:34:38 +0200 Subject: contributing/web_pages/news: Polish some more. --- contributing/web_pages/news.mdwn | 43 +++++------- contributing/web_pages/news/moth_next.mdwn | 44 ++++++++++++ contributing/web_pages/news/news_moth_next.mdwn | 84 ----------------------- contributing/web_pages/news/skeleton.mdwn | 30 ++++---- contributing/web_pages/news/writing_the_moth.mdwn | 42 ++++++++---- 5 files changed, 108 insertions(+), 135 deletions(-) create mode 100644 contributing/web_pages/news/moth_next.mdwn delete mode 100644 contributing/web_pages/news/news_moth_next.mdwn (limited to 'contributing') diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index 4edd491a..54fa788d 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -1,4 +1,5 @@ -[[!meta copyright="Copyright © 2009, 2010 Free Software Foundation, Inc."]] +[[!meta copyright="Copyright © 2009, 2010, 2011 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 @@ -8,34 +9,28 @@ 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="""How to prepare and publish "a month of the Hurd" for the last +[[!meta title="""How to prepare and publish a "Month of the Hurd" for the last month"""]] -We prepare *A Month of the Hurd* in the file [[contributing/web_pages/news/news_moth_next]]. The idea is +We prepare a *Month of the Hurd* in the file [[moth_next]]. The idea is to record to-be-published changes in that file at they time they arise, and -then publish them en bloc at the end of the month. +then publish them en bloc at the end of the month. There are instructions for +[[writing_the_moth]]. -* At the end of the month: prepare for publishing the news + * At the end of the month: prepare for publishing the MotH, then send the raw + Markdown text to the mailing list, asking for feedback. - 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. - -* Then send it to the mailing list, include all feedback ... + * ..., and publish. -* ... and publish + $ git mv contributing/web_pages/news/moth_next.mdwn news/YYYY-MM.mdwn - $ git cp contributing/web_pages/news/news_moth_next.mdwn news/yyyy-mm.mdwn - $ git commit -m "Added MotH yyyy-mm" + Edit the news entry's *meta date* value to the timestamp when the news + entry is published. 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. + + $ git cp contributing/web_pages/news/skeleton.mdwn contributing/web_pages/news/moth_next.mdwn + $ git commit -m 'MotH YYYY-MM.' $ git push origin master - -## Information for *writing* the Month of the Hurd - -[[!inline -pages="contributing/web_pages/news/*" -show=5 -feeds=no -actions=yes]] diff --git a/contributing/web_pages/news/moth_next.mdwn b/contributing/web_pages/news/moth_next.mdwn new file mode 100644 index 00000000..1d543634 --- /dev/null +++ b/contributing/web_pages/news/moth_next.mdwn @@ -0,0 +1,44 @@ +[[!meta copyright="Copyright © 2011 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]]."]]"""]] + + + + + +A month of the Hurd: *TODO*, *TODO*, and *TODO*. +[[!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 [hurd hacker] [item] + +Also … + +[our hackers] … + +Mainly thanks to … + +Additionally … + +And … + +[reason for contibuting to the Hurd] + + + +"""]] diff --git a/contributing/web_pages/news/news_moth_next.mdwn b/contributing/web_pages/news/news_moth_next.mdwn deleted file mode 100644 index 3d7442ec..00000000 --- a/contributing/web_pages/news/news_moth_next.mdwn +++ /dev/null @@ -1,84 +0,0 @@ -[[!meta copyright="Copyright © 2011 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]]."]]"""]] - - - -*This is just the working draft. When it is finished, remove this line, adapt the meta tags, and copy it to /news/yyyy-mm.mdwn for publication. Then copy skelleton.mdwn to news-moth-next.mdwn (overwrite) to start the next moth. Feel free to add news items below, but know that the news are open to heavy reworking.* - -A month of the Hurd: *TODO*, *TODO* and *TODO*. -[[!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 [hurd hacker] [item] -> -> Also … -> -> [our hackers] … -> -> Mainly thanks to … -> -> Additionally … -> -> And … -> -> [reason for contibuting to the Hurd] - - - -Watch these places for news: - - * GNU - - * - - * - - * - - * - - * - - * - - Also Git log. - - * () - - * () - - Better use the Git log. - - * - - * Debian - - * - - * - - * Arch Hurd - - * - - * - - * () - -"""]] diff --git a/contributing/web_pages/news/skeleton.mdwn b/contributing/web_pages/news/skeleton.mdwn index 2fe2578a..1d543634 100644 --- a/contributing/web_pages/news/skeleton.mdwn +++ b/contributing/web_pages/news/skeleton.mdwn @@ -13,9 +13,9 @@ Will be set by tschwinge when publishing. [[!meta date="YYYY-MM-DD HH:MM UTC"]] --> - + -A month of the Hurd: *TODO*, *TODO* and *TODO*. +A month of the Hurd: *TODO*, *TODO*, and *TODO*. [[!if test="included()" then="""[[!toggle id=full_news text="Details."]][[!toggleable id=full_news text="[[!paste id=full_news]]"]]""" else=" @@ -25,19 +25,19 @@ else=" -> This month [hurd hacker] [item] -> -> Also … -> -> [our hackers] … -> -> Mainly thanks to … -> -> Additionally … -> -> And … -> -> [reason for contibuting to the Hurd] +This month [hurd hacker] [item] + +Also … + +[our hackers] … + +Mainly thanks to … + +Additionally … + +And … + +[reason for contibuting to the Hurd] diff --git a/contributing/web_pages/news/writing_the_moth.mdwn b/contributing/web_pages/news/writing_the_moth.mdwn index 56f570b2..d6fd03e3 100644 --- a/contributing/web_pages/news/writing_the_moth.mdwn +++ b/contributing/web_pages/news/writing_the_moth.mdwn @@ -1,22 +1,40 @@ -# Short guide to writing the MotH +[[!meta copyright="Copyright © 2010, 2011 Free Software Foundation, Inc."]] -A simple guideline for writing the Month of the Hurd. +[[!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]]."]]"""]] -### individual news items +# Short Guide for Writing the MotH -The basic structure for a news-item is as follows: [person with link] did [task with link to testable code/patch] which brings us further towards [goal] by [short, easily understandable description of the contribution]. -Each news item should show a step towards the mission of the Hurd. From our [[community/weblogs/antrik/hurd-mission-statement|mission_statement]] you can glean the following basic goals: +## Individual News Items -* Better support for day-to-day desktop use (more packages, more stable, more drivers, easier to setup, …). -* More user freedom and possibilities for programs/translators. -* Technical advancement. -* More unique or at least interesting features. -* Attract more developers and/or users. +The basic structure for a news item is as follows: *\[person with](link) did +\[task with}(link to testable code/patch) which brings us further towards +\[[goal]] by [short, easily understandable description of the contribution]*. -The reason for this structure is to resolve the problem that many people think that the Hurd won’t ever be finished by concentrating on the improvements and the steps towards completing our mission - but only once they have actually been done (to avoid showing anything which might become vaporware). +Each news item should show a step towards the mission of the Hurd. From our +[[mission statement|community/weblogs/antrik/hurd-mission-statement]] you can +glean the following basic goals: -### sources for news + * Better support for day-to-day desktop use (more packages, more stable, more + drivers, easier to setup, ...). + * More user freedom and possibilities for programs/translators. + * Technical advancement. + * More unique or at least interesting features. + * Attract more developers and/or users. + +The reason for this structure is to resolve the problem that many people think +that the Hurd won't ever be finished by concentrating on the improvements and +the steps towards completing our mission -- but only once they have actually +been done (to avoid showing anything which might become vaporware). + + +## Sources for News Items Watch these places for news: -- cgit v1.2.3 From faa24a0f03c870504c1a4cd5e7f4597bab61dea9 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Sun, 15 May 2011 13:31:06 +0200 Subject: polish --- contributing/web_pages/news/writing_the_moth.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contributing') diff --git a/contributing/web_pages/news/writing_the_moth.mdwn b/contributing/web_pages/news/writing_the_moth.mdwn index 56f570b2..969e2652 100644 --- a/contributing/web_pages/news/writing_the_moth.mdwn +++ b/contributing/web_pages/news/writing_the_moth.mdwn @@ -6,7 +6,7 @@ A simple guideline for writing the Month of the Hurd. The basic structure for a news-item is as follows: [person with link] did [task with link to testable code/patch] which brings us further towards [goal] by [short, easily understandable description of the contribution]. -Each news item should show a step towards the mission of the Hurd. From our [[community/weblogs/antrik/hurd-mission-statement|mission_statement]] you can glean the following basic goals: +Each news item should show a step towards the mission of the Hurd. From [[community/weblogs/antrik/hurd-mission-statement]] you can glean the following basic goals: * Better support for day-to-day desktop use (more packages, more stable, more drivers, easier to setup, …). * More user freedom and possibilities for programs/translators. -- cgit v1.2.3 From 94ad916c245beba839b564de08c4ee899bc5206e Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Sun, 15 May 2011 14:42:05 +0200 Subject: contributing/web_pages/news/writing_the_moth: Repair Arne's attempt to ``resolve merge conflict''. --- contributing/web_pages/news/writing_the_moth.mdwn | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'contributing') diff --git a/contributing/web_pages/news/writing_the_moth.mdwn b/contributing/web_pages/news/writing_the_moth.mdwn index 1c824f69..82a25088 100644 --- a/contributing/web_pages/news/writing_the_moth.mdwn +++ b/contributing/web_pages/news/writing_the_moth.mdwn @@ -10,7 +10,6 @@ License|/fdl]]."]]"""]] # Short Guide for Writing the MotH -Each news item should show a step towards the mission of the Hurd. From [[community/weblogs/antrik/hurd-mission-statement]] you can glean the following basic goals: ## Individual News Items @@ -18,8 +17,8 @@ The basic structure for a news item is as follows: *\[person with](link) did \[task with}(link to testable code/patch) which brings us further towards \[[goal]] by [short, easily understandable description of the contribution]*. -Each news item should show a step towards the mission of the Hurd. From our -[[mission statement|community/weblogs/antrik/hurd-mission-statement]] you can +Each news item should show a step towards the mission of the Hurd. From +[[community/weblogs/antrik/hurd-mission-statement]] you can glean the following basic goals: * Better support for day-to-day desktop use (more packages, more stable, more -- cgit v1.2.3