Skip to content

Commit 93e3bdd

Browse files
committed
Fixing grammar.
1 parent 22cff8e commit 93e3bdd

File tree

6 files changed

+16
-15
lines changed

6 files changed

+16
-15
lines changed

_data/tutorials.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
- title: "Getting Started with Scala in IntelliJ"
22
url: "/documentation/getting-started-intellij-track/getting-started-with-scala-in-intellij.html"
3-
- title: "Getting Started with Scala and sbt in the Command Line"
3+
- title: "Getting Started with Scala and sbt on the Command Line"
44
url: "/documentation/getting-started-sbt-track/getting-started-with-scala-and-sbt-on-the-command-line.html"
55
- title: "Building a Scala Project with IntelliJ and sbt"
66
url: "/documentation/getting-started-intellij-track/building-a-scala-project-with-intellij-and-sbt.html"
7-
- title: "Testing Scala with sbt and ScalaTest in the Command Line"
7+
- title: "Testing Scala with sbt and ScalaTest on the Command Line"
88
url: "/documentation/getting-started-sbt-track/testing-scala-with-sbt-on-the-command-line.html"
99
- title: "Testing Scala in IntelliJ with ScalaTest"
1010
url: "/documentation/getting-started-intellij-track/testing-scala-in-intellij-with-scalatest.html"

documentation/getting-started-intellij-track/building-a-scala-project-with-intellij-and-sbt.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ or more than one code file.
1515
## Creating the project
1616
In this section, we'll show you how to create the project in IntelliJ. However, if you're
1717
comfortable with the command line, we recommend you try [Getting
18-
Started with Scala and sbt in the Command Line]({{site.baseurl}}/documentation/getting-started-sbt-track/getting-started-with-scala-and-sbt-on-the-command-line.html) and then come back
18+
Started with Scala and sbt on the Command Line]({{site.baseurl}}/documentation/getting-started-sbt-track/getting-started-with-scala-and-sbt-on-the-command-line.html) and then come back
1919

2020
here to the section "Writing Scala code".
2121

2222
1. If you didn't create the project from the command line, open up IntelliJ and select "Create New Project"
2323
* On the left panel, select Scala and on the right panel, select SBT
2424
* Click **Next**
2525
* Name the project "SBTExampleProject"
26-
* If you already created the project in the command line, open up IntelliJ, select *Import Project* and open the `build.sbt` file for your project
26+
* If you already created the project on the command line, open up IntelliJ, select *Import Project* and open the `build.sbt` file for your project
2727
* Make sure the **JDK Version** is 1.8 and the **SBT Version** is at least 0.13.13
2828
* Select **Use auto-import** so dependencies are automatically downloaded when available
2929
* Select **Finish**
@@ -65,7 +65,7 @@ object Main extends App {
6565

6666
Note: IntelliJ has its own syntax highlighter and sometimes your code is
6767
correct even though IntelliJ indicates otherwise. You can always check
68-
to see if sbt can run your project in the command line.
68+
to see if sbt can run your project on the command line.
6969

7070
## Running the project
7171
1. From the **Run** menu, select **Edit configurations**

documentation/getting-started-intellij-track/getting-started-with-scala-in-intellij.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Scala for you.
1111

1212
## Installation
1313
1. Make sure you have the Java 8 JDK (also known as 1.8)
14-
* Run `javac -version` in the command line and make sure you see
14+
* Run `javac -version` on the command line and make sure you see
1515
`javac 1.8.___`
1616
* If you don't have version 1.8 or higher, [install the JDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
1717
1. Install [IntelliJ Community Edition](https://www.jetbrains.com/idea/download/)

documentation/getting-started-sbt-track/getting-started-with-scala-and-sbt-on-the-command-line.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ We assume you know how to use a terminal.
1616
## Installation
1717

1818
1. Make sure you have the Java 8 JDK (also known as 1.8)
19-
* Run `javac -version` in the command line and make sure you see
19+
* Run `javac -version` on the command line and make sure you see
2020
`javac 1.8.___`
2121
* If you don't have version 1.8 or higher, [install the JDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
2222

@@ -88,4 +88,4 @@ Now that you know how to create a Scala project, you
8888
can continue learning online for free with [Scala Exercises](http://scala-exercises.org) or choose
8989
from our [list of educational resources](http://scala-lang.org/documentation/).
9090

91-
[Up Next: Testing Scala with sbt in the command line]({{ site.baseurl }}/documentation/getting-started-sbt-track/testing-scala-with-sbt-in-the-command-line.html)
91+
[Up Next: Testing Scala with sbt on the command line]({{ site.baseurl }}/documentation/getting-started-sbt-track/testing-scala-with-sbt-on-the-command-line.html)

documentation/getting-started-sbt-track/testing-scala-with-sbt-on-the-command-line.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
2-
title: Testing Scala with sbt and ScalaTest in the Command Line
2+
title: Testing Scala with sbt and ScalaTest on the Command Line
33
layout: inner-page-no-masthead
44
disqus: true
5-
redirect_from: documentation/getting-started-sbt-track/testing-scala-with-sbt-in-the-command-line.html
5+
redirect_from:
6+
- documentation/getting-started-sbt-track/testing-scala-with-sbt-in-the-command-line.html
67
previous-page: getting-started-with-scala-and-sbt-on-the-command-line
78
---
89

@@ -13,7 +14,7 @@ called [FunSuite](http://www.scalatest.org/getting_started_with_fun_suite).
1314
We assume you know [how to create a Scala project with sbt]({{ site.baseurl }}/documentation/getting-started-sbt-track/getting-started-with-scala-and-sbt-on-the-command-line.html).
1415

1516
## Setup
16-
1. In the command line, create a new directory somewhere (e.g. `Documents`).
17+
1. On the command line, create a new directory somewhere (e.g. `Documents`).
1718
* `cd` into the directory and run `sbt new scala/scalatest-example.g8`
1819
* Name the project `ScalaTestTutorial`.
1920
* The project comes with ScalaTest as a dependency in the `build.sbt` file.

documentation/getting-started.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ includeTOC: true
77
# - http://docs.scala-lang.org/getting-started
88
---
99

10-
These tutorials will get you writing Scala code as quickly as possible. Choose one set of tutorials depending on whether you prefer to work in the command line or in an IDE.
10+
These tutorials will get you writing Scala code as quickly as possible. Choose one set of tutorials depending on whether you prefer to work on the command line or in an IDE.
1111

12-
## You prefer working in the command line
13-
* [Getting Started with Scala and sbt in the Command Line](/documentation/getting-started-sbt-track/getting-started-with-scala-and-sbt-on-the-command-line.html)
14-
* [Testing Scala with sbt and ScalaTest in the Command Line](/documentation/getting-started-sbt-track/testing-scala-with-sbt-on-the-command-line.html)
12+
## You prefer working on the command line
13+
* [Getting Started with Scala and sbt on the Command Line](/documentation/getting-started-sbt-track/getting-started-with-scala-and-sbt-on-the-command-line.html)
14+
* [Testing Scala with sbt and ScalaTest on the Command Line](/documentation/getting-started-sbt-track/testing-scala-with-sbt-on-the-command-line.html)
1515

1616
## You prefer working in an IDE
1717
* [Getting Started with Scala in IntelliJ](/documentation/getting-started-intellij-track/getting-started-with-scala-in-intellij.html)

0 commit comments

Comments
 (0)