diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-03-15 10:23:12 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-03-15 10:23:12 +1000 |
| commit | 798462e739f23bb498b72675a57e4cc331404945 (patch) | |
| tree | 9e6b3cb8b3a8bbc56af05faa23e8b3905e2f48f2 /src/scaladoc | |
| parent | 5ebae12875be19ddc98520b21d98af19b7c7b2da (diff) | |
| parent | 827b6f3b1d3e96bf838ed70fdb839c6c57672758 (diff) | |
| download | scala-798462e739f23bb498b72675a57e4cc331404945.tar.gz scala-798462e739f23bb498b72675a57e4cc331404945.tar.bz2 scala-798462e739f23bb498b72675a57e4cc331404945.zip | |
Merge pull request #5040 from adriaanm/rebase-5031
Merge 2.11.x into 2.12.x [ci: last-only]
Diffstat (limited to 'src/scaladoc')
| -rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/Settings.scala | 2 | ||||
| -rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/Settings.scala b/src/scaladoc/scala/tools/nsc/doc/Settings.scala index de86acb6d6..59380dd782 100644 --- a/src/scaladoc/scala/tools/nsc/doc/Settings.scala +++ b/src/scaladoc/scala/tools/nsc/doc/Settings.scala @@ -48,7 +48,7 @@ class Settings(error: String => Unit, val printMsg: String => Unit = println(_)) val docfooter = StringSetting ( "-doc-footer", "footer", - "A footer on every Scaladoc page, by default the EPFL/Typesafe copyright notice. Can be overridden with a custom footer.", + "A footer on every Scaladoc page, by default the EPFL/Lightbend copyright notice. Can be overridden with a custom footer.", "" ) diff --git a/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala b/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala index 6c8f989b8c..e45847da78 100644 --- a/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala +++ b/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala @@ -404,7 +404,7 @@ trait EntityPage extends HtmlPage { { if (Set("epfl", "EPFL").contains(tpl.universe.settings.docfooter.value)) - <div id="footer">Scala programming documentation. Copyright (c) 2003-2016 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://typesafe.com" target="_top">Typesafe</a>.</div> + <div id="footer">Scala programming documentation. Copyright (c) 2003-2016 <a href="http://www.epfl.ch" target="_top">EPFL</a>, with contributions from <a href="http://www.lightbend.com" target="_top">Lightbend</a>.</div> else <div id="footer"> { tpl.universe.settings.docfooter.value } </div> } |