diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala index 047dfcd9a4..483eb046da 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala @@ -193,14 +193,14 @@ object ActorSystem { * then tries to walk the stack to find the callers class loader, then falls back to the ClassLoader * associated with the ActorSystem class. * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ def create(name: String, config: Config): ActorSystem = apply(name, config) /** * Creates a new ActorSystem with the specified name, the specified Config, and specified ClassLoader * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ def create(name: String, config: Config, classLoader: ClassLoader): ActorSystem = apply(name, config, classLoader) @@ -217,7 +217,7 @@ object ActorSystem { * executor = "default-executor", including those that have not defined the executor setting and thereby fallback * to the default of "default-dispatcher.executor". * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ def create( name: String, @@ -270,14 +270,14 @@ object ActorSystem { * then tries to walk the stack to find the callers class loader, then falls back to the ClassLoader * associated with the ActorSystem class. * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ def apply(name: String, config: Config): ActorSystem = apply(name, Option(config), None, None) /** * Creates a new ActorSystem with the specified name, the specified Config, and specified ClassLoader * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ def apply(name: String, config: Config, classLoader: ClassLoader): ActorSystem = apply(name, Option(config), Option(classLoader), None) @@ -291,7 +291,7 @@ object ActorSystem { * If no ExecutionContext is given, the system will fallback to the executor configured under "akka.actor.default-dispatcher.default-executor.fallback". * The system will use the passed in config, or falls back to the default reference configuration using the ClassLoader. * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ def apply( name: String, @@ -305,7 +305,7 @@ object ActorSystem { * * For more detailed information about the different possible configuration options, look in the Akka Documentation under "Configuration" * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ class Settings(classLoader: ClassLoader, cfg: Config, final val name: String, val setup: ActorSystemSetup) { @@ -314,7 +314,7 @@ object ActorSystem { /** * The backing Config of this ActorSystem's Settings * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ final val config: Config = { val config = cfg.withFallback(ConfigFactory.defaultReference(classLoader)) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 41fec9f200..b78ebdfdb5 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -34,8 +34,7 @@ object Dependencies { object Compile { // Compile - // when updating config version, update links ActorSystem ScalaDoc to link to the updated version - val config = "com.typesafe" % "config" % "1.3.3" // ApacheV2 + val config = "com.typesafe" % "config" % "1.3.4" // ApacheV2 val netty = "io.netty" % "netty" % "3.10.6.Final" // ApacheV2 val scalaXml = "org.scala-lang.modules" %% "scala-xml" % scalaXmlVersion // Scala License