Skip to content

Typesafe -> Lightbend #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 24, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions _layouts/downloadpage.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
<div class="bigcircle" style="float: right;">2</div>
<div class="bigcircle-content" style="float: right; margin-top: 32px;">
<p class="center" style="text-align: right;">
<b><a href="http://www.typesafe.com/platform/getstarted">Get started with Typesafe Activator</a></b>
<b><a href="http://www.lightbend.com/activator/">Get started with Lightbend Activator</a></b>
<br/>
Typesafe Activator is a browser-based or command-line<br/>
Lightbend Activator is a browser-based or command-line<br/>
tool that helps developers get started with Scala.
<div class="download-wrapper">
<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">
<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">
<span class="slider">Download</span>
<span class="activator icon"></span>
<span class="version-long">&nbsp;Typesafe Activator</span>
<span class="version-long">&nbsp;Lightbend Activator</span>
</a>
<p class="install"><a style="margin-left: 124px;" href="http://www.typesafe.com/platform/getstarted">Need help installing?</a></p>
<p class="install"><a style="margin-left: 124px;" href="http://www.lightbend.com/activator/download">Need help installing?</a></p>
</div>
</p>
</div>
Expand Down
31 changes: 0 additions & 31 deletions _layouts/maindownloadpage.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,6 @@
---


<!-- <h3>Installing Scala</h3>

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>.

First, here are the most popular ways to install Scala on your machine: -->

<!-- <ul>
<li><a href="{{ site.baseurl }}/download/">Download the Scala distribution</a>,
unpack the archive, and launch <code>scala</code> (in the <code>bin</code> folder).
This starts the interactive Scala interpreter (aka the "REPL").
The standard batch compiler can be invoked from the command line as <code>scalac</code>.
We recommend one of the build tools that support Scala:
<ul>
<li><a href="http://www.scala-sbt.org/">sbt</a>,</li>
<li>maven with the <a href="http://davidb.github.com/scala-maven-plugin/index.html">Scala plugin</a>,</li>
<li>or the <a href="http://www.gradle.org/docs/current/userguide/scala_plugin.html">Scala plugin for gradle</a>.</li>
</ul>
</li>
<li>Install one of the Scala IDEs: the <a href="http://scala-ide.org/">Scala IDE</a> (based on Eclipse),
<a href="http://www.jetbrains.com/idea/">IntelliJ IDEA</a> with the Scala plugin,
or <a href="http://netbeans.org/">NetBeans IDE</a> with the Scala plugin</li>
<ul><li>
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.
</li></ul>
</li>
<li><a href="http://typesafe.com/platform/getstarted">Typesafe Activator</a> is a one-click way to get started creating applications with Scala,
Akka and Play Framework. Activator comes with <a href="http://typesafe.com/activator/templates">dozens of templates</a> to help you get started quickly.
<a href="http://typesafe.com/activator/template/contribute">Create your own template</a> to help programmers discover and quickly get up to speed with
your own project, or <a href="https://github.com/typesafehub/activator/">contribute to Activator itself</a>!</li>
</ul> -->

<h3>Additional information</h3>

You can find the links to prior versions or the latest development version below.
Expand Down
2 changes: 1 addition & 1 deletion conduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ forum, mailing list, wiki, web site, Gitter or IRC room, hackathon, public
meeting or private correspondence. (See our
[list of community fora](community/).)

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

Expand Down
4 changes: 2 additions & 2 deletions contribute/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ without creating an issue, but please look to see if there is an issue already s

### Examples/Tutorials in Activator Templates

[Typesafe Activator](https://typesafe.com/community/core-tools/activator-and-sbt)
[Lightbend Activator](https://www.lightbend.com/community/core-tools/activator-and-sbt)
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.

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

### The Main Scala Documentation Site

Expand Down
2 changes: 1 addition & 1 deletion contribute/guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Typically the scaladoc tool provides a low entry point for new committers, so it
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.

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

Expand Down
2 changes: 1 addition & 1 deletion contribute/hacker-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ Once you are satisfied with your work, synced with `master` and cleaned up your

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`)
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
need to sign the contributor license agreement, which [can be done online](http://typesafe.com/contribute/cla/scala) within a few minutes.
need to sign the contributor license agreement, which [can be done online](http://www.lightbend.com/contribute/cla/scala) within a few minutes.

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

Expand Down
4 changes: 2 additions & 2 deletions contribute/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Coordination of contribution efforts takes place on the
<div class="row">
<div class="span4 doc-block">
<h4><a href="./documentation.html">Documentation</a></h4>
<p><a href="./scala-standard-library-api-documentation.html">Scaladoc (API)</a>, <a href="https://typesafe.com/activator/template/contribute">Activator templates</a>,
<p><a href="./scala-standard-library-api-documentation.html">Scaladoc (API)</a>, <a href="https://www.lightbend.com/activator/template/contribute">Activator templates</a>,
<a href="http://docs.scala-lang.org/contribute.html">docs.scala-lang.org</a> and
<a href="https://github.com/scala/scala-lang">scala-lang.org</a>.</p>
</div>
Expand Down Expand Up @@ -119,7 +119,7 @@ to build and test a corpus of
Scala open source projects
against development versions of the Scala compiler and standard
library in order to discover regressions prior to releases.
The build uses Typesafe's
The build uses Lightbend's
[dbuild](https://github.com/typesafehub/dbuild) tool,
which leverages [sbt](http://www.scala-sbt.org).

Expand Down
14 changes: 7 additions & 7 deletions download/_posts/2014-01-28-2.11.0-M8.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ show_resources: "true"
permalink: /download/2.11.0-M8.html
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>."
resources: [
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-non-main-sys", "scala-sources-2.11.0-M8.zip", "https://github.com/scala/scala/archive/v2.11.0-M8.tar.gz", "sources", ""]
]

Expand Down
14 changes: 7 additions & 7 deletions download/_posts/2014-03-06-2.11.0-RC1.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ show_resources: "true"
permalink: /download/2.11.0-RC1.html
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>."
resources: [
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-non-main-sys", "scala-sources-2.11.0-RC1.zip", "https://github.com/scala/scala/archive/v2.11.0-RC1.tar.gz", "sources", ""]
]
---
14 changes: 7 additions & 7 deletions download/_posts/2014-03-20-2.11.0-RC3.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ show_resources: "true"
permalink: /download/2.11.0-RC3.html
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>."
resources: [
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-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"],
["-non-main-sys", "scala-sources-2.11.0-RC3.zip", "https://github.com/scala/scala/archive/v2.11.0-RC3.tar.gz", "sources", ""]
]
---
14 changes: 7 additions & 7 deletions download/_posts/2014-04-08-2.11.0-RC4.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ show_resources: "true"
permalink: /download/2.11.0-RC4.html
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>."
resources: [
["-main-unixsys", "scala-2.11.0-RC4.tgz", "http://downloads.typesafe.com/scala/2.11.0-RC4/scala-2.11.0-RC4.tgz", "Mac OS X, Unix, Cygwin", "24.79M"],
["-main-windows", "scala-2.11.0-RC4.msi", "http://downloads.typesafe.com/scala/2.11.0-RC4/scala-2.11.0-RC4.msi", "Windows (msi installer)", "89.02M"],
["-non-main-sys", "scala-2.11.0-RC4.zip", "http://downloads.typesafe.com/scala/2.11.0-RC4/scala-2.11.0-RC4.zip", "Windows", "24.81M"],
["-non-main-sys", "scala-2.11.0-RC4.deb", "http://downloads.typesafe.com/scala/2.11.0-RC4/scala-2.11.0-RC4.deb", "Debian", "88.05M"],
["-non-main-sys", "scala-2.11.0-RC4.rpm", "http://downloads.typesafe.com/scala/2.11.0-RC4/scala-2.11.0-RC4.rpm", "RPM package", "88.03M"],
["-non-main-sys", "scala-docs-2.11.0-RC4.txz", "http://downloads.typesafe.com/scala/2.11.0-RC4/scala-docs-2.11.0-RC4.txz", "API docs", "36.12M"],
["-non-main-sys", "scala-docs-2.11.0-RC4.zip", "http://downloads.typesafe.com/scala/2.11.0-RC4/scala-docs-2.11.0-RC4.zip", "API docs", "66.63M"],
["-main-unixsys", "scala-2.11.0-RC4.tgz", "http://downloads.lightbend.com/scala/2.11.0-RC4/scala-2.11.0-RC4.tgz", "Mac OS X, Unix, Cygwin", "24.79M"],
["-main-windows", "scala-2.11.0-RC4.msi", "http://downloads.lightbend.com/scala/2.11.0-RC4/scala-2.11.0-RC4.msi", "Windows (msi installer)", "89.02M"],
["-non-main-sys", "scala-2.11.0-RC4.zip", "http://downloads.lightbend.com/scala/2.11.0-RC4/scala-2.11.0-RC4.zip", "Windows", "24.81M"],
["-non-main-sys", "scala-2.11.0-RC4.deb", "http://downloads.lightbend.com/scala/2.11.0-RC4/scala-2.11.0-RC4.deb", "Debian", "88.05M"],
["-non-main-sys", "scala-2.11.0-RC4.rpm", "http://downloads.lightbend.com/scala/2.11.0-RC4/scala-2.11.0-RC4.rpm", "RPM package", "88.03M"],
["-non-main-sys", "scala-docs-2.11.0-RC4.txz", "http://downloads.lightbend.com/scala/2.11.0-RC4/scala-docs-2.11.0-RC4.txz", "API docs", "36.12M"],
["-non-main-sys", "scala-docs-2.11.0-RC4.zip", "http://downloads.lightbend.com/scala/2.11.0-RC4/scala-docs-2.11.0-RC4.zip", "API docs", "66.63M"],
["-non-main-sys", "scala-sources-2.11.0-RC4.zip", "https://github.com/scala/scala/archive/v2.11.0-RC4.tar.gz", "sources", ""]
]
---
Loading