diff --git a/subprojects/docs/src/docs/release/notes.md b/subprojects/docs/src/docs/release/notes.md
index 972d360b9914..04295e710e1b 100644
--- a/subprojects/docs/src/docs/release/notes.md
+++ b/subprojects/docs/src/docs/release/notes.md
@@ -12,8 +12,10 @@ Add-->
### Play Framework Support (i)
-Gradle can now build [Play](https://www.playframework.com/) applications for Play version 2.3.x and 2.4.x. The new `play` plugin allows users
-to model, build, test, run and package Play applications. It includes support for:
+Gradle can now build [Play](https://www.playframework.com/) applications for Play version 2.3.x and 2.4.x.
+The new `play` plugin allows users to build, test, run and package Play applications.
+
+It includes support for:
* Compiling Scala and Java controllers, tests, and model classes
* Processing routes files
@@ -21,15 +23,17 @@ to model, build, test, run and package Play applications. It includes support f
* Compiling CoffeeScript assets
* Minifying JavaScript assets
* Running tests with JUnitRunner
-* Running applications in development mode
+* Running applications in development mode with hot reloading
* Staging and creating Play distribution packages
-Compatibility with Play 2.4.x is limited. The `play` plugin does not work with a few new build-related features in 2.4. Specifically, Gradle
-does not allow you to configure reverse routes or use "injected" routes generators. Future releases will add support for these features as well
-as other features and versions of the Play Framework.
+Compatibility with Play 2.4.x is limited.
+The `play` plugin does not work with a few new build-related features in 2.4.
+Specifically, Gradle does not allow you to configure reverse routes or use "injected" routes generators.
+Future releases will add support for these features as well as other features and versions of the Play Framework.
-Building on top of the new [continuous build](userguide/continuous_build.html) feature from the last release, the `play` plugin lets you run your Play
-application with continuous build and have Gradle automatically reload your application when sources change without stopping it.
+When running a Play application as part of a [continuous build](userguide/continuous_build.html), changes to the source are reflected in the running app automatically… no restart required.
+This facilitates a fast development cycle.
+The mechanism empowering this “hot reloading” will be made generally available to other types of applications and services in future versions of Gradle.
See the [User Guide](userguide/play_plugin.html) as well as the sample builds delivered with the Gradle distribution for more information on using the `play` plugin.
diff --git a/subprojects/docs/src/docs/userguide/playPlugin.xml b/subprojects/docs/src/docs/userguide/playPlugin.xml
index 381cbb56a4f8..5ac5607a479c 100644
--- a/subprojects/docs/src/docs/userguide/playPlugin.xml
+++ b/subprojects/docs/src/docs/userguide/playPlugin.xml
@@ -322,6 +322,30 @@
+
+ Running a Play application
+
+ The runPlayBinary task starts the Play application under development.
+ During development it is beneficial to execute this task as a continuous build.
+ Continuous build is a generic feature that supports automatically re-running a build when inputs change.
+ The runPlayBinary task is “continuous build aware” in that it behaves differently when run as part of a continuous build.
+
+
+ When not run as part of a continuous build, the runPlayBinary task will block the build.
+ That is, the task will not complete as long as the application is running.
+ When running as part of a continuous build, the task will start the application if not running and otherwise propagate any changes to the code of the application to the running instance.
+ This is useful for quickly iterating on your Play application with an edit->rebuild->refresh cycle.
+
+
+ To enable continuous build, run Gradle with -t runPlayBinary or --continuous runPlayBinary.
+
+
+ Users of Play used to such a workflow with Play's default build system should note that compile errors are handled differently.
+ If a build failure occurs before the runPlayBinary during a continuous build, the Play application itself will not reflect this.
+ The Play application will remain unchanged, with the build failure details being present in Gradle's output.
+
+
+
Configuring a Play application
@@ -487,39 +511,6 @@
-
- Running a Play application
-
- Continuous build is a generic feature that supports automatically re-running a task with its inputs have changed.
- Any Play plugin task can be used with continuous build, but using this feature with the runPlayBinary task will
- be useful for quickly iterating on your Play application with an edit->rebuild->refresh cycle. This will be faster than re-running Gradle after each
- change since the Play application JVM will be kept around and classes will be hot-reloaded.
-
-
- To enable continuous build, run Gradle with -t or --continuous.
-
-
- There are a couple of things to keep in mind with the current Play reload support. Future Gradle releases will improve usability and error reporting.
-
-
-
-
- Changes made while the build is running will not cause another rebuild. This is a general continuous build limitation.
-
-
-
-
- Build failures are not propagated to the browser/application. If the build fails, the application will continue to run without changes.
-
-
-
-
- Application failures do not show source code in the browser.
-
-
-
-
-
Resources