Skip to content

Commit 4b471eb

Browse files
committed
Typesafe -> Lightbend in more places
1 parent f302963 commit 4b471eb

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ We follow the standard GitHub [fork & pull](https://help.github.com/articles/usi
44
You're always welcome to submit your PR straight away and start the discussion (without reading the rest of this wonderful doc, or the `READMEnot^H^H^H.md`). The goal of these notes is to make your experience contributing to Scala as smooth and pleasant as possible. We're happy to guide you through the process once you've submitted your PR.
55

66
## The Scala Community
7-
In 2014, you -- the Scala community -- matched the core team at EPFL in number of commits contributed to Scala 2.11, doubling the percentage of commits from outside EPFL/Typesafe since 2.10. Excellent work! (The split was roughly 25/25/50 for you/EPFL/Typesafe.)
7+
In 2014, you -- the Scala community -- matched the core team at EPFL in number of commits contributed to Scala 2.11, doubling the percentage of commits from outside EPFL/Lightbend since 2.10. Excellent work! (The split was roughly 25/25/50 for you/EPFL/Lightbend.)
88

99
We are super happy about this, and are eager to make your experience contributing to Scala productive and satisfying, so that we can keep up this growth. We can't do this alone (nor do we want to)!
1010

1111
This is why we're collecting these notes on how to contribute, and we hope you'll share your experience to improve the process for the next contributor! (Feel free to send a PR for this note, send your thoughts to scala-internals, or tweet about it to @adriaanm.)
1212

13-
By the way, the team at Lightbend (formerly Typesafe) is: @adriaanm, @lrytz, @retronym, @SethTisue, and @szeiger.
13+
By the way, the team at Lightbend is: @adriaanm, @lrytz, @retronym, @SethTisue, and @szeiger.
1414

1515
## What kind of PR are you submitting?
1616

doc/LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Scala is licensed under the [BSD 3-Clause License](http://opensource.org/license
44

55
Copyright (c) 2002-2016 EPFL
66

7-
Copyright (c) 2011-2016 Lightbend, Inc. (formerly Typesafe, Inc.)
7+
Copyright (c) 2011-2016 Lightbend, Inc.
88

99
All rights reserved.
1010

doc/License.rtf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
\fs40 \
1212

1313
\fs26 Copyright (c) 2002-2016 EPFL\
14-
Copyright (c) 2011-2016 Lightbend, Inc. (formerly Typesafe, Inc.)\
14+
Copyright (c) 2011-2016 Lightbend, Inc.\
1515
All rights reserved.\
1616
\
1717
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\

src/scaladoc/scala/tools/nsc/doc/Settings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class Settings(error: String => Unit, val printMsg: String => Unit = println(_))
4545
val docfooter = StringSetting (
4646
"-doc-footer",
4747
"footer",
48-
"A footer on every Scaladoc page, by default the EPFL/Typesafe copyright notice. Can be overridden with a custom footer.",
48+
"A footer on every Scaladoc page, by default the EPFL/Lightbend copyright notice. Can be overridden with a custom footer.",
4949
""
5050
)
5151

src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp
280280

281281
{
282282
if (Set("epfl", "EPFL").contains(tpl.universe.settings.docfooter.value))
283-
<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>
283+
<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>
284284
else
285285
<div id="footer"> { tpl.universe.settings.docfooter.value } </div>
286286
}

0 commit comments

Comments
 (0)