luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Docs: syntax fixes

This commit is contained in:
Mark Harrah 2013-02-13 08:16:25 -05:00
parent 67c459b6a2
commit b152a836c5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sphinx/Community/ChangeSummary_0.13.0.rst
View File

@ -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``.

2
src/sphinx/Detailed-Topics/Cross-Build.rst
View File

@ -143,4 +143,4 @@ than the default.
As a final note, you can use ``++ <version>`` to temporarily switch the
Scala version currently being used to build. ``<version>`` 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.

2
src/sphinx/Detailed-Topics/Library-Management.rst
View File

@ -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:
::