Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-master

Conflicts (discarded):
	hand-written.md
	release-notes.html

Author: retronym

src/main/scala/GitInfo.scala

@@ -1,5 +1,6 @@
 
 case class Commit(sha: String, author: String, header: String, body: String) {
+  def trimmedHeader = header.take(80)
   override def toString = " * " + sha + " (" + author + ") " + header + " - " + body.take(5) + " ..."
 }
 
@@ -75,7 +76,7 @@ class GitInfo(gitDir: java.io.File, val previousTag: String, val currentTag: Str
     sb append header4("Complete commit list!")
     sb append targetLanguage.tableHeader("sha", "Title")
     for (commit <- commits)
-      sb append targetLanguage.tableRow(commitShaLink(commit.sha), commit.header)
+      sb append targetLanguage.tableRow(commitShaLink(commit.sha), commit.trimmedHeader)
     sb append targetLanguage.tableEnd
     sb.toString
   }
@@ -86,7 +87,7 @@ class GitInfo(gitDir: java.io.File, val previousTag: String, val currentTag: Str
     sb append header4(s"Commits and the issues they fixed since ${previousTag}")
     sb append targetLanguage.tableHeader("Issue(s)", "Commit", "Message")
     for (commit <- fixCommits)
-      sb append targetLanguage.tableRow(fixLinks(commit), commitShaLink(commit.sha), commit.header)
+      sb append targetLanguage.tableRow(fixLinks(commit), commitShaLink(commit.sha), commit.trimmedHeader)
     sb append targetLanguage.tableEnd
     sb append blankLine()
     sb.toString

src/main/scala/MakeReleaseNotes.scala

@@ -40,7 +40,7 @@ object MakeReleaseNotes {
       } else Nil
       // if you don't have the next line, sub-bullets would be screwed!
       // please take this case into account and comment out 2 next lines and uncomment the line after!
-      val newLines = lines.map(x => if (x.startsWith("    *")) "\n" + x else x)
+      val newLines = lines.map(x => if (x.startsWith("    *")) "\n" + x.stripPrefix("  ") else x)
       newLines.mkString("\n")
       //      lines.mkString("\n")
     }

src/main/scala/TargetLanguage.scala

@@ -10,7 +10,7 @@ sealed trait TargetLanguage {
 }
 case object MarkDown extends TargetLanguage {
   def createHyperLink(link: String, content: String): String =
-    s"[$link]($content)"
+    s"[$content]($link)"
   def blankLine(): String = "\n"
   def header4(msg: String): String = s"#### $msg\n"
   def tableHeader(firstColumn: String, secondColumn: String): String =