Skip to content

Commit 038f115

Browse files
authored
Merge pull request #3826 from VirtusLab/stable
Back port of documentation changes to main
2 parents 76a584e + a4db98c commit 038f115

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

website/src/components/features.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const featuresList = [
6666
image="gifs/learning_curve.gif" title="No learning curve"
6767
key="curve" education="true">
6868
<p>
69-
Scala CLI does not use complex configuration language, its options are simple and self-explanatory
69+
Scala CLI does not use a complex configuration language, its options are simple and self-explanatory.
7070
</p>
7171
<p>
7272
There are no big differences in running repl or .scala files so expanding the results of repl session into a small project does not require learning new concepts from Scala CLI perspective
@@ -75,16 +75,16 @@ const featuresList = [
7575
<ImageBox
7676
image="gifs/powerful_scripts.gif" title="Scripts are as powerful as other programs" key="scripts-as-apps" scripting="true">
7777
<p>
78-
Scripts in Scala CLI can use dependencies and other features as standard Scala programs. Scala CLI is command-line first giving access to all its features without need for any configuration file or specific project structure.
78+
Scripts in Scala CLI can use dependencies and other features as standard Scala programs. Scala CLI is command-line first, giving access to all its features without the need for any configuration files or specific project structure.
7979
</p>
8080
</ImageBox>,
8181
<ImageBox
8282
image="gifs/embeddable_scripts.gif" title="Embeddable Scripts" key="embed-scripts" scripting="true">
8383
<p>
84-
Scala CLI can be set up in shebang lines, making your *.scala or *.sc files runnable
84+
Scala CLI can be set up in shebang lines, making your *.scala or *.sc (or even .java or .md!) files runnable.
8585
</p>
8686
<p>
87-
Scala CLI supports piping inputs and is designed to be embeddable in other scripts, turning Scala into proper scripting language
87+
Scala CLI supports piping inputs and is designed to be embeddable in other scripts, turning Scala into proper scripting language.
8888
</p>
8989
</ImageBox>,
9090
// <ImageBox
@@ -106,7 +106,7 @@ const featuresList = [
106106
With Scala CLI, configuration can be included in source code so complex examples can be self-contained and shipped as e.g. gist. Moreover, Scala CLI can compile, run and test gists without any manual work!
107107
</p>
108108
<p>
109-
Scala CLI is a perfect tool to submit and reproduce bugs
109+
Scala CLI is the perfect tool to submit and reproduce bugs.
110110
</p>
111111
</ImageBox>
112112

website/src/pages/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ const Index = (props) => {
3535

3636
<SectionAbout title="Why Scala CLI?">
3737
<p>
38-
Scala CLI combines <em>all</em> the features you need to learn and use Scala in your scripts, playgrounds and (single-module) projects.
38+
Scala CLI combines <em>all</em> of the features you need to learn and use Scala in your scripts, playgrounds and (single-module) projects.
3939
</p>
4040
<p>
4141
To get started you can read <a href="/docs/overview">the documentation</a>, or just <a href="/install">install</a> and enjoy <code>scala-cli</code>.
4242
</p>
4343
<p>
44-
Scala CLI will soon become the default Scala runner and will be shipped as `scala` (<a href="https://virtuslab.com/blog/scala-cli-the-new-scala-runner/">read more</a>).
44+
Scala CLI is the default Scala runner and is being shipped as <code>scala</code> along with <code>scalac</code> as part of the official language installation since <a href="https://github.com/scala/scala3/releases/tag/3.5.0">Scala 3.5.0</a>. (<a href="/docs/reference/scala-command/">read more</a>).
4545
</p>
4646
</SectionAbout>
4747

website/src/pages/projects.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const Index = (props) => {
66
return <UseCase
77
title="Single-module projects with Scala CLI"
88
description="Page describing why Scala CLI is good for maintaining single-module projects."
9-
headline="Fight with your bugs, not with your buildtool"
9+
headline="Fight with your bugs, not with your build tool"
1010
image="gifs/projects.gif"
1111
id="projects"
1212
>

0 commit comments

Comments
 (0)