summaryrefslogtreecommitdiff
path: root/contributing
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@schwinge.name>2011-05-15 14:42:05 +0200
committerThomas Schwinge <thomas@schwinge.name>2011-05-15 14:42:05 +0200
commit94ad916c245beba839b564de08c4ee899bc5206e (patch)
tree7820e5c963e100b57d2e8e26c25ae012c5f61843 /contributing
parente5742f0449a5e925361ab56f5a1acbfcf570a76e (diff)
contributing/web_pages/news/writing_the_moth: Repair Arne's attempt to ``resolve merge conflict''.
Diffstat (limited to 'contributing')
-rw-r--r--contributing/web_pages/news/writing_the_moth.mdwn5
1 files changed, 2 insertions, 3 deletions
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