From e767bbdbe74fd151b1f5be2143e560eecaa4b195 Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 12:53:00 +0100 Subject: [PATCH 01/23] Add colon before list --- _getting-started/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_getting-started/index.md b/_getting-started/index.md index 30a62817a4..a4e0b0a3d7 100644 --- a/_getting-started/index.md +++ b/_getting-started/index.md @@ -8,7 +8,7 @@ includeTOC: true redirect_from: "/getting-started.html" --- -
There are two main ways people prefer to work in Scala.
+
There are two main ways people prefer to work in Scala:
  1. Using an IDE.
    2. From 212dca74f5aecfb266c44c2991708c7ed7aa6e5f Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 12:53:46 +0100 Subject: [PATCH 02/23] Change ordered list to unordered list as items do not represent a sequence or hierarchy --- _getting-started/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_getting-started/index.md b/_getting-started/index.md index a4e0b0a3d7..dd040da7d5 100644 --- a/_getting-started/index.md +++ b/_getting-started/index.md @@ -10,10 +10,10 @@ redirect_from: "/getting-started.html"
    There are two main ways people prefer to work in Scala:
    -
      +
      • Using an IDE.
      • Using the command line.
        • -
    + The following tutorials will walk you through the set up process for either way From e52b959aa44b9c3e6cb3dfe87bec7bbad682fd80 Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 12:54:16 +0100 Subject: [PATCH 03/23] Change 'either' to 'whichever' --- _getting-started/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_getting-started/index.md b/_getting-started/index.md index dd040da7d5..1d7dbe5b20 100644 --- a/_getting-started/index.md +++ b/_getting-started/index.md @@ -16,7 +16,7 @@ redirect_from: "/getting-started.html" -The following tutorials will walk you through the set up process for either way +The following tutorials will walk you through the set up process for whichever way you prefer. However, if you just want to jump directly into Scala without installing anything, skip the guides on this page and check out: From 85af57bc051d4c5500ec8cb91b5b38a336545bdc Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 12:54:54 +0100 Subject: [PATCH 04/23] Capitalise first letter of item in a list --- _getting-started/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_getting-started/index.md b/_getting-started/index.md index 1d7dbe5b20..c2949b8fa1 100644 --- a/_getting-started/index.md +++ b/_getting-started/index.md @@ -22,7 +22,7 @@ you prefer. However, if you just want to jump directly into Scala without installing anything, skip the guides on this page and check out: From 702e32f2a80fbb07ff17ceee4330cdb9f4ba58f2 Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 12:56:53 +0100 Subject: [PATCH 05/23] Add 'by' to clarifymeaning --- _getting-started/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_getting-started/index.md b/_getting-started/index.md index c2949b8fa1..52a87146c3 100644 --- a/_getting-started/index.md +++ b/_getting-started/index.md @@ -43,7 +43,7 @@ unit tests! ### If you prefer working on the command line... If you prefer using a text editor like emacs, Vim, Atom, or Sublime Text, then -the best way to compile, test, and run Scala code is using _sbt_, Scala's build +the best way to compile, test, and run Scala code is by using _sbt_, Scala's build tool. * [Getting Started with Scala and sbt on the Command Line](/getting-started/sbt-track/getting-started-with-scala-and-sbt-on-the-command-line.html) From 1d8fe41ccce6c789baf13cca9c095d353d3b6533 Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 12:57:35 +0100 Subject: [PATCH 06/23] Add colon before a list --- _getting-started/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_getting-started/index.md b/_getting-started/index.md index 52a87146c3..df621e46fb 100644 --- a/_getting-started/index.md +++ b/_getting-started/index.md @@ -55,7 +55,7 @@ the rest, so it's as easy as possible for someone else to compile and run your Scala project. --> ## Next Steps -Once you've finished these tutorials, check out +Once you've finished these tutorials, check out: * [The Tour of Scala](/tour/tour-of-scala.html) for bite-sized introductions to Scala's features. * [The Scala Book](/overviews/scala-book/introduction.html), which provides a set of short lessons introducing Scala’s main features. From 7f4efb3458c8c022a1d8cdb50993167234c105e4 Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 13:09:07 +0100 Subject: [PATCH 07/23] Add missing word, and add a comma and a 'for' for clarity --- _getting-started/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_getting-started/index.md b/_getting-started/index.md index df621e46fb..6e198516f8 100644 --- a/_getting-started/index.md +++ b/_getting-started/index.md @@ -63,4 +63,4 @@ Once you've finished these tutorials, check out: * [Our list of some popular Scala books](/books.html). ## Getting Help -There are a multitude of mailing lists and real-time chat channels in case you want to quickly connect with other Scala users. Check out our [community](https://scala-lang.org/community/) page a list of these resources and where to reach out for help. +There are a multitude of mailing lists and real-time chat channels in case you want to quickly connect with other Scala users. Check out our [community](https://scala-lang.org/community/) page for a list of these resources, and for where to reach out for help. From af2b2e3890689156bed4181cd35d1ffcff2d13a7 Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 13:12:43 +0100 Subject: [PATCH 08/23] Change html lists to markdown for consistency with other lists --- _getting-started/index.md | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/_getting-started/index.md b/_getting-started/index.md index 6e198516f8..f5741b67a6 100644 --- a/_getting-started/index.md +++ b/_getting-started/index.md @@ -8,23 +8,18 @@ includeTOC: true redirect_from: "/getting-started.html" --- -
    There are two main ways people prefer to work in Scala:
    - -
      -
    • Using an IDE.
      • -
    • Using the command line.
      • -
    +There are __two__ main ways people prefer to work in Scala: +* Using an IDE. +* Using the command line. The following tutorials will walk you through the set up process for whichever way you prefer. However, if you just want to jump directly into Scala without installing anything, skip the guides on this page and check out: - +* [Our interactive introduction to Scala on scala-exercises.com](https://www.scala-exercises.org/scala_tutorial/terms_and_types), or +* [Scastie](https://scastie.scala-lang.org/), Scala in the browser, with access to all Scala compilers and all published libraries! ## Setting up and getting started with Scala From 629075acba81eb1424b2d65f263cebdce3ce404b Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 13:13:57 +0100 Subject: [PATCH 09/23] Change 'set up' verb to 'setup' adjective --- _getting-started/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_getting-started/index.md b/_getting-started/index.md index f5741b67a6..77147fc08c 100644 --- a/_getting-started/index.md +++ b/_getting-started/index.md @@ -13,7 +13,7 @@ There are __two__ main ways people prefer to work in Scala: * Using an IDE. * Using the command line. -The following tutorials will walk you through the set up process for whichever way +The following tutorials will walk you through the setup process for whichever way you prefer. However, if you just want to jump directly into Scala without installing anything, skip the guides on this page and check out: From 761ca7db2c4f98dbf2c39a27e943554e3f950788 Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 13:54:48 +0100 Subject: [PATCH 10/23] Change 'smoothly' integrates to 'seamlessly' integrates, as 'seamlessly' is more commonly used to express integration. --- _tour/tour-of-scala.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_tour/tour-of-scala.md b/_tour/tour-of-scala.md index cef8e9dab1..b59edb5f1b 100644 --- a/_tour/tour-of-scala.md +++ b/_tour/tour-of-scala.md @@ -21,7 +21,7 @@ you want that, consider obtaining [a book](/books.html) or consulting [other resources](/learn.html). ## What is Scala? -Scala is a modern multi-paradigm programming language designed to express common programming patterns in a concise, elegant, and type-safe way. It smoothly integrates features of object-oriented and functional languages. +Scala is a modern multi-paradigm programming language designed to express common programming patterns in a concise, elegant, and type-safe way. It seamlessly integrates features of object-oriented and functional languages. ## Scala is object-oriented ## Scala is a pure object-oriented language in the sense that [every value is an object](unified-types.html). Types and behavior of objects are described by [classes](classes.html) and [traits](traits.html). Classes are extended by subclassing and a flexible [mixin-based composition](mixin-class-composition.html) mechanism as a clean replacement for multiple inheritance. From b47dd26a7bec4150d393dbd5a6800737f08fa3bf Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 14:09:00 +0100 Subject: [PATCH 11/23] Flesh out the word 'that', to provide more clarity --- _tour/tour-of-scala.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_tour/tour-of-scala.md b/_tour/tour-of-scala.md index b59edb5f1b..7ec4c4b3fd 100644 --- a/_tour/tour-of-scala.md +++ b/_tour/tour-of-scala.md @@ -17,7 +17,7 @@ This tour contains bite-sized introductions to the most frequently used features of Scala. It is intended for newcomers to the language. This is just a brief tour, not a full language tutorial. If -you want that, consider obtaining [a book](/books.html) or consulting +you want a more detailed guide, consider obtaining [a book](/books.html) or consulting [other resources](/learn.html). ## What is Scala? From 8b1fdcea5b44e1038881cb8903ef6b3583796e4a Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 14:14:51 +0100 Subject: [PATCH 12/23] Change 'behavior' to 'behaviors' for clarity, as it may seem like all objects have one behaviour, instead of each object having its own behaviour --- _tour/tour-of-scala.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_tour/tour-of-scala.md b/_tour/tour-of-scala.md index 7ec4c4b3fd..5bfac9c182 100644 --- a/_tour/tour-of-scala.md +++ b/_tour/tour-of-scala.md @@ -24,7 +24,7 @@ you want a more detailed guide, consider obtaining [a book](/books.html) or cons Scala is a modern multi-paradigm programming language designed to express common programming patterns in a concise, elegant, and type-safe way. It seamlessly integrates features of object-oriented and functional languages. ## Scala is object-oriented ## -Scala is a pure object-oriented language in the sense that [every value is an object](unified-types.html). Types and behavior of objects are described by [classes](classes.html) and [traits](traits.html). Classes are extended by subclassing and a flexible [mixin-based composition](mixin-class-composition.html) mechanism as a clean replacement for multiple inheritance. +Scala is a pure object-oriented language in the sense that [every value is an object](unified-types.html). Types and behaviors of objects are described by [classes](classes.html) and [traits](traits.html). Classes are extended by subclassing and a flexible [mixin-based composition](mixin-class-composition.html) mechanism as a clean replacement for multiple inheritance. ## Scala is functional ## Scala is also a functional language in the sense that [every function is a value](unified-types.html). Scala provides a [lightweight syntax](basics.html#functions) for defining anonymous functions, it supports [higher-order functions](higher-order-functions.html), it allows functions to be [nested](nested-functions.html), and supports [currying](multiple-parameter-lists.html). Scala's [case classes](case-classes.html) and its built-in support for [pattern matching](pattern-matching.html) model algebraic types used in many functional programming languages. [Singleton objects](singleton-objects.html) provide a convenient way to group functions that aren't members of a class. From 9d9a2b5c8b04c4ced2e01576582d23244135ecf7 Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 14:24:00 +0100 Subject: [PATCH 13/23] Change sentence slightly to clarify that subclassing and mixins are two separate options --- _tour/tour-of-scala.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_tour/tour-of-scala.md b/_tour/tour-of-scala.md index 5bfac9c182..46c77ab7f1 100644 --- a/_tour/tour-of-scala.md +++ b/_tour/tour-of-scala.md @@ -24,7 +24,7 @@ you want a more detailed guide, consider obtaining [a book](/books.html) or cons Scala is a modern multi-paradigm programming language designed to express common programming patterns in a concise, elegant, and type-safe way. It seamlessly integrates features of object-oriented and functional languages. ## Scala is object-oriented ## -Scala is a pure object-oriented language in the sense that [every value is an object](unified-types.html). Types and behaviors of objects are described by [classes](classes.html) and [traits](traits.html). Classes are extended by subclassing and a flexible [mixin-based composition](mixin-class-composition.html) mechanism as a clean replacement for multiple inheritance. +Scala is a pure object-oriented language in the sense that [every value is an object](unified-types.html). Types and behaviors of objects are described by [classes](classes.html) and [traits](traits.html). Classes can be extended by subclassing, and by using a flexible [mixin-based composition](mixin-class-composition.html) mechanism as a clean replacement for multiple inheritance. ## Scala is functional ## Scala is also a functional language in the sense that [every function is a value](unified-types.html). Scala provides a [lightweight syntax](basics.html#functions) for defining anonymous functions, it supports [higher-order functions](higher-order-functions.html), it allows functions to be [nested](nested-functions.html), and supports [currying](multiple-parameter-lists.html). Scala's [case classes](case-classes.html) and its built-in support for [pattern matching](pattern-matching.html) model algebraic types used in many functional programming languages. [Singleton objects](singleton-objects.html) provide a convenient way to group functions that aren't members of a class. From 1a4956b94493aab6965a1acbf52fb78679e7b37e Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 14:26:13 +0100 Subject: [PATCH 14/23] Add it for consistency with the rest of the list --- _tour/tour-of-scala.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_tour/tour-of-scala.md b/_tour/tour-of-scala.md index 46c77ab7f1..3e3a9fd4ba 100644 --- a/_tour/tour-of-scala.md +++ b/_tour/tour-of-scala.md @@ -27,7 +27,7 @@ Scala is a modern multi-paradigm programming language designed to express common Scala is a pure object-oriented language in the sense that [every value is an object](unified-types.html). Types and behaviors of objects are described by [classes](classes.html) and [traits](traits.html). Classes can be extended by subclassing, and by using a flexible [mixin-based composition](mixin-class-composition.html) mechanism as a clean replacement for multiple inheritance. ## Scala is functional ## -Scala is also a functional language in the sense that [every function is a value](unified-types.html). Scala provides a [lightweight syntax](basics.html#functions) for defining anonymous functions, it supports [higher-order functions](higher-order-functions.html), it allows functions to be [nested](nested-functions.html), and supports [currying](multiple-parameter-lists.html). Scala's [case classes](case-classes.html) and its built-in support for [pattern matching](pattern-matching.html) model algebraic types used in many functional programming languages. [Singleton objects](singleton-objects.html) provide a convenient way to group functions that aren't members of a class. +Scala is also a functional language in the sense that [every function is a value](unified-types.html). Scala provides a [lightweight syntax](basics.html#functions) for defining anonymous functions, it supports [higher-order functions](higher-order-functions.html), it allows functions to be [nested](nested-functions.html), and it supports [currying](multiple-parameter-lists.html). Scala's [case classes](case-classes.html) and its built-in support for [pattern matching](pattern-matching.html) model algebraic types used in many functional programming languages. [Singleton objects](singleton-objects.html) provide a convenient way to group functions that aren't members of a class. Furthermore, Scala's notion of pattern matching naturally extends to the [processing of XML data](https://github.com/scala/scala-xml/wiki/XML-Processing) with the help of [right-ignoring sequence patterns](regular-expression-patterns.html), by way of general extension via [extractor objects](extractor-objects.html). In this context, [for comprehensions](for-comprehensions.html) are useful for formulating queries. These features make Scala ideal for developing applications like web services. From 96711b4fd74b7990eba13d6a63ae3e1616534208 Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 14:28:13 +0100 Subject: [PATCH 15/23] Add missing word --- _tour/tour-of-scala.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_tour/tour-of-scala.md b/_tour/tour-of-scala.md index 3e3a9fd4ba..17d7c228e1 100644 --- a/_tour/tour-of-scala.md +++ b/_tour/tour-of-scala.md @@ -27,7 +27,7 @@ Scala is a modern multi-paradigm programming language designed to express common Scala is a pure object-oriented language in the sense that [every value is an object](unified-types.html). Types and behaviors of objects are described by [classes](classes.html) and [traits](traits.html). Classes can be extended by subclassing, and by using a flexible [mixin-based composition](mixin-class-composition.html) mechanism as a clean replacement for multiple inheritance. ## Scala is functional ## -Scala is also a functional language in the sense that [every function is a value](unified-types.html). Scala provides a [lightweight syntax](basics.html#functions) for defining anonymous functions, it supports [higher-order functions](higher-order-functions.html), it allows functions to be [nested](nested-functions.html), and it supports [currying](multiple-parameter-lists.html). Scala's [case classes](case-classes.html) and its built-in support for [pattern matching](pattern-matching.html) model algebraic types used in many functional programming languages. [Singleton objects](singleton-objects.html) provide a convenient way to group functions that aren't members of a class. +Scala is also a functional language in the sense that [every function is a value](unified-types.html). Scala provides a [lightweight syntax](basics.html#functions) for defining anonymous functions, it supports [higher-order functions](higher-order-functions.html), it allows functions to be [nested](nested-functions.html), and it supports [currying](multiple-parameter-lists.html). Scala's [case classes](case-classes.html) and its built-in support for [pattern matching](pattern-matching.html) model algebraic types are used in many functional programming languages. [Singleton objects](singleton-objects.html) provide a convenient way to group functions that aren't members of a class. Furthermore, Scala's notion of pattern matching naturally extends to the [processing of XML data](https://github.com/scala/scala-xml/wiki/XML-Processing) with the help of [right-ignoring sequence patterns](regular-expression-patterns.html), by way of general extension via [extractor objects](extractor-objects.html). In this context, [for comprehensions](for-comprehensions.html) are useful for formulating queries. These features make Scala ideal for developing applications like web services. From 46d0dafd3140b4d92a207bb70fc227190c6f051b Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 14:44:12 +0100 Subject: [PATCH 16/23] Capitalise first letter of items in a list --- _tour/tour-of-scala.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/_tour/tour-of-scala.md b/_tour/tour-of-scala.md index 17d7c228e1..c8be5fecf2 100644 --- a/_tour/tour-of-scala.md +++ b/_tour/tour-of-scala.md @@ -34,14 +34,14 @@ Furthermore, Scala's notion of pattern matching naturally extends to the [proces ## Scala is statically typed ## Scala's expressive type system enforces, at compile-time, that abstractions are used in a safe and coherent manner. In particular, the type system supports: -* [generic classes](generic-classes.html) -* [variance annotations](variances.html) -* [upper](upper-type-bounds.html) and [lower](lower-type-bounds.html) type bounds, -* [inner classes](inner-classes.html) and [abstract type members](abstract-type-members.html) as object members -* [compound types](compound-types.html) -* [explicitly typed self references](self-types.html) -* [implicit parameters](implicit-parameters.html) and [conversions](implicit-conversions.html) -* [polymorphic methods](polymorphic-methods.html) +* [Generic classes](generic-classes.html) +* [Variance annotations](variances.html) +* [Upper](upper-type-bounds.html) and [lower](lower-type-bounds.html) type bounds, +* [Inner classes](inner-classes.html) and [abstract type members](abstract-type-members.html) as object members +* [Compound types](compound-types.html) +* [Explicitly typed self references](self-types.html) +* [Implicit parameters](implicit-parameters.html) and [conversions](implicit-conversions.html) +* [Polymorphic methods](polymorphic-methods.html) [Type inference](type-inference.html) means the user is not required to annotate code with redundant type information. In combination, these features provide a powerful basis for the safe reuse of programming abstractions and for the type-safe extension of software. From d2e90e020d0afb0893b4ad5d8f1ee7c3b69259a6 Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 14:51:55 +0100 Subject: [PATCH 17/23] Change use of 'easy' and 'smoothly' to 'straightforward', as these two words may be an expert's subjective opinion --- _tour/tour-of-scala.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_tour/tour-of-scala.md b/_tour/tour-of-scala.md index c8be5fecf2..a5ef1cf064 100644 --- a/_tour/tour-of-scala.md +++ b/_tour/tour-of-scala.md @@ -47,7 +47,7 @@ Scala's expressive type system enforces, at compile-time, that abstractions are ## Scala is extensible ## -In practice, the development of domain-specific applications often requires domain-specific language extensions. Scala provides a unique combination of language mechanisms that make it easy to smoothly add new language constructs in the form of libraries. +In practice, the development of domain-specific applications often requires domain-specific language extensions. Scala provides a unique combination of language mechanisms that make it straightforward to add new language constructs in the form of libraries. In many cases, this can be done without using meta-programming facilities such as macros. For example, From 06ab7420481922a23e57dfc07ca79de5302303b7 Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 14:54:16 +0100 Subject: [PATCH 18/23] Change 'smooth' to 'seamless' --- _tour/tour-of-scala.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_tour/tour-of-scala.md b/_tour/tour-of-scala.md index a5ef1cf064..6ee4979a31 100644 --- a/_tour/tour-of-scala.md +++ b/_tour/tour-of-scala.md @@ -56,7 +56,7 @@ In many cases, this can be done without using meta-programming facilities such a ## Scala interoperates -Scala is designed to interoperate well with the popular Java Runtime Environment (JRE). In particular, the interaction with the mainstream object-oriented Java programming language is as smooth as possible. Newer Java features like SAMs, [lambdas](higher-order-functions.html), [annotations](annotations.html), and [generics](generic-classes.html) have direct analogues in Scala. +Scala is designed to interoperate well with the popular Java Runtime Environment (JRE). In particular, the interaction with the mainstream object-oriented Java programming language is as seamless as possible. Newer Java features like SAMs, [lambdas](higher-order-functions.html), [annotations](annotations.html), and [generics](generic-classes.html) have direct analogues in Scala. Those Scala features without Java analogues, such as [default](default-parameter-values.html) and [named parameters](named-arguments.html), compile as close to Java as they can reasonably come. Scala has the same compilation model (separate compilation, dynamic class loading) like Java and allows access to thousands of existing high-quality libraries. From 22b3f49a826338908da68fd910958c973a8b7f27 Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 15:03:27 +0100 Subject: [PATCH 19/23] Change 'close' to 'closely', as 'close' relates to location in physical space. Add 'as reasonably possible' to have a shorter sentence while retaining same meaning. --- _tour/tour-of-scala.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_tour/tour-of-scala.md b/_tour/tour-of-scala.md index 6ee4979a31..692a3e4e4d 100644 --- a/_tour/tour-of-scala.md +++ b/_tour/tour-of-scala.md @@ -58,7 +58,7 @@ In many cases, this can be done without using meta-programming facilities such a Scala is designed to interoperate well with the popular Java Runtime Environment (JRE). In particular, the interaction with the mainstream object-oriented Java programming language is as seamless as possible. Newer Java features like SAMs, [lambdas](higher-order-functions.html), [annotations](annotations.html), and [generics](generic-classes.html) have direct analogues in Scala. -Those Scala features without Java analogues, such as [default](default-parameter-values.html) and [named parameters](named-arguments.html), compile as close to Java as they can reasonably come. Scala has the same compilation model (separate compilation, dynamic class loading) like Java and allows access to thousands of existing high-quality libraries. +Those Scala features without Java analogues, such as [default](default-parameter-values.html) and [named parameters](named-arguments.html), compile as closely to Java as reasonably possible. Scala has the same compilation model (separate compilation, dynamic class loading) like Java and allows access to thousands of existing high-quality libraries. ## Enjoy the tour! From 875ce74455a633bc80636ae1fe422fd92eb80cb0 Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 15:05:51 +0100 Subject: [PATCH 20/23] Change grammar; should be 'as' instead of 'with' --- _tour/tour-of-scala.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_tour/tour-of-scala.md b/_tour/tour-of-scala.md index 692a3e4e4d..2c485ae98c 100644 --- a/_tour/tour-of-scala.md +++ b/_tour/tour-of-scala.md @@ -58,7 +58,7 @@ In many cases, this can be done without using meta-programming facilities such a Scala is designed to interoperate well with the popular Java Runtime Environment (JRE). In particular, the interaction with the mainstream object-oriented Java programming language is as seamless as possible. Newer Java features like SAMs, [lambdas](higher-order-functions.html), [annotations](annotations.html), and [generics](generic-classes.html) have direct analogues in Scala. -Those Scala features without Java analogues, such as [default](default-parameter-values.html) and [named parameters](named-arguments.html), compile as closely to Java as reasonably possible. Scala has the same compilation model (separate compilation, dynamic class loading) like Java and allows access to thousands of existing high-quality libraries. +Those Scala features without Java analogues, such as [default](default-parameter-values.html) and [named parameters](named-arguments.html), compile as closely to Java as reasonably possible. Scala has the same compilation model (separate compilation, dynamic class loading) as Java and allows access to thousands of existing high-quality libraries. ## Enjoy the tour! From 5892a23986e7df672e0fb4b04b9f72cb8f0316dd Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 15:11:44 +0100 Subject: [PATCH 21/23] Remove reference to contents menu to prevent information overload; there is a link to the next page within the sentence, and again directly below the sentence --- _tour/tour-of-scala.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_tour/tour-of-scala.md b/_tour/tour-of-scala.md index 2c485ae98c..e6e83e06f6 100644 --- a/_tour/tour-of-scala.md +++ b/_tour/tour-of-scala.md @@ -62,4 +62,4 @@ Those Scala features without Java analogues, such as [default](default-parameter ## Enjoy the tour! -Please continue to the [next page](basics.html) in the Contents menu to read more. +Please continue to the [next page](basics.html) to read more. From 41d27294e85f47d00e6d6dcaafdc8ffc731eac11 Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 15:14:01 +0100 Subject: [PATCH 22/23] Add a colon directly preceding a list --- _tour/tour-of-scala.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_tour/tour-of-scala.md b/_tour/tour-of-scala.md index e6e83e06f6..fd69daa081 100644 --- a/_tour/tour-of-scala.md +++ b/_tour/tour-of-scala.md @@ -49,7 +49,7 @@ Scala's expressive type system enforces, at compile-time, that abstractions are In practice, the development of domain-specific applications often requires domain-specific language extensions. Scala provides a unique combination of language mechanisms that make it straightforward to add new language constructs in the form of libraries. -In many cases, this can be done without using meta-programming facilities such as macros. For example, +In many cases, this can be done without using meta-programming facilities such as macros. For example: * [Implicit classes](/overviews/core/implicit-classes.html) allow adding extension methods to existing types. * [String interpolation](/overviews/core/string-interpolation.html) is user-extensible with custom interpolators. From e38d98433e6489b200e2e441e0d54203be2c9f14 Mon Sep 17 00:00:00 2001 From: Tazzle Date: Wed, 13 Nov 2019 15:14:53 +0100 Subject: [PATCH 23/23] Remove unnecessary comma from list item --- _tour/tour-of-scala.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_tour/tour-of-scala.md b/_tour/tour-of-scala.md index fd69daa081..f9c1b9325a 100644 --- a/_tour/tour-of-scala.md +++ b/_tour/tour-of-scala.md @@ -36,7 +36,7 @@ Scala's expressive type system enforces, at compile-time, that abstractions are * [Generic classes](generic-classes.html) * [Variance annotations](variances.html) -* [Upper](upper-type-bounds.html) and [lower](lower-type-bounds.html) type bounds, +* [Upper](upper-type-bounds.html) and [lower](lower-type-bounds.html) type bounds * [Inner classes](inner-classes.html) and [abstract type members](abstract-type-members.html) as object members * [Compound types](compound-types.html) * [Explicitly typed self references](self-types.html)