Merge branch 'master' of github.com:mbi/django-simple-captcha

Conflicts: CHANGES
mbi · Nov 4, 2014 · 5a16b62 · 5a16b62
2 parents 30497ff + 9f2f5bf
commit 5a16b62
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGES b/CHANGES
@@ -11,6 +11,7 @@ Version 0.4.3
 * Make sure autocomplete="off" is only applied to the text input, not the hidden input (Issue #68, thanks @narrowfail)
 * Fixed some grammar in the documentation. (Thanks @rikrian)
 * Return an HTTP 410 GONE error code for expired captcha images, to avoid crawlers from trying to reindex them (PR #70, thanks @joshuajonah)
+* Fixed title markup in documentation (#74, thanks @pavlov99)
 * Test against Django 1.7.1
 
 Version 0.4.2

diff --git a/docs/advanced.rst b/docs/advanced.rst
@@ -89,6 +89,8 @@ Full path to the ``flite`` executable. When defined, will automatically add audi
 Defaults to: ``None`` (no audio output)
 
 CAPTCHA_TIMEOUT
+---------------
+
 Integer. Lifespan, in minutes, of the generated captcha.
 
 Defaults to: 5