Merge commit 'refs/pull/431/head'

5 files changed, 9 insertions, 9 deletions

diff --git a/src/compiler/scala/reflect/internal/Names.scala b/src/compiler/scala/reflect/internal/Names.scala
index dc89b14869..23eaa1088c 100644
--- a/src/compiler/scala/reflect/internal/Names.scala
+++ b/src/compiler/scala/reflect/internal/Names.scala
@@ -397,14 +397,14 @@ trait Names extends api.Names {
     // def decodedName: ThisNameType = newName(decoded)
     def encodedName: ThisNameType = encode
 
-    /** Replace operator symbols by corresponding $op_name. */
+    /** Replace operator symbols by corresponding \$op_name. */
     def encode: ThisNameType = {
       val str = toString
       val res = NameTransformer.encode(str)
       if (res == str) thisName else newName(res)
     }
 
-    /** Replace $op_name by corresponding operator symbol. */
+    /** Replace \$op_name by corresponding operator symbol. */
     def decode: String = {
       if (this containsChar '$') {
         val str = toString
diff --git a/src/library/scala/collection/SeqExtractors.scala b/src/library/scala/collection/SeqExtractors.scala
index cbb09a0a90..de9ff93521 100644
--- a/src/library/scala/collection/SeqExtractors.scala
+++ b/src/library/scala/collection/SeqExtractors.scala
@@ -11,8 +11,7 @@ object +: {
 /** An extractor used to init/last deconstruct sequences. */
 object :+ {
   /** Splits a sequence into init :+ tail.
-   * @returns Some(init, tail) if sequence is non-empty.
-   *          None otherwise.
+   * @return Some(init, tail) if sequence is non-empty. None otherwise.
    */
   def unapply[T,Coll <: SeqLike[T, Coll]](
       t: Coll with SeqLike[T, Coll]): Option[(Coll, T)] =
diff --git a/src/library/scala/reflect/api/Names.scala b/src/library/scala/reflect/api/Names.scala
index d92d056751..96651ffa88 100755
--- a/src/library/scala/reflect/api/Names.scala
+++ b/src/library/scala/reflect/api/Names.scala
@@ -33,13 +33,13 @@ trait Names {
     /** Returns a type name that represents the same string as this name */
     def toTypeName: TypeName
 
-    /** Replaces all occurrences of $op_names in this name by corresponding operator symbols.
-     *  Example: `foo_$plus$eq` becomes `foo_+=`
+    /** Replaces all occurrences of \$op_names in this name by corresponding operator symbols.
+     *  Example: `foo_\$plus\$eq` becomes `foo_+=`
      */
     def decoded: String
 
-    /** Replaces all occurrences of operator symbols in this name by corresponding $op_names.
-     *  Example: `foo_+=` becomes `foo_$plus$eq`.
+    /** Replaces all occurrences of operator symbols in this name by corresponding \$op_names.
+     *  Example: `foo_+=` becomes `foo_\$plus\$eq`.
      */
     def encoded: String
 
diff --git a/src/library/scala/reflect/api/Types.scala b/src/library/scala/reflect/api/Types.scala
index 4cb5609166..e06bb37cba 100755
--- a/src/library/scala/reflect/api/Types.scala
+++ b/src/library/scala/reflect/api/Types.scala
@@ -269,6 +269,7 @@ trait Types { self: Universe =>
    *     (T # x).type             SingleType(T, x)
    *     p.x.type                 SingleType(p.type, x)
    *     x.type                   SingleType(NoPrefix, x)
+   *  }}}
    */
   type SingleType <: SingletonType
 
diff --git a/src/library/scala/util/matching/Regex.scala b/src/library/scala/util/matching/Regex.scala
index 3f21cc9724..a83619cf01 100644
--- a/src/library/scala/util/matching/Regex.scala
+++ b/src/library/scala/util/matching/Regex.scala
@@ -204,7 +204,7 @@ class Regex(regex: String, groupNames: String*) extends Serializable {
 
 
   /** Return all matches of this regexp in given character sequence as a
-   *  [[scala.collection.Iterator]] of [[scala.util.matching.Regex.Match].
+   *  [[scala.collection.Iterator]] of [[scala.util.matching.Regex.Match]].
    *
    *  @param source The text to match against.
    *  @return       A [[scala.collection.Iterator]] of [[scala.util.matching.Regex.Match]] for all matches.