Merge branch 'maint' to sync with GIT 1.5.2.2

2007-06-16 01:22:10 -07:00
parent c5f71ad099 c7c84859ad
commit 5bd148bfe8
10 changed files with 109 additions and 6 deletions
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@ -8,7 +8,8 @@
 # the command.

 [attributes]
-caret=^
+plus=&#43;
+caret=&#94;
 startsb=&#91;
 endsb=&#93;
 tilde=&#126;