summaryrefslogtreecommitdiff
path: root/doc/news/version_3.20091113.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-12-10 22:19:19 -0500
committerJoey Hess <joey@gnu.kitenet.net>2009-12-10 22:19:19 -0500
commita21aa6b9c562cdf451977b80cbf5b31cb4d28bac (patch)
tree24b3fc413c03a66c77aa2996c494b87b7caaab58 /doc/news/version_3.20091113.mdwn
parent18cc0aa1c2d918f16f425e4a0e18b7d16919dbf6 (diff)
parenta132ca7c62df5ceb6c3be425613cd36c1938e335 (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc/news/version_3.20091113.mdwn')
-rw-r--r--doc/news/version_3.20091113.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/news/version_3.20091113.mdwn b/doc/news/version_3.20091113.mdwn
index f313b57d1..579174011 100644
--- a/doc/news/version_3.20091113.mdwn
+++ b/doc/news/version_3.20091113.mdwn
@@ -13,6 +13,6 @@ ikiwiki 3.20091113 released with [[!toggle text="these changes"]]
* httpauth: Add cgiauthurl setting that can be used to do http basic auth
only when ikiwiki needs authentication, rather than for any access to
the cgi/wiki.
- * inline: Do not generated feeds for nested inlines.
+ * inline: Do not generate feeds for nested inlines.
* inline: Allow direct inclusion of non-page files in raw mode.
- * inline: Fix display of all pages when archive=yes or show=0 are used."""]] \ No newline at end of file
+ * inline: Fix display of all pages when archive=yes or show=0 are used."""]]