diff --git a/src/sphinx/Community/ChangeSummary_0.13.0.rst b/src/sphinx/Community/ChangeSummary_0.13.0.rst index 57659eb8e..1eac0036f 100644 --- a/src/sphinx/Community/ChangeSummary_0.13.0.rst +++ b/src/sphinx/Community/ChangeSummary_0.13.0.rst @@ -161,7 +161,7 @@ The configurable settings are per-user settings (from ~/.sbt, for example), sett The order in which these instances are provided to ``autoSettings`` determines the order in which they are appended to the settings explicitly provided in ``Project.settings``. For .sbt files, ``AddSettings.defaultSbtFiles`` adds the settings from all .sbt files in the project's base directory as usual. -The alternative method ``AddSettings.sbtFiles`` accepts a sequence of ``File``s that will be loaded according to the standard .sbt format. +The alternative method ``AddSettings.sbtFiles`` accepts a sequence of ``Files`` that will be loaded according to the standard .sbt format. Relative files are resolved against the project's base directory. Plugin settings may be included on a per-Plugin basis by using the ``AddSettings.plugins`` method and passing a ``Plugin => Boolean``. diff --git a/src/sphinx/Detailed-Topics/Cross-Build.rst b/src/sphinx/Detailed-Topics/Cross-Build.rst index e58a36251..1c6d6e2ef 100644 --- a/src/sphinx/Detailed-Topics/Cross-Build.rst +++ b/src/sphinx/Detailed-Topics/Cross-Build.rst @@ -143,4 +143,4 @@ than the default. As a final note, you can use ``++ `` to temporarily switch the Scala version currently being used to build. ```` should be either a version for Scala published to a repository, as in ``++ 2.10.0`` or the path to a Scala home directory, as in ``++ /path/to/scala/home``. See -:doc:`/Detailed-Topics/Command-Line-Reference>` for details. +:doc:`/Detailed-Topics/Command-Line-Reference` for details. diff --git a/src/sphinx/Detailed-Topics/Library-Management.rst b/src/sphinx/Detailed-Topics/Library-Management.rst index 2fca7186b..a44d81716 100644 --- a/src/sphinx/Detailed-Topics/Library-Management.rst +++ b/src/sphinx/Detailed-Topics/Library-Management.rst @@ -472,7 +472,7 @@ Forcing a revision without introducing a dependency Use of the ``force()`` method described in the previous section requires having a direct dependency. However, it may be desirable to force a revision without introducing that direct dependency. -Ivy provides overrides for this and in sbt, overrides are configured in sbt with the ``dependencyOverrides`` setting, which is a set of ``ModuleID``s. +Ivy provides overrides for this and in sbt, overrides are configured in sbt with the ``dependencyOverrides`` setting, which is a set of ``ModuleIDs``. For example, the following dependency definitions conflict because spark uses log4j 1.2.16 and scalaxb uses log4j 1.2.17: ::