diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-14 11:45:27 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-14 11:45:27 -0700 |
| commit | cbba68fb6085f238097fbf1635046051bd7c6889 (patch) | |
| tree | c2ad5795f1fc7935a543018854264d3f431df2cd /src/scaladoc/scala/tools | |
| parent | 067a4d36a6d30d6431a520c9db8ec4714f1a8675 (diff) | |
| parent | 1706a37eb84ec252aea77bccebad3e48448534ad (diff) | |
| download | scala-cbba68fb6085f238097fbf1635046051bd7c6889.tar.gz scala-cbba68fb6085f238097fbf1635046051bd7c6889.tar.bz2 scala-cbba68fb6085f238097fbf1635046051bd7c6889.zip | |
Merge 2.11.x into 2.12.x
Resolved conflicts as in b0e05b67c7
Diffstat (limited to 'src/scaladoc/scala/tools')
| -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> } |