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
@@ -517,7 +517,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>
@@ -853,7 +853,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/megaco/doc/src/Makefile
+++ b/lib/megaco/doc/src/Makefile
@@ -170,8 +170,6 @@
 	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
 	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
 	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DIR)  "$(RELSYSDIR)/doc/standard"
-	$(INSTALL_DATA) $(STANDARDS) "$(RELSYSDIR)/doc/standard"
 
 release_spec:
 
--- a/lib/stdlib/doc/src/re.xml
+++ b/lib/stdlib/doc/src/re.xml
@@ -573,7 +573,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>
@@ -582,7 +582,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 = c_src src doc/src examples emacs
+SUB_DIRECTORIES = c_src src examples emacs doc/src
 
 include vsn.mk
 VSN = $(TOOLS_VSN)