# HG changeset patch
# User Rik <rik@octave.org>
# Date 1357440049 28800
# Node ID 53ec9063dc6d6b520bfb4a26c98013082480ebf5
# Parent  d2774d20232390e9318e0bb1e14218610721c0f4# Parent  1af9fa3d6a0be3f586eeffbe58a62a48f2509141
maint: Merge stable to default to pick up Perl doc-building fix.

diff -r d2774d202323 -r 53ec9063dc6d doc/interpreter/munge-texi.pl
--- a/doc/interpreter/munge-texi.pl	Sat Jan 05 19:58:22 2013 -0500
+++ b/doc/interpreter/munge-texi.pl	Sat Jan 05 18:40:49 2013 -0800
@@ -26,7 +26,7 @@
   
   do 
   {
-    chomp;
+    s/\s*$//;   # strip EOL character(s)
     $symbol = substr ($_,1);
     $docstring = extract_docstring ();
     if ($help_text{$symbol})
@@ -46,7 +46,7 @@
 # Process .txi to .texi by expanding @DOCSTRING, @EXAMPLEFILE macros
 
 # Add warning header
-print '@c DO NOT EDIT!  Generated automatically by munge-texi.',"\n\n";
+print '@c DO NOT EDIT!  Generated automatically by munge-texi.pl.',"\n\n";
 
 TXI_LINE: while (<STDIN>)
 {