{"thread":{"id":"23586","subject":"[PATCH] Typo fixes and minor cleanups for the big \"index\"/\"staging area patch","startedAt":"2010-04-24T05:59:59Z","lastAt":"2010-04-24T05:59:59Z","messageCount":1,"participants":["Eric S. Raymond"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"140255","messageId":"1272088799-22618-1-git-send-email-esr@thyrsus.com","threadId":"23586","inReplyTo":null,"subject":"[PATCH] Typo fixes and minor cleanups for the big \"index\"/\"staging area patch","fromName":"Eric S. Raymond","fromEmail":"esr@thyrsus.com","sentAt":"2010-04-24T05:59:59Z","receivedAt":"2010-04-24T05:59:59Z","isPatch":true,"sender":{"key":"esr@thyrsus.com","avatar":"https://avatars.githubusercontent.com/u/727961?v=4"},"body":"Should probably be merged with my last for commit purposes.\n\nSigned-off-by: Eric S. Raymond <esr@thyrsus.com>\n---\n Documentation/config.txt               |    4 ++--\n Documentation/git-add.txt              |    4 ++--\n Documentation/git-checkout-index.txt   |    3 ++-\n Documentation/git-diff-index.txt       |    4 ++++\n Documentation/git-grep.txt             |    2 +-\n Documentation/git-merge.txt            |    4 ++--\n Documentation/git-read-tree.txt        |    4 ++--\n Documentation/gitcore-tutorial.txt     |   12 ++++++------\n Documentation/gitrepository-layout.txt |    2 +-\n 9 files changed, 22 insertions(+), 17 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 6abd34b..0b59592 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -283,7 +283,7 @@ proxy use, while defaulting to a common proxy for external domains.\n \n core.ignoreStat::\n \tIf true, commands which modify both the working tree and\n-\tthestaging area will mark the updated paths with the \"assume\n+\tthe staging area will mark the updated paths with the \"assume\n \tunchanged\" bit in the staging area. These marked files are\n \tthen assumed to stay unchanged in the working copy, until you\n \tmark them otherwise manually - Git will not detect the file\n@@ -1437,7 +1437,7 @@ pack.threads::\n \n pack.indexVersion::\n \tSpecify the default pack index version (the \"index\" is the data\n-        structure representing the staging area).  Valid values are 1 for\n+\tstructure representing the staging area).  Valid values are 1 for\n \tlegacy pack index used by Git versions prior to 1.5.2, and 2 for\n \tthe new pack index with capabilities for packs larger than 4 GB\n \tas well as proper protection against the repacking of corrupted\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\nindex db0c9d9..2d150aa 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -28,7 +28,7 @@ the commit command, you must use the `add` command to add any new or\n modified files to the staging area.\n \n (Some git command names and options refer to the staging area as \"the\n-index\", which is actually the way the staging are is implemented in\n+index\", which is actually the way the staging area is implemented in\n git plumbing.)\n \n This command can be performed multiple times before a commit.  It only\n@@ -214,7 +214,7 @@ status::\n +\n It shows that foo.png has differences from HEAD (but that is\n binary so line count cannot be shown) and there is no\n-difference between the staged0 copy and the working tree\n+difference between the staged copy and the working tree\n version (if the working tree version were also different,\n 'binary' would have been shown in place of 'nothing').  The\n other file, git-add--interactive.perl, has 403 lines added\ndiff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt\nindex 24e70ff..2583c8a 100644\n--- a/Documentation/git-checkout-index.txt\n+++ b/Documentation/git-checkout-index.txt\n@@ -21,7 +21,8 @@ Will copy all files listed from the staging area to the working directory\n (not overwriting existing files).\n \n The name of this command reflects the older terminology \"index\" for\n-what is now called the staging area.\n+what is now called the staging area. The \"index file\" is where the\n+staging-area content is actually stored.\n \n OPTIONS\n -------\ndiff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt\nindex 37ed959..53c3947 100644\n--- a/Documentation/git-diff-index.txt\n+++ b/Documentation/git-diff-index.txt\n@@ -18,6 +18,10 @@ ignoring the stat state of the file on disk.  When paths are\n specified, compares only those named paths.  Otherwise all\n entries in the staging area are compared.\n \n+The name of this command reflects the older terminology \"index\" for\n+what is now called the staging area. The \"index file\" is where the\n+staging-area content is actually stored.\n+\n OPTIONS\n -------\n include::diff-options.txt[]\ndiff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt\nindex 0d2d688..e5d05e2 100644\n--- a/Documentation/git-grep.txt\n+++ b/Documentation/git-grep.txt\n@@ -36,7 +36,7 @@ OPTIONS\n \tInstead of searching tracked files in the working tree, search\n \tblobs registered in the staging area.  (This option name\n \treflects the fact that in the far past the staging area was\n-        known as the \"cache\".)\n+\tknown as the \"cache\".)\n \n --no-index::\n \tSearch files in the current directory, not just those tracked by git.\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 85a87ad..d1c1173 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -123,9 +123,9 @@ happens:\n \n 1. The `HEAD` pointer stays the same.\n 2. The `MERGE_HEAD` ref is set to point to the other branch head.\n-3. Paths that merged cleanly are updated both in the staging area file and\n+3. Paths that merged cleanly are updated both in the staging area and\n    in your working tree.\n-4. For conflicting paths, the undex file representing the staging area \n+4. For conflicting paths, the index file representing the staging area \n    records up to three versions: stage 1 stores the version from the \n    common ancestor, stage 2 from `HEAD`, and stage 3 from `MERGE_HEAD` (you\n    can inspect the stages with `git ls-files -u`).  The working\ndiff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt\nindex debc97b..9fdb6f9 100644\n--- a/Documentation/git-read-tree.txt\n+++ b/Documentation/git-read-tree.txt\n@@ -17,7 +17,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n Reads the tree information given by <tree-ish> into the staging area,\n-but does not actually *update* any of the files it \"caches\". (see:\n+but does not actually *update* any of the files it stages. (see:\n linkgit:git-checkout-index[1])\n \n Optionally, it can merge a tree into the staging area, perform a\n@@ -65,7 +65,7 @@ OPTIONS\n --aggressive::\n \tUsually a three-way merge by 'git read-tree' resolves\n \tthe merge for really trivial cases and leaves other\n-\tcases unresolved in the staging area, so that Porcelains can\n+\tcases unresolved in the staging area, so that porcelains can\n \timplement different merge policies.  This flag makes the\n \tcommand to resolve a few more cases internally:\n +\ndiff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt\nindex 2485a2c..2ba714c 100644\n--- a/Documentation/gitcore-tutorial.txt\n+++ b/Documentation/gitcore-tutorial.txt\n@@ -371,8 +371,8 @@ have committed something, we can also learn to use a new command:\n 'git diff-index'.\n \n Unlike 'git diff-files', which showed the difference between the\n-staging area file and the working tree, 'git diff-index' shows the differences\n-between a committed *tree* and either the staging area file or the working\n+staging area and the working tree, 'git diff-index' shows the differences\n+between a committed *tree* and either the staging area or the working\n tree. In other words, 'git diff-index' wants a tree to be diffed\n against, and before we did the commit, we couldn't do that, because we\n didn't have anything to diff against.\n@@ -513,10 +513,10 @@ various diff-\\* commands compare things.\n                       |    |  diff-index --cached\n                       |    |\n           diff-index  |    V\n-                      |  +--------------+\n-                      |  | Staging area |\n-                      |  |    \"cache\"   |\n-                      |  +--------------+\n+                      |  +---------+\n+                      |  | Staging |\n+                      |  |   Area  |\n+                      |  +---------+  \n                       |    ^\n                       |    |\n                       |    |  diff-files\ndiff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt\nindex a511e2c..abfca02 100644\n--- a/Documentation/gitrepository-layout.txt\n+++ b/Documentation/gitrepository-layout.txt\n@@ -167,7 +167,7 @@ info/grafts::\n \tby a space and terminated by a newline.\n \n info/exclude::\n-\tThis file, by convention among Porcelains, stores the\n+\tThis file, by convention among porcelains, stores the\n \texclude pattern list. `.gitignore` is the per-directory\n \tignore file.  'git status', 'git add', 'git rm' and\n \t'git clean' look at it but the core git commands do not look\n-- \n1.7.1.rc2.12.gf7bd8\n"}]}