summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorXavier Mendez <jmendeth@gmail.com>2014-09-02 00:54:00 +0200
committerXavier Mendez <jmendeth@gmail.com>2014-09-02 00:54:00 +0200
commit1868710ff480279bd6937b1fb298e416f06e8f79 (patch)
tree859326b963bf282568ebbef972e865407e58c822 /bin
parent3a1d4f0a21f4d551ba4cf2c15763472c4d370034 (diff)
parentc6238419ffb1fa542f37dfe67916d525069dc53c (diff)
downloadrust-hoedown-1868710ff480279bd6937b1fb298e416f06e8f79.tar.gz
Keep up to date with master
Conflicts: src/document.c
Diffstat (limited to 'bin')
-rw-r--r--bin/hoedown.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/hoedown.c b/bin/hoedown.c
index ff1f929..79ba426 100644
--- a/bin/hoedown.c
+++ b/bin/hoedown.c
@@ -66,7 +66,7 @@ static struct extension_info extensions_info[] = {
{HOEDOWN_EXT_SUPERSCRIPT, "superscript", "Parse super^script."},
{HOEDOWN_EXT_MATH, "math", "Parse TeX $$math$$ syntax, Kramdown style."},
- {HOEDOWN_EXT_LAX_SPACING, "lax-spacing", "Allow HTML blocks on the same line as text."},
+ {HOEDOWN_EXT_LAX_SPACING, "lax-spacing", "Don't require a blank line between some blocks."},
{HOEDOWN_EXT_NO_INTRA_EMPHASIS, "disable-intra-emphasis", "Disable emphasis_between_words."},
{HOEDOWN_EXT_SPACE_HEADERS, "space-headers", "Require a space after '#' in headers."},
{HOEDOWN_EXT_MATH_EXPLICIT, "math-explicit", "Instead of guessing by context, parse $inline math$ and $$always block math$$ (requires --math)."},