summaryrefslogtreecommitdiff
path: root/doc/news
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-02-20 16:45:34 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-02-20 16:45:34 -0500
commit77894a6831ae9cc8a90adbc6de0ab3c92408c316 (patch)
tree28dea1c20a1825829758082b3204b94d1805be00 /doc/news
parenta59af82bb85a037814d3f95d3c9841048b221ca0 (diff)
parent73b891a434f9cc6c906e97092b7999e702ed4eff (diff)
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
Diffstat (limited to 'doc/news')
-rw-r--r--doc/news/openid.mdwn2
-rw-r--r--doc/news/version_2.20.mdwn2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index ef00765ed..72cacf95f 100644
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
OpenID, and see how OpenID works for you. And let me know your feelings about
making such a switch. --[[Joey]]
-[[poll 44 "Accept only OpenID for logins" 17 "Accept only password logins" 31 "Accept both"]]
+[[poll 44 "Accept only OpenID for logins" 17 "Accept only password logins" 32 "Accept both"]]
diff --git a/doc/news/version_2.20.mdwn b/doc/news/version_2.20.mdwn
index 4bf0a02fe..b36ef4b8b 100644
--- a/doc/news/version_2.20.mdwn
+++ b/doc/news/version_2.20.mdwn
@@ -1,6 +1,6 @@
News for ikiwiki 2.20:
- The template plugin has begin to htmlize the variables passed to templates.
+ The template plugin has begun to htmlize the variables passed to templates.
This is normally what you want, but to get the old behavior and get at the
raw value, you can use `<TMPL_VAR raw_variable>` in a template.