diff options
| -rw-r--r-- | basewiki/blog.mdwn | 2 | ||||
| -rw-r--r-- | doc/blog.mdwn | 22 | ||||
| -rw-r--r-- | doc/usage.mdwn | 8 |
3 files changed, 5 insertions, 27 deletions
diff --git a/basewiki/blog.mdwn b/basewiki/blog.mdwn index 9c490fcb3..38476d2d6 100644 --- a/basewiki/blog.mdwn +++ b/basewiki/blog.mdwn @@ -1,5 +1,5 @@ You can turn any page on this wiki into a weblog by inserting a -[[PostProcessorDirective]]. Like this: +[[PreProcessorDirective]]. Like this: \\[[inline pages="blog/* !*/Discussion" show="10" rootpage="blog"]] diff --git a/doc/blog.mdwn b/doc/blog.mdwn deleted file mode 100644 index 38476d2d6..000000000 --- a/doc/blog.mdwn +++ /dev/null @@ -1,22 +0,0 @@ -You can turn any page on this wiki into a weblog by inserting a -[[PreProcessorDirective]]. Like this: - -\\[[inline pages="blog/* !*/Discussion" show="10" rootpage="blog"]] - -Any pages that match the specified [[GlobList]] (in the example, any -[[SubPage]] of "blog") will be part of the blog, and the newest 10 -of them will appear in the page. - -The optional `rootpage` setting tells the wiki that new posts to this blog -should default to being [[SubPage]] of "blog", and enables a form at the -top of the blog that can be used to add new items. - -If you want your blog to have an archive page listing every post ever made -to it, you can accomplish that like this: - -\\[[inline pages="blog/* !*/Discussion" archive="yes"]] - -You can even create an automatically generated list of all the pages on the -wiki, with the most recently added at the top, like this: - -\\[[inline pages="* !*/Discussion" archive="yes"]] diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 34e6bd1d4..4936039b6 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -131,15 +131,15 @@ These options configure the wiki. If rss is set, ikiwiki will generate rss feeds for pages that inline a blog. -* --url http://someurl/ +* --url http://url/ Specifies the url to the wiki. This is a required parameter in [[CGI]] mode. -* --cgiurl http://someurl/ikiwiki.cgi +* --cgiurl http://url/ikiwiki.cgi Specifies the url to the ikiwiki [[CGI]] script [[wrapper]]. Required when building the wiki for links to the cgi script to be generated. -* --historyurl http://svn.someurl/trunk/\[[file]]?root=wiki +* --historyurl http://url/trunk/\[[file]]?root=wiki Specifies the url to link to for page history browsing. In the url, "\[[file]]" is replaced with the file to browse. It's common to use @@ -149,7 +149,7 @@ These options configure the wiki. Specifies the email address that ikiwiki should use for sending email. -* --diffurl http://svn.someurl/trunk/\[[file]]?root=wiki&r1=\[[r1]]&r2=\[[r2]] +* --diffurl http://url/trunk/\[[file]]?root=wiki&r1=\[[r1]]&r2=\[[r2]] Specifies the url to link to for a diff of changes to a page. In the url, "\[[file]]" is replaced with the file to browse, "\[[r1]]" is the old |