Merged changes into HEAD from REXML 3.1.5.

The list of bug fixes/enhancements is at:

  http://www.germane-software.com/projects/rexml/query?status=closed&milestone=3.1.5


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 18 deletions

diff --git a/lib/rexml/comment.rb b/lib/rexml/comment.rb
index cb91d47f8..a4fcb58c8 100644
--- a/lib/rexml/comment.rb
+++ b/lib/rexml/comment.rb
@@ -35,31 +35,19 @@ module REXML
 		end
 
 		# output::
-		#   Where to write the string
+		#	 Where to write the string
 		# indent::
-		#   An integer.  If -1, no indenting will be used; otherwise, the
-		#   indentation will be this number of spaces, and children will be
-		#   indented an additional amount.
+		#	 An integer.	If -1, no indenting will be used; otherwise, the
+		#	 indentation will be this number of spaces, and children will be
+		#	 indented an additional amount.
 		# transitive::
-		#   If transitive is true and indent is >= 0, then the output will be
-		#   pretty-printed in such a way that the added whitespace does not affect
-		#   the absolute *value* of the document -- that is, it leaves the value
-		#   and number of Text nodes in the document unchanged.
+		#	 Ignored by this class.	The contents of comments are never modified.
 		# ie_hack::
-		#   Internet Explorer is the worst piece of crap to have ever been
-		#   written, with the possible exception of Windows itself.  Since IE is
-		#   unable to parse proper XML, we have to provide a hack to generate XML
-		#   that IE's limited abilities can handle.  This hack inserts a space 
-		#   before the /> on empty tags.
-		#
+		#	 Needed for conformity to the child API, but not used by this class.
 		def write( output, indent=-1, transitive=false, ie_hack=false )
 			indent( output, indent )
 			output << START
 			output << @string
-      if indent>-1
-        output << "\n"
-        indent( output, indent )
-      end
 			output << STOP
 		end