Merge branch 'maint'

diff --combined Documentation/git-add.txt
index 76d2b05854ccc742105c374fae33c676795d29f1,37077b523e04c1e468bc17dce8f2a44c9fa98a1c..4af3a9b0d78d70d101196326d4c6fbadd743b924
--- 1/Documentation/git-add.txt
--- 2/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@@ -3,7 -3,7 +3,7 @@@ git-add(1
  
  NAME
  ----
- git-add - Add file contents to the changeset to be committed next
+ git-add - Add file contents to the index
  
  SYNOPSIS
  --------
@@@ -11,24 -11,27 +11,27 @@@
  
  DESCRIPTION
  -----------
- All the changed file contents to be committed together in a single set
- of changes must be "added" with the 'add' command before using the
- 'commit' command.  This is not only for adding new files.  Even modified
- files must be added to the set of changes about to be committed.
- 
- This command can be performed multiple times before a commit. The added
- content corresponds to the state of specified file(s) at the time the
- 'add' command is used. This means the 'commit' command will not consider
- subsequent changes to already added content if it is not added again before
- the commit.
- 
- The 'git status' command can be used to obtain a summary of what is included
- for the next commit.
- 
- This command can be used to add ignored files with `-f` (force)
- option, but they have to be
- explicitly and exactly specified from the command line.  File globbing
- and recursive behaviour do not add ignored files.
+ This command adds the current content of new or modified files to the
+ index, thus staging that content for inclusion in the next commit.
+ 
+ The "index" holds a snapshot of the content of the working tree, and it
+ is this snapshot that is taken as the contents of the next commit.  Thus
+ after making any changes to the working directory, and before running
+ the commit command, you must use the 'add' command to add any new or
+ modified files to the index.
+ 
+ This command can be performed multiple times before a commit.  It only
+ adds the content of the specified file(s) at the time the add command is
+ run; if you want subsequent changes included in the next commit, then
+ you must run 'git add' again to add the new content to the index.
+ 
+ The 'git status' command can be used to obtain a summary of which
+ files have changes that are staged for the next commit.
+ 
+ The 'add' command can be used to add ignored files with `-f` (force)
+ option, but they have to be explicitly and exactly specified from the
+ command line.  File globbing and recursive behaviour do not add ignored
+ files.
  
  Please see gitlink:git-commit[1] for alternative ways to add content to a
  commit.
@@@ -228,3 -231,4 +231,3 @@@ Documentation by Junio C Hamano and th
  GIT
  ---
  Part of the gitlink:git[7] suite
 -