diff options
| author | intrigeri <intrigeri@boum.org> | 2008-12-30 18:24:36 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2008-12-30 18:24:36 +0100 |
| commit | 21add7ffa87a5e622d18bdbb24c638c15bdb3800 (patch) | |
| tree | 6780aa6dbee71f18db64e44b012e789fc8197d4b /doc/forum | |
| parent | 3190e5cea75a43d38f58b8a45fbc87d5527d18f0 (diff) | |
| parent | 3032909090711c86c5056987043eeff5a1f6aec2 (diff) | |
Merge commit 'upstream/master' into prv/po
Conflicts:
debian/control
debian/copyright
doc/ikiwiki/pagespec.mdwn
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'doc/forum')
| -rw-r--r-- | doc/forum/discussion.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/forum/discussion.mdwn b/doc/forum/discussion.mdwn index 1e55d3f57..93cf4656e 100644 --- a/doc/forum/discussion.mdwn +++ b/doc/forum/discussion.mdwn @@ -1,4 +1,4 @@ -I like the idea of this forum heirarchy -- but I think a map would be clearer than inlining the sub-pages. -- [[JonDowland]] +I like the idea of this forum heirarchy -- but I think a map would be clearer than inlining the sub-pages. -- [[users/Jon]] > The easier way to accomplish this is to set archive=yes in the inline. > Switching to archive view can be useful when there are a lot of long |