20 files changed, 31 insertions, 36 deletions
diff --git a/doc/TourBusStop.mdwn b/doc/TourBusStop.mdwn
index a78e4843a..8e382bd77 100644
--- a/doc/TourBusStop.mdwn
+++ b/doc/TourBusStop.mdwn
@@ -6,7 +6,7 @@ This wiki serves as the home for the ikiwiki wiki engine, providing collaborativ
 
 * Rather than inventing yet another simplistic, linear version control system, ikiwiki uses a standard version control system such as [[Subversion|rcs/svn]] or [[rcs/Git]].  You can edit a wiki by committing to your repository, as well as through a traditional web interface.  This makes ikiwiki ideal for collaborative software development; just keep your wiki in version control next to your software.  You can also take full advantage of the features of these systems; for instance, you can keep a local branch of your wiki via [[rcs/Git]].
 
-* You can turn any set of pages into a [[ikiwiki/blog]] or similar news feed,
+* You can turn any set of pages into a [[blog]] or similar news feed,
 * complete with RSS and Atom support.  You can run your weblog on ikiwiki (and [[many_people_do|ikiwikiusers]]), run a Planet-like [[aggregator|plugins/aggregate]] for external feeds, or keep a [[TODO]] and [[bug|bugs]] list with tags for completed items.
 
 * ikiwiki provides a wiki compiler, designed to transform your wiki content into a set of static pages.  You can then serve these pages as static content.  ikiwiki will not fall over during a Slashdotting, because page views don't require the ikiwiki CGI; as long as your web server can keep up, your site will survive.  Furthermore, you can choose whether you want to run the ikiwiki CGI for web edits or only handle commits to the underlying version control system; you can even run ikiwiki privately and just manually copy the content to another server.  So if you want to put a wiki up on a server without installing any software on that server, try ikiwiki.
diff --git a/doc/basewiki.mdwn b/doc/basewiki.mdwn
index e1f876acb..c61ae3dba 100644
--- a/doc/basewiki.mdwn
+++ b/doc/basewiki.mdwn
@@ -8,7 +8,6 @@ It currently includes these pages:
 * [[sandbox]]
 * [[shortcuts]]
 * [[templates]]
-* [[ikiwiki/blog]]
 * [[ikiwiki/formatting]]
 * [[ikiwiki/markdown]]
 * [[ikiwiki/openid]]
diff --git a/doc/blog.mdwn b/doc/blog.mdwn
new file mode 100644
index 000000000..c4a379fdb
--- /dev/null
+++ b/doc/blog.mdwn
@@ -0,0 +1,4 @@
+Ikiwiki allows turning any page into a weblog, by using the
+[[ikiwiki/directive/inline]] [[ikiwiki/directive]]. For example:
+
+	\[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]]
diff --git a/doc/features.mdwn b/doc/features.mdwn
index 8e3c0799c..e9be02be4 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -47,7 +47,7 @@ program, or other special file and link to it from your wiki pages.
 
 ## Blogging
 
-You can turn any page in the wiki into a [[ikiwiki/blog]]. Pages matching a
+You can turn any page in the wiki into a [[blog]]. Pages matching a
 specified [[ikiwiki/PageSpec]] will be displayed as a weblog within the blog
 page. And RSS or Atom feeds can be generated to follow the blog.
 
diff --git a/doc/ikiwiki.mdwn b/doc/ikiwiki.mdwn
index 89337d051..79049420c 100644
--- a/doc/ikiwiki.mdwn
+++ b/doc/ikiwiki.mdwn
@@ -7,7 +7,6 @@ This wiki is powered by [ikiwiki](http://ikiwiki.info/).
 Some documentation on using ikiwiki:
 
 * [[ikiwiki/formatting]]
-* [[ikiwiki/blog]]
 * [[ikiwiki/pagespec]]
 * [[ikiwiki/directive]]
 * [[ikiwiki/wikilink]]
diff --git a/doc/ikiwiki/blog.mdwn b/doc/ikiwiki/blog.mdwn
deleted file mode 100644
index 016e608ba..000000000
--- a/doc/ikiwiki/blog.mdwn
+++ /dev/null
@@ -1,12 +0,0 @@
-[[!meta robots="noindex, follow"]]
-[[!if test="enabled(inline)"
-     then="This wiki has the inline plugin **enabled**."
-     else="This wiki has the inline plugin **disabled**."]]
-
-[[!if test="enabled(inline)"
-     then="You can"
-     else="If this wiki had the inline plugin enabled, you could"]]
-turn any page on this wiki into a weblog by using the [[directive/inline]]
-[[directive]]. For example:
-
-	\[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]]
diff --git a/doc/ikiwiki/directive/aggregate.mdwn b/doc/ikiwiki/directive/aggregate.mdwn
index 702d91cf5..70174f440 100644
--- a/doc/ikiwiki/directive/aggregate.mdwn
+++ b/doc/ikiwiki/directive/aggregate.mdwn
@@ -14,7 +14,7 @@ more frequently than once every 15 minutes (though possibly less
 frequently, if the cron job runs less frequently than that), and puts a
 page per post under the example/ directory in the wiki.
 
-You can then use ikiwiki's [[ikiwiki/blog]] support to create a blog of one or
+You can then use ikiwiki's [[inline]] directive to create a blog of one or
 more aggregated feeds. For example:
 
 	\[[!inline pages="internal(example/*)"]]
diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn
index 0145f9da6..8b74cd73d 100644
--- a/doc/ikiwiki/formatting.mdwn
+++ b/doc/ikiwiki/formatting.mdwn
@@ -95,7 +95,7 @@ you use the following additional features:
 """]]
 
 [[!if test="enabled(inline) and blog" then="""
-  * Create a [[blog]] by inlining a set of pages:
+  * Create a blog by inlining a set of pages:
 
 	\[[!inline pages="blog/*"]]
 """]]
diff --git a/doc/index.mdwn b/doc/index.mdwn
index b1cd2fbec..93526c42c 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -2,7 +2,7 @@ Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
 suitable for publishing on a website. Ikiwiki stores pages and history in a
 [[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
 There are many other [[features]], including support for
-[[blogging|ikiwiki/blog]], as well as a large array of [[plugins]].
+[[blogging|blog]], as well as a large array of [[plugins]].
 
 [[!template id=links]]
 
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index cc0d073ca..4b47d2db9 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -55,8 +55,6 @@ Release is planned for fall, 2008.
 
 # future goals
 
-* More documentation in the basewiki, including documentation for all enabled
-  plugins.
 * Conversion support for existing other wikis.
   (Being worked on for MoinMoin and TWiki by [[Josh_Triplett|JoshTriplett]]
   and Jamey Sharp; support for other wikis should fit into the same
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 6d718ebfd..424bf46bb 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -78,6 +78,6 @@ The haiku will change after every save, mind you.
 
 -----
 
-This SandBox is also a [[ikiwiki/blog]]!
+This SandBox is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
diff --git a/doc/tags.mdwn b/doc/tags.mdwn
index 4fc98bdbf..71d925b24 100644
--- a/doc/tags.mdwn
+++ b/doc/tags.mdwn
@@ -17,7 +17,7 @@ You can also tag a page with a visible link:
 
 This tag will be displayed just like a regular [[ikiwiki/WikiLink]].
 
-One way to use these tags is to create a [[ikiwiki/blog]] of pages that have a
+One way to use these tags is to create a [[blog]] of pages that have a
 particular set of tags. Or just look at the [[BackLinks]] to a tag page to
 see all the pages that are tagged with it. [[Plugins]] can be written to do
 anything else with tags that you might desire.
diff --git a/doc/tips/howto_avoid_flooding_aggregators.mdwn b/doc/tips/howto_avoid_flooding_aggregators.mdwn
index 71077859f..98cef9249 100644
--- a/doc/tips/howto_avoid_flooding_aggregators.mdwn
+++ b/doc/tips/howto_avoid_flooding_aggregators.mdwn
@@ -1,4 +1,4 @@
-If you have a [[ikiwiki/blog]] that is aggregated, either on a site like Planet
+If you have a [[blog]] that is aggregated, either on a site like Planet
 Debian, or just through user subscriptions, one common problem is that
 changes to the guids of items in the blog can "flood" the aggregator,
 causing all recent blog entries to be posted to the top of it. 
diff --git a/doc/todo/ability_to_force_particular_UUIDs_on_blog_posts.mdwn b/doc/todo/ability_to_force_particular_UUIDs_on_blog_posts.mdwn
index 9ee670f84..099683820 100644
--- a/doc/todo/ability_to_force_particular_UUIDs_on_blog_posts.mdwn
+++ b/doc/todo/ability_to_force_particular_UUIDs_on_blog_posts.mdwn
@@ -2,7 +2,7 @@ When converting an existing blog to ikiwiki it would be useful to be able to pre
 
 Also, it should be possible to change the permalink (the Atom `<link>`) of a post (e.g. moving the content and leaving a redirector behind), while keeping the same Atom `<id>` (so that aggregators don't get confused).
 
-Ideally UUIDs for [blog posts](/ikiwiki/blog/) should be chosen when the post is created, and frozen permanently by checking them in along with the content.
+Ideally UUIDs for [[blog]] posts should be chosen when the post is created, and frozen permanently by checking them in along with the content.
 
 Perhaps ikiwiki's blogging functionality could be hooked up to the [meta plugin](/meta/plugin/), with a new meta keyword (uuid? feed-uuid? atom-uuid?) to achieve this.
 
diff --git a/doc/todo/conditional_text_based_on_ikiwiki_features.mdwn b/doc/todo/conditional_text_based_on_ikiwiki_features.mdwn
index 17585af65..0d0f66da4 100644
--- a/doc/todo/conditional_text_based_on_ikiwiki_features.mdwn
+++ b/doc/todo/conditional_text_based_on_ikiwiki_features.mdwn
@@ -75,7 +75,7 @@ Syntax could vary greatly here, both for the
 >>   pages."""]].  The help text would then only appear on the sidebar page
 >>   itself, not the sidebar included on all pages.
 >>
->> * On [[ikiwiki/blog]] entries, you could use `included` to implement a cut.
+>> * On [[blog]] entries, you could use `included` to implement a cut.
 >>   (Please don't take that as an argument against. :) ) For instance, you
 >>   could use included rather than [[plugins/toggle]] for the detailed
 >>   changelogs of ikiwiki, or to embed an image as a link in the feed rather
diff --git a/doc/todo/ctime_on_blog_post_pages_.mdwn b/doc/todo/ctime_on_blog_post_pages_.mdwn
index 65939113a..76708e0da 100644
--- a/doc/todo/ctime_on_blog_post_pages_.mdwn
+++ b/doc/todo/ctime_on_blog_post_pages_.mdwn
@@ -1,4 +1,4 @@
-[[Blog|ikiwiki/blog]] feeds and index pages show the posted time (ctime), the actual blog entry pages only show the modified time.
+[[Blog]] feeds and index pages show the posted time (ctime), the actual blog entry pages only show the modified time.
 
 The user has to look at the history link to find when a blog item was posted.
 
diff --git a/doc/todo/multiple_templates.mdwn b/doc/todo/multiple_templates.mdwn
index d165eebaf..72783c556 100644
--- a/doc/todo/multiple_templates.mdwn
+++ b/doc/todo/multiple_templates.mdwn
@@ -1,5 +1,5 @@
 > Another useful feature might be to be able to choose a different [[template|wikitemplates]]
-> file for some pages; [[blog|ikiwiki/blog]] pages would use a template different from the
+> file for some pages; [[blog]] pages would use a template different from the
 > home page, even if both are managed in the same repository, etc.
 
 Well, that would probably be fairly easy to add if it used [[pagespecs|ikiwiki/pagespec]] to
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 0823bde84..b6af75ac8 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -166,24 +166,24 @@ configuration options of their own.
 * --rss, --norss
 
   If rss is set, ikiwiki will default to generating RSS feeds for pages
-  that inline a [[ikiwiki/blog]].
+  that inline a [[blog]].
 
 * --allowrss
 
   If allowrss is set, and rss is not set, ikiwiki will not default to
-  generating RSS feeds, but setting `rss=yes` in the blog can override
-  this default and generate a feed.
+  generating RSS feeds, but setting `rss=yes` in the inline directive can
+  override this default and generate a feed.
 
 * --atom, --noatom
 
   If atom is set, ikiwiki will default to generating Atom feeds for pages
-  that inline a [[ikiwiki/blog]].
+  that inline a [[blog]].
 
 * --allowatom
 
   If allowatom is set, and rss is not set, ikiwiki will not default to
-  generating Atom feeds, but setting `atom=yes` in the blog can override
-  this default and generate a feed.
+  generating Atom feeds, but setting `atom=yes` in the inline directive can
+  override this default and generate a feed.
 
 * --pingurl URL
 
diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn
index b03fc10a1..babd70211 100644
--- a/doc/wikitemplates.mdwn
+++ b/doc/wikitemplates.mdwn
@@ -14,7 +14,7 @@ located in /usr/share/ikiwiki/templates by default.
 * `change.tmpl` - Used to create a page describing a change made to the wiki.
 * `passwordmail.tmpl` - Not a html template, this is used to
   generate a mail with an url the user can use to reset their password.
-* `rsspage.tmpl` - Used for generating rss feeds for [[blogs|ikiwiki/blog]].
+* `rsspage.tmpl` - Used for generating rss feeds for [[blogs|blog]].
 * `rssitem.tmpl` - Used for generating individual items on rss feeds.
 * `atompage.tmpl` - Used for generating atom feeds for blogs.
 * `atomitem.tmpl` - Used for generating individual items on atom feeds.
diff --git a/underlays/basewiki/ikiwiki/blog.mdwn b/underlays/basewiki/ikiwiki/blog.mdwn
index 7735e9853..0a5a5247d 120000..100644
--- a/underlays/basewiki/ikiwiki/blog.mdwn
+++ b/underlays/basewiki/ikiwiki/blog.mdwn
@@ -1 +1,8 @@
-../../../doc/ikiwiki/blog.mdwn
-\ No newline at end of file
+[[!meta robots="noindex, follow"]]
+
+This page has been removed from ikiwiki's basewiki. For documentation about
+creating a blog with ikiwiki, see the documentation of the
+[[!iki ikiwiki/directive/inline desc=inline]] directive.
+
+Please update your links, as this redirection page will be removed in a
+future ikiwiki release.