Merge pull request #1303 from sbt/wip/merge-0.13.2

Merge 0.13.2

src/sphinx/Community/Community-Plugins.rst

@@ -95,6 +95,7 @@ Frontend development plugins
    https://github.com/btd/sbt-less-plugin
 -  sbt-emberjs: https://github.com/stefri/sbt-emberjs
 -  sbt-closure: https://github.com/eltimn/sbt-closure
+-  sbt-imagej: https://github.com/jpsacha/sbt-imagej
 -  sbt-yui-compressor: https://github.com/indrajitr/sbt-yui-compressor
 -  sbt-requirejs: https://github.com/scalatra/sbt-requirejs
 -  sbt-vaadin-plugin: https://github.com/henrikerola/sbt-vaadin-plugin
@@ -122,6 +123,7 @@ Release plugins
    https://github.com/sbt/sbt-release
 -  sbt-unique-version (emulates unique snapshots):
    https://github.com/sbt/sbt-unique-version
+-  sbt-install4j: https://github.com/jpsacha/sbt-install4j
 -  sbt-pack (generates packages with dependent jars and launch scripts):
    https://github.com/xerial/sbt-pack
 -  sbt-start-script:
@@ -227,6 +229,8 @@ Utility plugins
    https://github.com/softprops/jot
 -  np (Dead simple new project directory generation):
    https://github.com/softprops/np
+-  npt (Creates new project skeletons based on templates):
+   https://github.com/reikje/npt
 -  sbt-editsource (A poor man's *sed*\ (1), for sbt):
    http://software.clapper.org/sbt-editsource/
 -  sbt-cross-building (Simplifies building your plugins for multiple

src/sphinx/conf.py

@@ -75,8 +75,11 @@ typesafe_base = 'http://repo.typesafe.com/typesafe/'
 typesafe_ivy_snapshots = typesafe_base + 'ivy-snapshots/'
 typesafe_ivy_releases = typesafe_base + 'ivy-releases/'
 launcher_release_base = typesafe_ivy_releases + 'org.scala-sbt/sbt-launch/'
+bintray_dl_base = 'http://dl.bintray.com/'
 launcher_snapshots_base = typesafe_ivy_snapshots + 'org.scala-sbt/sbt-launch/'
-sbt_native_package_base = 'http://repo.scala-sbt.org/scalasbt/sbt-native-packages/org/scala-sbt/sbt/'
+sbt_native_package_base = bintray_dl_base + 'sbt/native-packages/sbt/'
+sbt_debian_base = bintray_dl_base + 'sbt/debian/'
+sbt_rpm_base = bintray_dl_base + 'sbt/rpm/'
 
 rst_epilog = """
 .. |scalaVersion| replace:: %(scalaVersion)s
@@ -84,11 +87,11 @@ rst_epilog = """
 .. _typesafe-snapshots: %(typesafe_ivy_snapshots)s
 .. |typesafe-snapshots| replace:: Typesafe Snapshots
 .. _sbt-launch.jar: %(launcher_release_base)s%(release)s/sbt-launch.jar
-.. _MSI: %(sbt_native_package_base)s%(release)s/sbt.msi
+.. _MSI: %(sbt_native_package_base)s%(release)s/sbt-%(release)s.msi
-.. _TGZ: %(sbt_native_package_base)s%(release)s/sbt.tgz
+.. _TGZ: %(sbt_native_package_base)s%(release)s/sbt-%(release)s.tgz
-.. _ZIP: %(sbt_native_package_base)s%(release)s/sbt.zip
+.. _ZIP: %(sbt_native_package_base)s%(release)s/sbt-%(release)s.zip
-.. _DEB: %(sbt_native_package_base)s%(release)s/sbt.deb
+.. _DEB: %(sbt_debian_base)ssbt-%(release)s.deb
-.. _RPM: %(sbt_native_package_base)s%(release)s/sbt.rpm
+.. _RPM: %(sbt_rpm_base)ssbt-%(release)s.rpm
 .. |nightly-launcher| replace:: %(launcher_snapshots_base)s
 .. _sbt-dev mailing list: https://groups.google.com/forum/#!forum/sbt-dev
 .. _adept: https://groups.google.com/group/adept-dev/topics
@@ -102,6 +105,8 @@ rst_epilog = """
    'launcher_snapshots_base': launcher_snapshots_base,
    'typesafe_ivy_snapshots': typesafe_ivy_snapshots,
    'sbt_native_package_base': sbt_native_package_base,
+   'sbt_rpm_base': sbt_rpm_base,
+   'sbt_debian_base': sbt_debian_base,
    'scalaRelease': scalaRelease,
    'scalaVersion': scalaVersion,
    'release': release