From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 7 Oct 2012 23:42:23 +0000 (+1100)
Subject: Merge remote-tracking branch 'kbuild/for-next'
X-Git-Tag: next-20121008~54
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ffaf3465ae78c2c2967c2aa0fd1ad4e1808978da;p=karo-tx-linux.git

Merge remote-tracking branch 'kbuild/for-next'
---

ffaf3465ae78c2c2967c2aa0fd1ad4e1808978da
diff --cc scripts/kernel-doc
index 01e8a8e22602,97e037aa97a7..46e7aff80d1a
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@@ -460,14 -479,14 +481,19 @@@ sub output_highlight 
      die $@ if $@;
  #   print STDERR "contents af:$contents\n";
  
+ #   strip whitespaces when generating html5
+     if ($output_mode eq "html5") {
+ 	$contents =~ s/^\s+//;
+ 	$contents =~ s/\s+$//;
+     }
      foreach $line (split "\n", $contents) {
 +	if (! $output_preformatted) {
 +	    $line =~ s/^\s*//;
 +	}
  	if ($line eq ""){
 -	    print $lineprefix, local_unescape($blankline);
 +	    if (! $output_preformatted) {
 +		print $lineprefix, local_unescape($blankline);
 +	    }
  	} else {
  	    $line =~ s/\\\\\\/\&/g;
  	    if ($output_mode eq "man" && substr($line, 0, 1) eq ".") {