Merge commit 'origin/master' into prv/po

1 files changed, 2 insertions, 2 deletions

diff --git a/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn b/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn
index 2fad9f19a..467ec350e 100644
--- a/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn
+++ b/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn
@@ -1,6 +1,6 @@
 Here is another [[patch]] for this.  It is more up to date than either of the patches linked on the previous page.  It is most similar to [[plugins/contrib/sourcehighlight]].
 
-Note that if this is being used with `c` or `c++` then you'll probably want to wait until [[bugs/multiple_pages_with_same_name]] is fixed.
+Updated to use fix noted in [[bugs/multiple_pages_with_same_name]].
 
 -- [[Will]]
 
@@ -92,7 +92,7 @@ Note that if this is being used with `c` or `c++` then you'll probably want to w
     	
     	foreach my $lang (split(/[, ]+/, $config{sourcecode_lang})) {
     		if ($langs{$lang}) {
-    			hook(type => "htmlize", id => $lang, call => \&htmlize);
+    			hook(type => "htmlize", id => $lang, call => \&htmlize, keepextension => 1);
     		} else {
     			error("Your installation of source-highlight cannot handle sourcecode language $lang!");
     		}