From f80d82cfccfb00600c7b017dcb951175dfd68376 Mon Sep 17 00:00:00 2001
From: chrisfinazzo <chris.finazzo@gmail.com>
Date: Fri, 26 Sep 2014 12:46:41 -0400
Subject: [PATCH 1/3] Remove references to the watch command in the sample

---
 site/_docs/usage.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/site/_docs/usage.md b/site/_docs/usage.md
index 7538de00..0e2f783e 100644
--- a/site/_docs/usage.md
+++ b/site/_docs/usage.md
@@ -46,9 +46,6 @@ $ jekyll serve --detach
 # => Same as `jekyll serve` but will detach from the current terminal.
 #    If you need to kill the server, you can `kill -9 1234` where "1234" is the PID.
 #    If you cannot find the PID, then do, `ps aux | grep jekyll` and kill the instance. [Read more](http://unixhelp.ed.ac.uk/shell/jobz5.html).
-
-$ jekyll serve --watch
-# => Same as `jekyll serve`, but watch for changes and regenerate automatically.
 {% endhighlight %}
 
 These are just a few of the available [configuration options](../configuration/).

From bec32b14cbd460577b61473f99ccd7a55721d154 Mon Sep 17 00:00:00 2001
From: chrisfinazzo <chris.finazzo@gmail.com>
Date: Sat, 27 Sep 2014 12:54:47 -0400
Subject: [PATCH 2/3] Add a note about the separate commands, show an example
 without the watcher

---
 site/_docs/usage.md | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/site/_docs/usage.md b/site/_docs/usage.md
index 0e2f783e..6ed29c0f 100644
--- a/site/_docs/usage.md
+++ b/site/_docs/usage.md
@@ -41,6 +41,7 @@ preview what the generated site will look like in your browser locally.
 {% highlight bash %}
 $ jekyll serve
 # => A development server will run at http://localhost:4000/
+# Auto-regeneration: enabled. Use `--no-watch` to disable.
 
 $ jekyll serve --detach
 # => Same as `jekyll serve` but will detach from the current terminal.
@@ -48,6 +49,18 @@ $ jekyll serve --detach
 #    If you cannot find the PID, then do, `ps aux | grep jekyll` and kill the instance. [Read more](http://unixhelp.ed.ac.uk/shell/jobz5.html).
 {% endhighlight %}
 
+<div class="note info">
+  <h5>Be aware of default behavior</h5>
+  <p>
+    As of version 2.4, the <code>serve</code> command will watch for changes automatically. To disable this, you can use <code>jekyll serve --no-watch</code>, which preserves the old behavior.
+  </p>
+</div>
+
+{% highlight bash %}
+$ jekyll serve --no-watch
+# => A development server will run at http://localhost:4000/
+{% endhighlight %}
+
 These are just a few of the available [configuration options](../configuration/).
 Many configuration options can either be specified as flags on the command line,
 or alternatively (and more commonly) they can be specified in a `_config.yml`
@@ -68,4 +81,4 @@ $ jekyll build --source _source --destination _deploy
 {% endhighlight %}
 
 For more about the possible configuration options, see the
-[configuration](../configuration/) page.
+[configuration](../configuration/) page.
\ No newline at end of file

From 4a5f70b3153116f309c87d6f45ae95d72ca5d1c1 Mon Sep 17 00:00:00 2001
From: chrisfinazzo <chris.finazzo@gmail.com>
Date: Sat, 27 Sep 2014 13:06:45 -0400
Subject: [PATCH 3/3] Clarify instructions

---
 site/_docs/usage.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/_docs/usage.md b/site/_docs/usage.md
index 6ed29c0f..4959ad45 100644
--- a/site/_docs/usage.md
+++ b/site/_docs/usage.md
@@ -58,7 +58,7 @@ $ jekyll serve --detach
 
 {% highlight bash %}
 $ jekyll serve --no-watch
-# => A development server will run at http://localhost:4000/
+# => Same as `jekyll serve` but will not watch for changes.
 {% endhighlight %}
 
 These are just a few of the available [configuration options](../configuration/).