From 0ea00036db93e696c6b4fd58afbfd67d4c020c46 Mon Sep 17 00:00:00 2001 From: o Date: Thu, 4 Dec 2008 15:34:12 -0500 Subject: --- doc/examples/blog/posts/oh.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/examples/blog/posts/oh.mdwn (limited to 'doc/examples') diff --git a/doc/examples/blog/posts/oh.mdwn b/doc/examples/blog/posts/oh.mdwn new file mode 100644 index 000000000..9daeafb98 --- /dev/null +++ b/doc/examples/blog/posts/oh.mdwn @@ -0,0 +1 @@ +test -- cgit v1.2.3 From 1c9881cf89e47e58ec99638aea421ca5e4e5b986 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 4 Dec 2008 16:23:41 -0500 Subject: remove clutter in example blog --- doc/examples/blog/posts/oh.mdwn | 1 - 1 file changed, 1 deletion(-) delete mode 100644 doc/examples/blog/posts/oh.mdwn (limited to 'doc/examples') diff --git a/doc/examples/blog/posts/oh.mdwn b/doc/examples/blog/posts/oh.mdwn deleted file mode 100644 index 9daeafb98..000000000 --- a/doc/examples/blog/posts/oh.mdwn +++ /dev/null @@ -1 +0,0 @@ -test -- cgit v1.2.3 From a0eee761f7ded1d5bacd96fe79300ec49384cba2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 21 Dec 2008 16:44:02 -0500 Subject: mention comments plugin --- doc/examples/blog.mdwn | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'doc/examples') diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index 3e89c4b99..afdabe316 100644 --- a/doc/examples/blog.mdwn +++ b/doc/examples/blog.mdwn @@ -12,7 +12,12 @@ Some additional configuration you might want to do: example of how to tag a post is: \[[!tag tags/life]] -* Enable the sidebar plugin to get a sidebar listing all the categories - you've tagged posts with. +* Enable the [[sidebar|plugin/sidebar]] plugin to get a sidebar listing all + the categories you've tagged posts with. -* Enable the pagestats plugin to get a tag cloud display on the [[index]]. +* Enable the [[pagestats|plugin/pagestats]] plugin to get a tag cloud +* display on the [[index]]. + +* Enable the [[comments|plugin/comments]] plugin and configure it to + enable comments to posts to the blog: + comments_pagespec => 'blog/posts/*', -- cgit v1.2.3 From 836bf625c9de3c7624c2863228662583b634a16f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 21 Dec 2008 16:45:59 -0500 Subject: formatting --- debian/changelog | 4 ++-- doc/examples/blog.mdwn | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'doc/examples') diff --git a/debian/changelog b/debian/changelog index 579617d33..5da87301b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (2.71) UNRELEASED; urgency=low +ikiwiki (2.71) unstable; urgency=low * comments: Blog-style comment support, contributed by Simon McVittie. * htmlbalance: New plugin contributed by Simon McVittie. @@ -27,7 +27,7 @@ ikiwiki (2.71) UNRELEASED; urgency=low affect sorting in inlines. * Improve display of some openids (smcv) - -- Joey Hess Mon, 17 Nov 2008 14:02:10 -0500 + -- Joey Hess Sun, 21 Dec 2008 16:22:05 -0500 ikiwiki (2.70) unstable; urgency=low diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index afdabe316..0861d42f7 100644 --- a/doc/examples/blog.mdwn +++ b/doc/examples/blog.mdwn @@ -20,4 +20,5 @@ Some additional configuration you might want to do: * Enable the [[comments|plugin/comments]] plugin and configure it to enable comments to posts to the blog: + comments_pagespec => 'blog/posts/*', -- cgit v1.2.3 From 63b919b2308d3c392c98850ad5ec1c65593cdf5a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 21 Dec 2008 16:48:15 -0500 Subject: fix links --- doc/examples/blog.mdwn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/examples') diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index 0861d42f7..687f4afce 100644 --- a/doc/examples/blog.mdwn +++ b/doc/examples/blog.mdwn @@ -12,13 +12,13 @@ Some additional configuration you might want to do: example of how to tag a post is: \[[!tag tags/life]] -* Enable the [[sidebar|plugin/sidebar]] plugin to get a sidebar listing all +* Enable the [[sidebar|plugins/sidebar]] plugin to get a sidebar listing all the categories you've tagged posts with. -* Enable the [[pagestats|plugin/pagestats]] plugin to get a tag cloud +* Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud * display on the [[index]]. -* Enable the [[comments|plugin/comments]] plugin and configure it to +* Enable the [[comments|plugins/comments]] plugin and configure it to enable comments to posts to the blog: comments_pagespec => 'blog/posts/*', -- cgit v1.2.3 From d70f3d6271a28635942ed23f91ed7e144877e62e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 21 Dec 2008 16:50:50 -0500 Subject: unify pagespecs --- doc/examples/blog.mdwn | 2 +- doc/plugins/comments.mdwn | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'doc/examples') diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index 687f4afce..091e37431 100644 --- a/doc/examples/blog.mdwn +++ b/doc/examples/blog.mdwn @@ -21,4 +21,4 @@ Some additional configuration you might want to do: * Enable the [[comments|plugins/comments]] plugin and configure it to enable comments to posts to the blog: - comments_pagespec => 'blog/posts/*', + comments_pagespec => 'blog/posts/* and !*/Discussion', diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn index afaf2c7ae..72b11af64 100644 --- a/doc/plugins/comments.mdwn +++ b/doc/plugins/comments.mdwn @@ -25,7 +25,8 @@ There are some global options for the setup file: * `comments_pagespec`: [[ikiwiki/PageSpec]] of pages where comments are allowed. The default is not to allow comments on any pages. To allow - comments to all posts to a blog, you could use `blog/* and !*/Discussion`. + comments to all posts to a blog, you could use + `blog/posts/* and !*/Discussion`. * `comments_closed_pagespec`: [[ikiwiki/PageSpec]] of pages where posting of new comments is closed, but any existing comments will still be displayed. Often you will list a set of individual pages here. -- cgit v1.2.3 From f982a620f20a477b78bf795d32bf817356ff5e74 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 28 Dec 2008 22:23:15 -0500 Subject: formatting --- doc/examples/blog.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/examples') diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index 091e37431..ab73f0204 100644 --- a/doc/examples/blog.mdwn +++ b/doc/examples/blog.mdwn @@ -16,7 +16,7 @@ Some additional configuration you might want to do: the categories you've tagged posts with. * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud -* display on the [[index]]. + to display on the [[index]]. * Enable the [[comments|plugins/comments]] plugin and configure it to enable comments to posts to the blog: -- cgit v1.2.3 From 69c5a347f9a8304eac9c09196d1bbaf7d4437c51 Mon Sep 17 00:00:00 2001 From: test Date: Wed, 7 Jan 2009 04:49:12 -0500 Subject: --- doc/examples/softwaresite/bugs/test1.mdwn | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/examples/softwaresite/bugs/test1.mdwn (limited to 'doc/examples') diff --git a/doc/examples/softwaresite/bugs/test1.mdwn b/doc/examples/softwaresite/bugs/test1.mdwn new file mode 100644 index 000000000..00fd786fc --- /dev/null +++ b/doc/examples/softwaresite/bugs/test1.mdwn @@ -0,0 +1,2 @@ +blah blah blah + -- cgit v1.2.3 From b4957799375ac39cc0827623210fb53f5ee2ed20 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 7 Jan 2009 12:29:37 -0500 Subject: remove clutter --- doc/examples/softwaresite/bugs/test1.mdwn | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 doc/examples/softwaresite/bugs/test1.mdwn (limited to 'doc/examples') diff --git a/doc/examples/softwaresite/bugs/test1.mdwn b/doc/examples/softwaresite/bugs/test1.mdwn deleted file mode 100644 index 00fd786fc..000000000 --- a/doc/examples/softwaresite/bugs/test1.mdwn +++ /dev/null @@ -1,2 +0,0 @@ -blah blah blah - -- cgit v1.2.3 From 68dbf23135f685f16c10b229fa205066f88bdb1a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 12 Jan 2009 18:41:21 -0500 Subject: update path --- doc/examples/blog/posts/first_post.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/examples') 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]] -- cgit v1.2.3 From dc2df6eb8a9bc435f05e39e03ed573c3e47a83bd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 12 Jan 2009 18:41:38 -0500 Subject: remove meta title When at toplevel, the default is ok. --- doc/examples/blog/index.mdwn | 2 -- 1 file changed, 2 deletions(-) (limited to 'doc/examples') diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn index 6daf9db50..e4111fdce 100644 --- a/doc/examples/blog/index.mdwn +++ b/doc/examples/blog/index.mdwn @@ -1,5 +1,3 @@ -[[!meta title="example blog"]] - [[!pagestats pages="./tags/*"]] Welcome to my blog. Have a look at the most recent posts below, or -- cgit v1.2.3 From 82649be475f0d3459ea09d4fe6d65dfe212f0a80 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 12 Jan 2009 18:42:05 -0500 Subject: update --- doc/examples/blog.mdwn | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'doc/examples') diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index ab73f0204..2155d7fea 100644 --- a/doc/examples/blog.mdwn +++ b/doc/examples/blog.mdwn @@ -1,10 +1,11 @@ This is an [[example_blog|index]]. Just copy the blog subdirectory into -your wiki to quickly get started blogging with ikiwiki. +your wiki to quickly get started blogging with ikiwiki. -Some additional configuration you might want to do: +Or, run this command to set up a blog with ikiwiki. + + % ikiwiki -setup /etc/ikiwiki/auto-blog.setup -* Change the name of the blog, by editing `index.mdwn` and changing - the `title`. +Some additional configuration you might want to do: * Make sure to configure ikiwiki to generate RSS or Atom feeds. -- cgit v1.2.3 From 5b1f7f293dc5fed596f4745398b9c774b725a73b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 12 Jan 2009 19:03:41 -0500 Subject: update, formatting --- doc/examples/blog/index.mdwn | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'doc/examples') diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn index e4111fdce..84c732dd1 100644 --- a/doc/examples/blog/index.mdwn +++ b/doc/examples/blog/index.mdwn @@ -1,12 +1,13 @@ [[!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). -- cgit v1.2.3 From b3be09766bc5a116b8b31442b6431bca85c09631 Mon Sep 17 00:00:00 2001 From: "http://electropo.mp/" Date: Mon, 2 Mar 2009 18:39:02 -0500 Subject: --- doc/examples/softwaresite/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/examples') diff --git a/doc/examples/softwaresite/index.mdwn b/doc/examples/softwaresite/index.mdwn index e2d180d1f..e03a969a0 100644 --- a/doc/examples/softwaresite/index.mdwn +++ b/doc/examples/softwaresite/index.mdwn @@ -1,7 +1,7 @@ FooBar is an amazing example program that does not exist. Use it for all your example program needs. This is its wiki. -* [[download]] +* **[[download]]** * [[news]] * [[documentation|doc]] * [[bugs]] -- cgit v1.2.3