diff options
| author | intrigeri <intrigeri@boum.org> | 2009-01-15 20:04:31 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-01-15 20:04:31 +0100 |
| commit | e6992480e2e0cf965650f84aa97e01fe0fa71544 (patch) | |
| tree | b4c1743a8f99d22788e190b46f5cb1c09b9b50bb /doc/examples/blog | |
| parent | 48de7f9c7b387ca9f21294b47efc58e7dd64c6ad (diff) | |
| parent | 63fe022602b622eb80bd38d64ee272b543ce0418 (diff) | |
Merge commit 'upstream/master' into prv/po
Conflicts:
debian/control
Diffstat (limited to 'doc/examples/blog')
| -rw-r--r-- | doc/examples/blog/index.mdwn | 11 | ||||
| -rw-r--r-- | doc/examples/blog/posts/first_post.mdwn | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn index 6daf9db50..84c732dd1 100644 --- a/doc/examples/blog/index.mdwn +++ b/doc/examples/blog/index.mdwn @@ -1,14 +1,13 @@ -[[!meta title="example blog"]] - [[!pagestats pages="./tags/*"]] -Welcome to my blog. Have a look at the most recent posts below, or -browse the tag cloud on the right. An archive of all [[posts]] is also -available. +Welcome to my blog. + +Have a look at the most recent posts below, or browse the tag cloud on the +right. An archive of all [[posts]] is also available. [[!inline pages="./posts/* and !*/Discussion" show="10" actions=yes rootpage="posts"]] ---- -This wiki is powered by [ikiwiki](http://ikiwiki.info). +This blog is powered by [ikiwiki](http://ikiwiki.info). diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn index 3d7174ae8..d49432341 100644 --- a/doc/examples/blog/posts/first_post.mdwn +++ b/doc/examples/blog/posts/first_post.mdwn @@ -1,4 +1,4 @@ This is the first post to this example blog. To add new posts, just add -files to the blog/posts/ subdirectory, or use the web form. +files to the posts/ subdirectory, or use the web form. [[!tag tags/tech]] |