Skip to content

Commit e69e2f4

Browse files
SethTisueSethTisue
committed
Merge pull request scala#416 from SethTisue/light-saber-type-fender
Typesafe -> Lightbend
2 parents 5d4a904 + a99bc46 commit e69e2f4

26 files changed

+130
-161
lines changed

‎_layouts/downloadpage.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@
2929
<div class="bigcircle" style="float: right;">2</div>
3030
<div class="bigcircle-content" style="float: right; margin-top: 32px;">
3131
<p class="center" style="text-align: right;">
32-
<b><a href="http://www.typesafe.com/platform/getstarted">Get started with Typesafe Activator</a></b>
32+
<b><a href="http://www.lightbend.com/activator/">Get started with Lightbend Activator</a></b>
3333
<br/>
34-
Typesafe Activator is a browser-based or command-line<br/>
34+
Lightbend Activator is a browser-based or command-line<br/>
3535
tool that helps developers get started with Scala.
3636
<div class="download-wrapper">
37-
<a id="download-button" class="activator" style="margin-top: 12px; margin-right: 24px; width: 200px;" href="http://downloads.typesafe.com/typesafe-activator/1.2.10/typesafe-activator-1.2.10.zip">
37+
<a id="download-button" class="activator" style="margin-top: 12px; margin-right: 24px; width: 200px;" href="http://downloads.lightbend.com/typesafe-activator/1.2.10/typesafe-activator-1.2.10.zip">
3838
<span class="slider">Download</span>
3939
<span class="activator icon"></span>
40-
<span class="version-long">&nbsp;Typesafe Activator</span>
40+
<span class="version-long">&nbsp;Lightbend Activator</span>
4141
</a>
42-
<p class="install"><a style="margin-left: 124px;" href="http://www.typesafe.com/platform/getstarted">Need help installing?</a></p>
42+
<p class="install"><a style="margin-left: 124px;" href="http://www.lightbend.com/activator/download">Need help installing?</a></p>
4343
</div>
4444
</p>
4545
</div>

‎_layouts/maindownloadpage.html

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,6 @@
33
---
44

55

6-
<!-- <h3>Installing Scala</h3>
7-
8-
For resources on getting started programming in Scala, have a look at the <a href="{{ site.baseurl }}/documentation/getting-started.html">Getting Started guide</a>.
9-
10-
First, here are the most popular ways to install Scala on your machine: -->
11-
12-
<!-- <ul>
13-
<li><a href="{{ site.baseurl }}/download/">Download the Scala distribution</a>,
14-
unpack the archive, and launch <code>scala</code> (in the <code>bin</code> folder).
15-
This starts the interactive Scala interpreter (aka the "REPL").
16-
The standard batch compiler can be invoked from the command line as <code>scalac</code>.
17-
We recommend one of the build tools that support Scala:
18-
<ul>
19-
<li><a href="http://www.scala-sbt.org/">sbt</a>,</li>
20-
<li>maven with the <a href="http://davidb.github.com/scala-maven-plugin/index.html">Scala plugin</a>,</li>
21-
<li>or the <a href="http://www.gradle.org/docs/current/userguide/scala_plugin.html">Scala plugin for gradle</a>.</li>
22-
</ul>
23-
</li>
24-
<li>Install one of the Scala IDEs: the <a href="http://scala-ide.org/">Scala IDE</a> (based on Eclipse),
25-
<a href="http://www.jetbrains.com/idea/">IntelliJ IDEA</a> with the Scala plugin,
26-
or <a href="http://netbeans.org/">NetBeans IDE</a> with the Scala plugin</li>
27-
<ul><li>
28-
The Scala IDE and IntelliJ IDEA both support <strong><a href="https://github.com/scala-ide/scala-worksheet/wiki/Getting-Started">Scala worksheets</a></strong>, interactive Scala documents that are continuously evaluated line-by-line. Worksheets are an excellent way to experiment with Scala while still being able to save your code as in file and reuse it later on.
29-
</li></ul>
30-
</li>
31-
<li><a href="http://typesafe.com/platform/getstarted">Typesafe Activator</a> is a one-click way to get started creating applications with Scala,
32-
Akka and Play Framework. Activator comes with <a href="http://typesafe.com/activator/templates">dozens of templates</a> to help you get started quickly.
33-
<a href="http://typesafe.com/activator/template/contribute">Create your own template</a> to help programmers discover and quickly get up to speed with
34-
your own project, or <a href="https://github.com/typesafehub/activator/">contribute to Activator itself</a>!</li>
35-
</ul> -->
36-
376
<h3>Additional information</h3>
387

398
You can find the links to prior versions or the latest development version below.

‎conduct.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ forum, mailing list, wiki, web site, Gitter or IRC room, hackathon, public
99
meeting or private correspondence. (See our
1010
[list of community fora](community/).)
1111

12-
Scala moderators are appointed by EPFL and Typesafe to maintain the
12+
Scala moderators are appointed by EPFL and Lightbend to maintain the
1313
health of the community and will arbitrate in any dispute over the
1414
conduct of a member of the community.
1515

‎contribute/documentation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ without creating an issue, but please look to see if there is an issue already s
3030

3131
### Examples/Tutorials in Activator Templates
3232

33-
[Typesafe Activator](https://typesafe.com/community/core-tools/activator-and-sbt)
33+
[Lightbend Activator](https://www.lightbend.com/community/core-tools/activator-and-sbt)
3434
is a tool based on SBT, with a UI mode that is ideal for code based tutorials, overviews and walk-throughs. To contribute an example in activator, you can fork an existing template, edit it, add a tutorial, upload it to github and then submit the github project into the template repository. It's the fastest way to produce a working code example with tutorial.
3535

36-
Please see [Contributing an Activator Template](https://typesafe.com/activator/template/contribute) for more details.
36+
Please see [Contributing an Activator Template](https://www.lightbend.com/activator/template/contribute) for more details.
3737

3838
### The Main Scala Documentation Site
3939

‎contribute/guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Typically the scaladoc tool provides a low entry point for new committers, so it
4444
On the Scala bug tracker you will find many bugs that are [marked as good starting points to contributing ("community" bugs)](https://issues.scala-lang.org/secure/IssueNavigator.jspa?requestId=12111) or [that are not currently assigned](https://issues.scala-lang.org/secure/IssueNavigator.jspa?requestId=12112) and that you could pick up. Once you decided on a ticket to look at, see the next step on how to proceed further.
4545

4646
If you are interested in contributing code, we ask you to sign the
47-
[Scala Contributor License Agreement](http://typesafe.com/contribute/cla/scala),
47+
[Scala Contributor License Agreement](http://www.lightbend.com/contribute/cla/scala),
4848
which allows us to ensure that all code submitted to the project is
4949
unencumbered by copyrights or patents.
5050

‎contribute/hacker-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ Once you are satisfied with your work, synced with `master` and cleaned up your
402402

403403
Now, we must simply submit our proposed patch. Navigate to your branch in GitHub (for me it was `https://github.com/xeno-by/scala/tree/ticket/6725`)
404404
and click the pull request button to submit your patch as a pull request to Scala. If you've never submitted patches to Scala, you will
405-
need to sign the contributor license agreement, which [can be done online](http://typesafe.com/contribute/cla/scala) within a few minutes.
405+
need to sign the contributor license agreement, which [can be done online](http://www.lightbend.com/contribute/cla/scala) within a few minutes.
406406

407407
<img src="{{ site.baseurl }}/resources/img/04-submit.png" alt="Submit a pull request" class="centerclear" />
408408

‎contribute/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Coordination of contribution efforts takes place on the
2727
<div class="row">
2828
<div class="span4 doc-block">
2929
<h4><a href="./documentation.html">Documentation</a></h4>
30-
<p><a href="./scala-standard-library-api-documentation.html">Scaladoc (API)</a>, <a href="https://typesafe.com/activator/template/contribute">Activator templates</a>,
30+
<p><a href="./scala-standard-library-api-documentation.html">Scaladoc (API)</a>, <a href="https://www.lightbend.com/activator/template/contribute">Activator templates</a>,
3131
<a href="http://docs.scala-lang.org/contribute.html">docs.scala-lang.org</a> and
3232
<a href="https://github.com/scala/scala-lang">scala-lang.org</a>.</p>
3333
</div>
@@ -119,7 +119,7 @@ to build and test a corpus of
119119
Scala open source projects
120120
against development versions of the Scala compiler and standard
121121
library in order to discover regressions prior to releases.
122-
The build uses Typesafe's
122+
The build uses Lightbend's
123123
[dbuild](https://github.com/typesafehub/dbuild) tool,
124124
which leverages [sbt](http://www.scala-sbt.org).
125125

‎download/_posts/2014-01-28-2.11.0-M8.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ show_resources: "true"
88
permalink: /download/2.11.0-M8.html
99
requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires the Java runtime version 1.6 or later, which can be downloaded <a href='http://www.java.com/'>here</a>."
1010
resources: [
11-
["-main-unixsys", "scala-2.11.0-M8.tgz", "http://downloads.typesafe.com/scala/2.11.0-M8/scala-2.11.0-M8.tgz", "Mac OS X, Unix, Cygwin", "28.32M"],
12-
["-main-windows", "scala-2.11.0-M8.msi", "http://downloads.typesafe.com/scala/2.11.0-M8/scala-2.11.0-M8.msi", "Windows (msi installer)", "91.31M"],
13-
["-non-main-sys", "scala-2.11.0-M8.zip", "http://downloads.typesafe.com/scala/2.11.0-M8/scala-2.11.0-M8.zip", "Windows", "28.33M"],
14-
["-non-main-sys", "scala-2.11.0-M8.deb", "http://downloads.typesafe.com/scala/2.11.0-M8/scala-2.11.0-M8.deb", "Debian", "90.37M"],
15-
["-non-main-sys", "scala-2.11.0-M8.rpm", "http://downloads.typesafe.com/scala/2.11.0-M8/scala-2.11.0-M8.rpm", "RPM package", "90.36M"],
16-
["-non-main-sys", "scala-docs-2.11.0-M8.txz", "http://downloads.typesafe.com/scala/2.11.0-M8/scala-docs-2.11.0-M8.txz", "API docs", "35.22M"],
17-
["-non-main-sys", "scala-docs-2.11.0-M8.zip", "http://downloads.typesafe.com/scala/2.11.0-M8/scala-docs-2.11.0-M8.zip", "API docs", "65.30M"],
11+
["-main-unixsys", "scala-2.11.0-M8.tgz", "http://downloads.lightbend.com/scala/2.11.0-M8/scala-2.11.0-M8.tgz", "Mac OS X, Unix, Cygwin", "28.32M"],
12+
["-main-windows", "scala-2.11.0-M8.msi", "http://downloads.lightbend.com/scala/2.11.0-M8/scala-2.11.0-M8.msi", "Windows (msi installer)", "91.31M"],
13+
["-non-main-sys", "scala-2.11.0-M8.zip", "http://downloads.lightbend.com/scala/2.11.0-M8/scala-2.11.0-M8.zip", "Windows", "28.33M"],
14+
["-non-main-sys", "scala-2.11.0-M8.deb", "http://downloads.lightbend.com/scala/2.11.0-M8/scala-2.11.0-M8.deb", "Debian", "90.37M"],
15+
["-non-main-sys", "scala-2.11.0-M8.rpm", "http://downloads.lightbend.com/scala/2.11.0-M8/scala-2.11.0-M8.rpm", "RPM package", "90.36M"],
16+
["-non-main-sys", "scala-docs-2.11.0-M8.txz", "http://downloads.lightbend.com/scala/2.11.0-M8/scala-docs-2.11.0-M8.txz", "API docs", "35.22M"],
17+
["-non-main-sys", "scala-docs-2.11.0-M8.zip", "http://downloads.lightbend.com/scala/2.11.0-M8/scala-docs-2.11.0-M8.zip", "API docs", "65.30M"],
1818
["-non-main-sys", "scala-sources-2.11.0-M8.zip", "https://github.com/scala/scala/archive/v2.11.0-M8.tar.gz", "sources", ""]
1919
]
2020

‎download/_posts/2014-03-06-2.11.0-RC1.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ show_resources: "true"
88
permalink: /download/2.11.0-RC1.html
99
requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires the Java runtime version 1.6 or later, which can be downloaded <a href='http://www.java.com/'>here</a>."
1010
resources: [
11-
["-main-unixsys", "scala-2.11.0-RC1.tgz", "http://downloads.typesafe.com/scala/2.11.0-RC1/scala-2.11.0-RC1.tgz", "Mac OS X, Unix, Cygwin", "24.73M"],
12-
["-main-windows", "scala-2.11.0-RC1.msi", "http://downloads.typesafe.com/scala/2.11.0-RC1/scala-2.11.0-RC1.msi", "Windows (msi installer)", "88.88M"],
13-
["-non-main-sys", "scala-2.11.0-RC1.zip", "http://downloads.typesafe.com/scala/2.11.0-RC1/scala-2.11.0-RC1.zip", "Windows", "24.74M"],
14-
["-non-main-sys", "scala-2.11.0-RC1.deb", "http://downloads.typesafe.com/scala/2.11.0-RC1/scala-2.11.0-RC1.deb", "Debian", "87.87M"],
15-
["-non-main-sys", "scala-2.11.0-RC1.rpm", "http://downloads.typesafe.com/scala/2.11.0-RC1/scala-2.11.0-RC1.rpm", "RPM package", "87.86M"],
16-
["-non-main-sys", "scala-docs-2.11.0-RC1.txz", "http://downloads.typesafe.com/scala/2.11.0-RC1/scala-docs-2.11.0-RC1.txz", "API docs", "36.02M"],
17-
["-non-main-sys", "scala-docs-2.11.0-RC1.zip", "http://downloads.typesafe.com/scala/2.11.0-RC1/scala-docs-2.11.0-RC1.zip", "API docs", "66.52M"],
11+
["-main-unixsys", "scala-2.11.0-RC1.tgz", "http://downloads.lightbend.com/scala/2.11.0-RC1/scala-2.11.0-RC1.tgz", "Mac OS X, Unix, Cygwin", "24.73M"],
12+
["-main-windows", "scala-2.11.0-RC1.msi", "http://downloads.lightbend.com/scala/2.11.0-RC1/scala-2.11.0-RC1.msi", "Windows (msi installer)", "88.88M"],
13+
["-non-main-sys", "scala-2.11.0-RC1.zip", "http://downloads.lightbend.com/scala/2.11.0-RC1/scala-2.11.0-RC1.zip", "Windows", "24.74M"],
14+
["-non-main-sys", "scala-2.11.0-RC1.deb", "http://downloads.lightbend.com/scala/2.11.0-RC1/scala-2.11.0-RC1.deb", "Debian", "87.87M"],
15+
["-non-main-sys", "scala-2.11.0-RC1.rpm", "http://downloads.lightbend.com/scala/2.11.0-RC1/scala-2.11.0-RC1.rpm", "RPM package", "87.86M"],
16+
["-non-main-sys", "scala-docs-2.11.0-RC1.txz", "http://downloads.lightbend.com/scala/2.11.0-RC1/scala-docs-2.11.0-RC1.txz", "API docs", "36.02M"],
17+
["-non-main-sys", "scala-docs-2.11.0-RC1.zip", "http://downloads.lightbend.com/scala/2.11.0-RC1/scala-docs-2.11.0-RC1.zip", "API docs", "66.52M"],
1818
["-non-main-sys", "scala-sources-2.11.0-RC1.zip", "https://github.com/scala/scala/archive/v2.11.0-RC1.tar.gz", "sources", ""]
1919
]
2020
---

‎download/_posts/2014-03-20-2.11.0-RC3.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ show_resources: "true"
88
permalink: /download/2.11.0-RC3.html
99
requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires the Java runtime version 1.6 or later, which can be downloaded <a href='http://www.java.com/'>here</a>."
1010
resources: [
11-
["-main-unixsys", "scala-2.11.0-RC3.tgz", "http://downloads.typesafe.com/scala/2.11.0-RC3/scala-2.11.0-RC3.tgz", "Mac OS X, Unix, Cygwin", "24.77M"],
12-
["-main-windows", "scala-2.11.0-RC3.msi", "http://downloads.typesafe.com/scala/2.11.0-RC3/scala-2.11.0-RC3.msi", "Windows (msi installer)", "88.95M"],
13-
["-non-main-sys", "scala-2.11.0-RC3.zip", "http://downloads.typesafe.com/scala/2.11.0-RC3/scala-2.11.0-RC3.zip", "Windows", "24.79M"],
14-
["-non-main-sys", "scala-2.11.0-RC3.deb", "http://downloads.typesafe.com/scala/2.11.0-RC3/scala-2.11.0-RC3.deb", "Debian", "87.98M"],
15-
["-non-main-sys", "scala-2.11.0-RC3.rpm", "http://downloads.typesafe.com/scala/2.11.0-RC3/scala-2.11.0-RC3.rpm", "RPM package", "87.96M"],
16-
["-non-main-sys", "scala-docs-2.11.0-RC3.txz", "http://downloads.typesafe.com/scala/2.11.0-RC3/scala-docs-2.11.0-RC3.txz", "API docs", "36.10M"],
17-
["-non-main-sys", "scala-docs-2.11.0-RC3.zip", "http://downloads.typesafe.com/scala/2.11.0-RC3/scala-docs-2.11.0-RC3.zip", "API docs", "66.59M"],
11+
["-main-unixsys", "scala-2.11.0-RC3.tgz", "http://downloads.lightbend.com/scala/2.11.0-RC3/scala-2.11.0-RC3.tgz", "Mac OS X, Unix, Cygwin", "24.77M"],
12+
["-main-windows", "scala-2.11.0-RC3.msi", "http://downloads.lightbend.com/scala/2.11.0-RC3/scala-2.11.0-RC3.msi", "Windows (msi installer)", "88.95M"],
13+
["-non-main-sys", "scala-2.11.0-RC3.zip", "http://downloads.lightbend.com/scala/2.11.0-RC3/scala-2.11.0-RC3.zip", "Windows", "24.79M"],
14+
["-non-main-sys", "scala-2.11.0-RC3.deb", "http://downloads.lightbend.com/scala/2.11.0-RC3/scala-2.11.0-RC3.deb", "Debian", "87.98M"],
15+
["-non-main-sys", "scala-2.11.0-RC3.rpm", "http://downloads.lightbend.com/scala/2.11.0-RC3/scala-2.11.0-RC3.rpm", "RPM package", "87.96M"],
16+
["-non-main-sys", "scala-docs-2.11.0-RC3.txz", "http://downloads.lightbend.com/scala/2.11.0-RC3/scala-docs-2.11.0-RC3.txz", "API docs", "36.10M"],
17+
["-non-main-sys", "scala-docs-2.11.0-RC3.zip", "http://downloads.lightbend.com/scala/2.11.0-RC3/scala-docs-2.11.0-RC3.zip", "API docs", "66.59M"],
1818
["-non-main-sys", "scala-sources-2.11.0-RC3.zip", "https://github.com/scala/scala/archive/v2.11.0-RC3.tar.gz", "sources", ""]
1919
]
2020
---

0 commit comments

Comments
 (0)