diff --git a/NEWS b/NEWS
index d6a5d8c2..0736b50d 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,10 @@ Changes in magit 0.7:
 * M-x magit-status doesn't prompt anymore for a directory when invoked
   from within a Git repository.  Use C-u to force a prompt.
 
+* When you have nothing staged, 'c' will now explicitly ask whether to
+  commit everything instead of just going ahead and do it.  This can
+  be customized.
+
 * The digit keys '1', '2', '3', and '4' now show sections on the
   respective level and hide everything below.  With Meta, they work on
   all sections; without, they work only on sections that are a parent
diff --git a/magit.texi b/magit.texi
index 74dfd1e8..f34aebbd 100644
--- a/magit.texi
+++ b/magit.texi
@@ -250,17 +250,14 @@ changes.
 
 Type @kbd{c} to pop up a buffer where you can write your change
 description.  Once you are happy with the description, type @kbd{C-c
-C-c} in that buffer to perform the commit.  When your stagin area is
-unused at this point, all your uncommitted changes are committed.
-When the staging area is in use, only the staged changes are
-committed.
+C-c} in that buffer to perform the commit.  When your staging area is
+unused when you hit @kbd{c}, you will be asked whether to commit all
+the unchanged changes.  When the staging area is in use, only the
+staged changes are committed, of course.
 
 You can type @kbd{C-c C-a} in the buffer with the change description
-toggles a flag that determines whether the next commit will be a
-@emph{amending} one.  When amending a commit, only the staged changes
-are committed, even if there are none.  (Normally, all unstaged
-changes are committed when there are no staged changes.)  This allows
-you to easily modify the message of the last commit.
+to toggle a flag that determines whether the next commit will
+@emph{amending} the current commit in HEAD.
 
 Typing @kbd{C} will also pop up the change description buffer, but in
 addition, it will try to insert a ChangeLog-style entry for the change