Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / plugins / calendar.mdwn

diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn
index d55c21a62b06e37aebeead1d986dd76b211ce22e..8d18ed081e0a9e6e43c379272b033119b75edd7a 100644 (file)
--- a/doc/plugins/calendar.mdwn
+++ b/doc/plugins/calendar.mdwn
@@ -17,12 +17,12 @@ pages from templates (overriding the existing ones).
 * `calendar_autocreate` - Control whether new archive pages are created as
   needed. It defaults to being done only if option `archivebase` is set.
 * `calendar_fill_gaps` - If set (and `calendar_autocreate` is set as well),
 * `calendar_autocreate` - Control whether new archive pages are created as
   needed. It defaults to being done only if option `archivebase` is set.
 * `calendar_fill_gaps` - If set (and `calendar_autocreate` is set as well),

-  build calendar pages of emty years and months (but does not build pages older
+  build calendar pages of empty years and months (but does not build pages older

   than the older page, and younger than the younger page of the pagespec). If
   than the older page, and younger than the younger page of the pagespec). If

-  not, thoses empty calendar pages will be skipped. *Please note:*
+  not, those empty calendar pages will be skipped. *Please note:*

   * The archive pages will not be automatically updated if this option changes.
     It is up to the user to delete relevant pages, and rebuild the wiki.
   * The archive pages will not be automatically updated if this option changes.
     It is up to the user to delete relevant pages, and rebuild the wiki.

-  * When `calendar_fill_gaps` is set, and post is deleted, making the
+  * When `calendar_fill_gaps` is set, and a post is deleted, making the

     corresponding year/month empty, the corresponding page is left, and shows
     an empty calendar. This is on purpose, not to break any external link
     pointing to this particular page. If you do not like it, delete the
     corresponding year/month empty, the corresponding page is left, and shows
     an empty calendar. This is on purpose, not to break any external link
     pointing to this particular page. If you do not like it, delete the