summaryrefslogtreecommitdiff
path: root/ikiwiki
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-09-21 12:15:45 +0200
committerJonas Smedegaard <dr@jones.dk>2017-09-21 12:15:45 +0200
commitcd8fefb0ef4d45b9113e09cf42998c7d1fbe7541 (patch)
treebae9bc90bca1125a77c73e8b7cb1319312c8387f /ikiwiki
parent224ca3cd99c6378f1bad4c69366d7b522e471e22 (diff)
Sync with ikiwiki 3.20150107.
Diffstat (limited to 'ikiwiki')
-rw-r--r--ikiwiki/directive/calendar.mdwn21
1 files changed, 15 insertions, 6 deletions
diff --git a/ikiwiki/directive/calendar.mdwn b/ikiwiki/directive/calendar.mdwn
index cb40f88..4c2b99c 100644
--- a/ikiwiki/directive/calendar.mdwn
+++ b/ikiwiki/directive/calendar.mdwn
@@ -25,14 +25,23 @@ in the sidebar, you'll also need to create these archive pages. They
typically use this directive to display a calendar, and also use [[inline]]
to display or list pages created in the given time frame.
-The `ikiwiki-calendar` command can be used to automatically generate the
-archive pages. It also refreshes the wiki, updating the calendars to
-highlight the current day. This command is typically run at midnight from
-cron.
+## Generating archive pages
+
+If [[!iki plugins/calendar desc=option]] `calendar_autocreate` is not set, the
+[[!iki ikiwiki-calendar]] command can be used to automatically generate the archive
+pages. It also refreshes the wiki, updating the calendars to highlight the
+current day. This command is typically run at midnight from cron.
An example crontab:
- 0 0 * * * ikiwiki-calendar ~/ikiwiki.setup "posts/* and !*/Discussion"
+ 0 0 * * * ikiwiki-calendar ~/ikiwiki.setup "posts/* and !*/Discussion"
+
+
+With [[!iki plugins/calendar desc="setup option"]] `calendar_autocreate`,
+all this work is done by `ikiwiki` itself. Thus, the crontab command can be
+replaced by:
+
+ 0 0 * * * ikiwiki --setup ~/ikiwiki.setup --refresh
## usage
@@ -45,7 +54,7 @@ An example crontab:
for the whole wiki by setting `archivebase` in ikiwiki's setup file.
Calendars link to pages under here, with names like "2010/04" and
"2010". These pages can be automatically created using the
- `ikiwiki-calendar` program.
+ `calendar_autocreate` [[!iki plugins/calendar desc="setup option"]].
* `year` - The year for which the calendar is requested. Defaults to the
current year. Can also use -1 to refer to last year, and so on.
* `month` - The numeric month for which the calendar is requested, in the