Merge commit 'refs/pull/1574/head' into merge-210

* commit 'refs/pull/1574/head': (24 commits)
  Fixing issue where OSGi bundles weren't getting used for distribution.
  Fixes example in Type.asSeenFrom
  Fix for SI-6600, regression with ScalaNumber.
  SI-6562 Fix crash with class nested in @inline method
  Brings copyrights in Scaladoc footer and manpage up-to-date, from 2011/12 to 2013
  Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013
  SI-6606 Drops new icons in, replaces abstract types placeholder icons
  SI-6132 Revisited, cleaned-up, links fixed, spelling errors fixed, rewordings
  Labeling scala.reflect and scala.reflect.macros experimental in the API docs
  Typo-fix in scala.concurrent.Future, thanks to @pavelpavlov
  Remove implementation details from Position (they are still under reflection.internal). It probably needs more cleanup of the api wrt to ranges etc but let's leave it for later
  SI-6399 Adds API docs for Any and AnyVal
  Removing actors-migration from main repository so it can live on elsewhere.
  Fix for SI-6597, implicit case class crasher.
  SI-6578 Harden against synthetics being added more than once.
  SI-6556 no assert for surprising ctor result type
  Removing actors-migration from main repository so it can live on elsewhere.
  Fixes SI-6500 by making erasure more regular.
  Modification to SI-6534 patch.
  Fixes SI-6559 - StringContext not using passed in escape function.
  ...

Conflicts:
	src/actors-migration/scala/actors/migration/StashingActor.scala
	src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
	src/compiler/scala/tools/nsc/settings/AestheticSettings.scala
	src/compiler/scala/tools/nsc/transform/Erasure.scala
	src/library/scala/Application.scala
	src/library/scala/collection/immutable/GenIterable.scala.disabled
	src/library/scala/collection/immutable/GenMap.scala.disabled
	src/library/scala/collection/immutable/GenSeq.scala.disabled
	src/library/scala/collection/immutable/GenSet.scala.disabled
	src/library/scala/collection/immutable/GenTraversable.scala.disabled
	src/library/scala/collection/mutable/GenIterable.scala.disabled
	src/library/scala/collection/mutable/GenMap.scala.disabled
	src/library/scala/collection/mutable/GenSeq.scala.disabled
	src/library/scala/collection/mutable/GenSet.scala.disabled
	src/library/scala/collection/mutable/GenTraversable.scala.disabled
	src/library/scala/collection/parallel/immutable/ParNumericRange.scala.disabled

1 files changed, 13 insertions, 7 deletions

diff --git a/src/reflect/scala/reflect/api/Printers.scala b/src/reflect/scala/reflect/api/Printers.scala
index 2a10d89234..76df76cdc8 100644
--- a/src/reflect/scala/reflect/api/Printers.scala
+++ b/src/reflect/scala/reflect/api/Printers.scala
@@ -3,14 +3,17 @@ package api
 
 import java.io.{ PrintWriter, StringWriter }
 
-/** Utilities for nicely printing [[scala.reflect.api.Trees]] and [[scala.reflect.api.Types]].
+/**
+ * <span class="badge badge-red" style="float: right;">EXPERIMENTAL</span>
  *
- *  === Printing Trees ===
- *  The method `show` displays the "prettified" representation of reflection artifacts.
- *  This representation provides one with the desugared Java representation of Scala code.
- *  For example:
+ * Utilities for nicely printing [[scala.reflect.api.Trees]] and [[scala.reflect.api.Types]].
  *
- *  {{{
+ * === Printing Trees ===
+ * The method `show` displays the "prettified" representation of reflection artifacts.
+ * This representation provides one with the desugared Java representation of Scala code.
+ * For example:
+ *
+ * {{{
  *  scala> import scala.reflect.runtime.universe._
  *  import scala.reflect.runtime.universe._
  *
@@ -116,17 +119,20 @@ import java.io.{ PrintWriter, StringWriter }
  *
  * `printIds` and/or `printKinds` can additionally be supplied as arguments in a call to
  * `showRaw` which additionally shows the unique identifiers of symbols.
+ *
+ * {{{
  *  scala> showRaw(tpe, printIds = true, printKinds = true)
  *  res2: String = RefinedType(
  *    List(TypeRef(ThisType(scala#2043#PK), newTypeName("AnyRef")#691#TPE, List())),
  *    Scope(
  *      newTermName("x")#2540#METH,
  *      newTermName("y")#2541#GET))
- *  }}}
+ * }}}
  *
  * For more details about `Printer`s and other aspects of Scala reflection, see the
  * [[http://docs.scala-lang.org/overviews/reflection/overview.html Reflection Guide]]
  *
+ *  @group ReflectionAPI
  */
 trait Printers { self: Universe =>