remove templates/ from filenames

diff --git a/debian/changelog b/debian/changelog
index 28011339b107ec39252bbc02ba8a89755e77f0d1..72299ec590abac5523ec7b0b721784c486ee6737 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,8 @@ ikiwiki (1.1) UNRELEASED; urgency=low
   * Allow the depends GlobList to be built up from multiple sources (such as
     plugins) during a page render.
   * Which means that more than one blog is now supported to appear on a
-    single page. (With some limitations.)
+    single page. (With some limitations, like only the last one getting an
+    rss file.)
 
  -- Joey Hess <joeyh@debian.org>  Mon,  1 May 2006 18:21:16 -0400
 

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index cb07f27addefb142567092a37323a167f5dda9aa..10f715d9d4f30b0ab5f601da6e949b2ad2755823 100644 (file)
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -6,20 +6,20 @@ The aim is to keep almost all html out of ikiwiki and in the templates.
 
 It ships with some basic templates which can be customised:
 
-* `templates/page.tmpl` - Used for displaying all regular wiki pages.
-* `templates/misc.tmpl` - Generic template used for any page that doesn't
+* `page.tmpl` - Used for displaying all regular wiki pages.
+* `misc.tmpl` - Generic template used for any page that doesn't
   have a custom template.
-* `templates/recentchanges.tmpl` - Used for the RecentChanges page.
-* `templates/editpage.tmpl` - Create/edit page.
-* `templates/notifymail.tmpl` - Not a html template, this is used to
+* `recentchanges.tmpl` - Used for the RecentChanges page.
+* `editpage.tmpl` - Create/edit page.
+* `notifymail.tmpl` - Not a html template, this is used to
   generate change notification mails for users who have subscribed to
   changes to a page.
-* `templates/passwordmail.tmpl` - Not a html template, this is used to
+* `passwordmail.tmpl` - Not a html template, this is used to
   generate the mail with the user's password in it.
-* `templates/rsspage.tmpl` - Used for generating rss feeds for [[blog]]s.
-* `templates/inlinepage.tmpl` - Used for adding a page inline in a blog
+* `rsspage.tmpl` - Used for generating rss feeds for [[blog]]s.
+* `inlinepage.tmpl` - Used for adding a page inline in a blog
   page.
-* `templates/inlinepagetitle.tmpl` - Used for listing a page inline in a blog
+* `inlinepagetitle.tmpl` - Used for listing a page inline in a blog
   archive page.
 * `estseek.conf` - Not a html template, this is actually a template for
   a config file for the [[HyperEstraier]] search engine. If you like you
@@ -29,10 +29,10 @@ It ships with some basic templates which can be customised:
 
 If you like, you can add these to further customise it:
 
-* `templates/signin.tmpl` - If it exists, it is used for customising the
+* `signin.tmpl` - If it exists, it is used for customising the
   layout of the SignIn form and all assciated forms. The misc.tmpl is
   wrapped around this, so it should only be a template for the form.
-* `templates/prefs.tmpl` - If it exists, it is used for customising the
+* `prefs.tmpl` - If it exists, it is used for customising the
   layout of the Prefs form and all assciated forms. The misc.tmpl is
   wrapped around this, so it should only be a template for the form.