From 4ab8074753695665300b692a4fee26635b1ed118 Mon Sep 17 00:00:00 2001 From: Suzanne Hamilton Date: Thu, 6 Feb 2014 00:55:21 +0000 Subject: [PATCH] Fix formatting of inline code samples which are pluralized --- src/sphinx/Getting-Started/Basic-Def.rst | 6 +++--- src/sphinx/Howto/runningcommands.rst | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sphinx/Getting-Started/Basic-Def.rst b/src/sphinx/Getting-Started/Basic-Def.rst index 422cba303..e1cb36b7a 100644 --- a/src/sphinx/Getting-Started/Basic-Def.rst +++ b/src/sphinx/Getting-Started/Basic-Def.rst @@ -48,7 +48,7 @@ becomes sbt's new map. To create the map, sbt first sorts the list of settings so that all changes to the same key are made together, and values that depend on other keys are processed after the keys they depend on. Then sbt walks -over the sorted list of `Setting`s and applies each one to the map in +over the sorted list of `Setting`\ s and applies each one to the map in turn. Summary: A build definition defines a list of `Setting[T]`, where a @@ -77,8 +77,8 @@ Here's an example: Each `Setting` is defined with a Scala expression. The expressions in `build.sbt` are independent of one another, and they are expressions, rather than complete Scala statements. These -expressions may be interspersed with `val`s, `lazy val`s, and `def`s. -Top-level `object`s and `class`es are not allowed in `build.sbt`. +expressions may be interspersed with `val`\ s, `lazy val`\ s, and `def`\ s. +Top-level `object`\ s and `class`\ es are not allowed in `build.sbt`. Those should go in the `project/` directory as full Scala source files. On the left, :key:`name`, :key:`version`, and :key:`scalaVersion` are *keys*. A diff --git a/src/sphinx/Howto/runningcommands.rst b/src/sphinx/Howto/runningcommands.rst index bf620f6b6..22554277e 100644 --- a/src/sphinx/Howto/runningcommands.rst +++ b/src/sphinx/Howto/runningcommands.rst @@ -84,5 +84,5 @@ For example, > eval 2+2 4: Int -Variables defined by an `eval` are not visible to subsequent `eval`s, although changes to system properties persist and affect the JVM that is running sbt. +Variables defined by an `eval` are not visible to subsequent `eval`\ s, although changes to system properties persist and affect the JVM that is running sbt. Use the Scala REPL (:key:`console` and related commands) for full support for evaluating Scala code interactively.