From c041da79088f2ba8bd6672a04aeacff0592fae72 Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@gmail.com>
Date: Thu, 13 Feb 2014 15:36:09 +0400
Subject: Updated version 2.4 release notes.

---
 docs/extensions/extra.txt |  8 ++++----
 docs/release-2.4.txt      | 35 ++++++++++++++++++++++++++++++++++-
 docs/siteindex.txt        |  1 +
 3 files changed, 39 insertions(+), 5 deletions(-)

(limited to 'docs')

diff --git a/docs/extensions/extra.txt b/docs/extensions/extra.txt
index 0507e8f..ace7a57 100644
--- a/docs/extensions/extra.txt
+++ b/docs/extensions/extra.txt
@@ -45,7 +45,7 @@ your own clone of Extra under a different name
 Markdown Inside HTML Blocks
 ---------------------------
 
-Unlike the other Extra features, this feature is build into the markdown core and is turned on when `extra` is enabled.
+Unlike the other Extra features, this feature is built into the markdown core and is turned on when `extra` is enabled.
 
 The content of any raw html block element can be Markdown-formatted simply by adding a `markdown` attribute to the opening tag. The markdown attribute will be stripped from the output, but all other attributes will be preserved.
 
@@ -61,9 +61,9 @@ This is *true* markdown text.
 ```
 #### Result:
 ```
-<p>This is <em>true</em> markdown text.</p>                                                                                                                                           
-<div>                                                                                                                                                                                 
-<p>This is <em>true</em> markdown text.</p>                                                                                                                                           
+<p>This is <em>true</em> markdown text.</p>
+<div>
+<p>This is <em>true</em> markdown text.</p>
 </div>
 ```
 
diff --git a/docs/release-2.4.txt b/docs/release-2.4.txt
index 78b78be..437864a 100644
--- a/docs/release-2.4.txt
+++ b/docs/release-2.4.txt
@@ -23,7 +23,11 @@ documentation for the [CodeHilite Extension] for an explanation of the new
 is set, but "force_linenos" will raise a DeprecationWarning and will likely 
 be removed in a future version of Python-Markdown.
 
-[CodeHilite Extension]: extensions/codehilite.html
+[CodeHilite Extension]: extensions/code_hilite.html
+
+* URLs are no longer percent-encoded. This improves compatibility with the
+original (written in Perl) Markdown implementation. Please percent-encode
+your URLs manually when needed.
 
 What's New in Python-Markdown 2.4
 ---------------------------------
@@ -39,6 +43,35 @@ it out and report bugs and/or improvements.
 [Smarty Extension]: extensions/smarty.html
 [SmartyPants]: http://daringfireball.net/projects/smartypants/
 
+* The [Table of Contents Extension] now supports new `permalink` option
+for creating [Sphinx]-style anchor links.
+
+[Table of Contents Extension]: extensions/toc.html
+[Sphinx]: http://sphinx-doc.org/
+
+* It is now possible to enable Markdown formatting inside HTML blocks by
+appending `markdown=1` to opening tag attributes. See [Markdown Inside HTML
+Blocks] section for details. Thanks to [ryneeverett] for implementing this
+feature.
+
+[Markdown Inside HTML Blocks]: extensions/extra.html#nested-markdown-inside-html-blocks
+[ryneeverett]: https://github.com/ryneeverett
+
+* The code blocks now support emphasizing some of the code lines. To use this
+feature, specify `hl_lines` option after language name, for example (using
+the [Fenced Code Extension]):
+
+        ```.python hl_lines="1 3"
+        # This line will be emphasized.
+        # This one won't.
+        # This one will be also emphasized.
+        ```
+
+    Thanks to [A. Jesse Jiryu Davis] for implementing this feature.
+
+[Fenced Code Extension]: extensions/fenced_code_blocks.html
+[A. Jesse Jiryu Davis]: https://github.com/ajdavis
+
 * Various bug fixes have been made.  See the
 [commit log](https://github.com/waylan/Python-Markdown/commits/master)
 for a complete history of the changes.
diff --git a/docs/siteindex.txt b/docs/siteindex.txt
index 6846015..806af1e 100644
--- a/docs/siteindex.txt
+++ b/docs/siteindex.txt
@@ -67,6 +67,7 @@ Table of Contents
     * [Unit Tests](test_suite.html#unit-tests)
     * [Doc Tests](test_suite.html#doc-tests)
 * [Change Log](change_log.html)
+    * [Release Notes for v.2.4](release-2.4.html)
     * [Release Notes for v.2.3](release-2.3.html)
     * [Release Notes for v.2.2.1](release-2.1.1.html)
     * [Release Notes for v.2.2.0](release-2.1.0.html)
-- 
cgit v1.2.3