More doc improvements.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@61171 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 13 insertions, 2 deletions

diff --git a/helpers/default.pl b/helpers/default.pl
index 01dfa64ed..f260cd5d3 100644
--- a/helpers/default.pl
+++ b/helpers/default.pl
@@ -498,7 +498,11 @@ sub variable {
 
 sub processDescription {
   local ($_) = @_;
-  
+
+  # handle HTML markup issues.
+  s/</&lt;/g;
+  s/>/&gt;/g;
+
   s/^\s+//;				# Remove whitespace from beginning
   s/\s+$/\n/;				# Remove whitespace from end
   s/\n\n/<p>\n/g;			# Replace multiple CR's with paragraph markers
diff --git a/helpers/scandoc b/helpers/scandoc
index 5d6804eb4..13043a306 100755
--- a/helpers/scandoc
+++ b/helpers/scandoc
@@ -129,6 +129,8 @@ sub rdln {
       if ($debug) { print STDERR "(0:$srcfile) $linenumber.\n"; } 
     }
   }
+  # Dispose of Apache specific macros
+  removeApacheMacros();
 }
 
 # Don't skip "#"
@@ -642,7 +644,7 @@ sub parseDeclaration {
 
     # Eliminate in-line comments
     &removeComment;
-    
+
     # Check for multi-line declaration
     while ((($valid, $d) = &matchDecl) && $valid) { $decl .= $d; }
     
@@ -1078,6 +1080,11 @@ sub seealsoList {
   return @r;
 }
 
+sub removeApacheMacros {
+#    print "removing from $_";
+    s|AP_DECLARE\((.*?)\)|$1|;
+}
+
 # Class for parsed package
 package PackageRecord;