Author: Sergei Golovan <sgolovan@debian.org>
Description: Fixes a bug with .RE macro in the Erlang manpages
 and a few bugs with docs installation.
Last-modified: Thu, 09 Dec 2010 10:45:56 +0300

--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -523,7 +523,7 @@
         <xsl:text>&#10;.RS 2</xsl:text>
         <xsl:text>&#10;.LP&#10;</xsl:text>
         <xsl:value-of select="$content"/>
-        <xsl:text>&#10;.RE</xsl:text>
+        <xsl:text>&#10;.RE&#10;</xsl:text>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -860,7 +860,7 @@
   <xsl:template match="desc">
     <xsl:text>&#10;.RS</xsl:text>
     <xsl:apply-templates/>
-    <xsl:text>&#10;.RE</xsl:text>
+    <xsl:text>&#10;.RE&#10;</xsl:text>
   </xsl:template>
 
 
--- a/lib/stdlib/doc/src/re.xml
+++ b/lib/stdlib/doc/src/re.xml
@@ -594,7 +594,7 @@
               to match before it. Setting this without <c>multiline</c> (at
               compile time) causes circumflex never to match. This option only
               affects the behavior of the circumflex metacharacter. It does not
-              affect \A.</p>
+              affect \\A.</p>
           </item>
           <tag><c>noteol</c></tag>
           <item>
@@ -603,7 +603,7 @@
               in multiline mode) a newline immediately before it. Setting this
               without <c>multiline</c> (at compile time) causes dollar never to
               match. This option affects only the behavior of the dollar
-              metacharacter. It does not affect \Z or \z.</p>
+              metacharacter. It does not affect \\Z or \\z.</p>
           </item>
           <tag><c>report_errors</c></tag>
           <item>
--- a/lib/tools/Makefile
+++ b/lib/tools/Makefile
@@ -24,7 +24,7 @@
 # Macros
 # ----------------------------------------------------
 
-SUB_DIRECTORIES = src doc/src examples emacs
+SUB_DIRECTORIES = src examples emacs doc/src
 
 include vsn.mk
 VSN = $(TOOLS_VSN)
--- a/lib/megaco/doc/src/Makefile
+++ b/lib/megaco/doc/src/Makefile
@@ -40,10 +40,7 @@
             $(XML_PART_FILES) $(XML_CHAPTER_FILES)
 
 STANDARD_DIR = ../standard
-STANDARDS = $(STANDARD_DIR)/rfc3525.txt \
-            $(STANDARD_DIR)/rfc4234.txt \
-            $(STANDARD_DIR)/rfc4566.txt \
-            $(STANDARD_DIR)/implementors_guide_v10-13.pdf
+STANDARDS = 
 
 NO_CHUNKS = megaco_edist_compress.xml megaco_user.xml megaco_encoder.xml \
 	megaco_transport.xml megaco_tcp.xml megaco_udp.xml \
