diff options
author | Joey Hess <joey@gnu.kitenet.net> | 2009-04-04 17:27:48 -0400 |
---|---|---|
committer | Joey Hess <joey@gnu.kitenet.net> | 2009-04-04 17:27:48 -0400 |
commit | 8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a (patch) | |
tree | 9e26465e0ca98a5f3cbc6c72a0cace4bf83b93db /doc/examples/blog | |
parent | 78a69e5bd632eb86ef8135e9c1d05d2c48b43362 (diff) | |
parent | 08fda4c9d374de1d3de3172a192d4d915d3dc0c1 (diff) |
Merge branch 'master'
Conflicts:
doc/ikiwiki-makerepo.mdwn
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]] |