Merge branch '2.11.x' into merge/2.11.x-to-2.12.x-20150624

6 files changed, 29 insertions, 4 deletions

diff --git a/test/scaladoc/resources/implicits-base-res.scala b/test/scaladoc/resources/implicits-base-res.scala
index 1d17e9a6d3..559d21997f 100644
--- a/test/scaladoc/resources/implicits-base-res.scala
+++ b/test/scaladoc/resources/implicits-base-res.scala
@@ -52,7 +52,7 @@ object A {
  * def convToGtColonDoubleA(x: Double)      // enrichA3: no constraints
  * def convToManifestA(x: Double)           // enrichA7: no constraints
  * def convToMyNumericA(x: Double)          // enrichA6: (if showAll is set) with a constraint that there is x: MyNumeric[Double] implicit in scope
- * def convToNumericA(x: Double)            // enrichA1: no constraintsd
+ * def convToNumericA(x: Double)            // enrichA1: no constraints
  * def convToEnrichedA(x: Bar[Foo[Double]]) // enrichA5: no constraints, SHADOWED
  * def convToEnrichedA(x: Double)           // enrichA0: no constraints, SHADOWED
  * def convToTraversableOps(x: Double)      // enrichA7: no constraints
diff --git a/test/scaladoc/run/SI-8210.check b/test/scaladoc/run/SI-8210.check
new file mode 100644
index 0000000000..619c56180b
--- /dev/null
+++ b/test/scaladoc/run/SI-8210.check
@@ -0,0 +1 @@
+Done.
diff --git a/test/scaladoc/run/SI-8210.scala b/test/scaladoc/run/SI-8210.scala
new file mode 100644
index 0000000000..3bd818473f
--- /dev/null
+++ b/test/scaladoc/run/SI-8210.scala
@@ -0,0 +1,24 @@
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocModelTest
+
+object Test extends ScaladocModelTest {
+  override def code = """
+object Foo {
+  trait Config {
+    /** The bar obviously. */
+    def bar: Int
+  }
+  class ConfigBuilder extends Config {
+    /** @inheritdoc
+      *
+      * The default value is 1234.
+      */
+    var bar: Int = 1234
+  }
+}
+  """
+
+  def scaladocSettings = ""
+
+  def testModel(root: Package) = ()
+}
diff --git a/test/scaladoc/run/groups.scala b/test/scaladoc/run/groups.scala
index c9e4a8679b..ad5cca89b8 100644
--- a/test/scaladoc/run/groups.scala
+++ b/test/scaladoc/run/groups.scala
@@ -38,7 +38,7 @@ object Test extends ScaladocModelTest {
            *  @groupdesc C Group C is introduced by B
            */
           trait B {
-            /** baz descriptopn
+            /** baz description
              *  @group C */
             def baz = 3
           }
diff --git a/test/scaladoc/run/implicits-base.scala b/test/scaladoc/run/implicits-base.scala
index 8f8652cdb3..ea87a670bb 100644
--- a/test/scaladoc/run/implicits-base.scala
+++ b/test/scaladoc/run/implicits-base.scala
@@ -94,7 +94,7 @@ object Test extends ScaladocModelTest {
     assert(isShadowed(conv._member("convToEnrichedA")))
     assert(conv._member("convToEnrichedA").resultType.name == "Double")
 
-    // def convToNumericA: Double          // enrichA1: no constraintsd
+    // def convToNumericA: Double          // enrichA1: no constraints
     conv = B._conversion(A.qualifiedName + ".enrichA1")
     assert(conv.members.length == 1)
     assert(conv.constraints.length == 0)
diff --git a/test/scaladoc/scalacheck/HtmlFactoryTest.scala b/test/scaladoc/scalacheck/HtmlFactoryTest.scala
index 98a601bb20..913667b79b 100644
--- a/test/scaladoc/scalacheck/HtmlFactoryTest.scala
+++ b/test/scaladoc/scalacheck/HtmlFactoryTest.scala
@@ -711,7 +711,7 @@ object Test extends Properties("HtmlFactory") {
 
     property("class") = files.get("com/example/p1/Clazz.html") match {
       case Some(node: scala.xml.Node) => {
-        property("implicit convertion") =
+        property("implicit conversion") =
           node.toString contains "<span class=\"modifier\">implicit </span>"
 
         property("gt4s") =