git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Utku Gultopu via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Utku Gultopu <ugultopu@gmail.com>, Utku Gultopu <ugultopu@gmail.com>
Subject: [PATCH] doc: remove "directory cache" from man pages
Date: Fri, 08 Jan 2021 16:54:56 +0000	[thread overview]
Message-ID: <pull.943.git.git.1610124896385.gitgitgadget@gmail.com> (raw)

From: Utku Gultopu <ugultopu@gmail.com>

"directory cache" (or "directory cache index", "cache") are obsolete
terms which have been superseded by "index". Keeping them in the
documentation may be a source of confusion. This commit replaces
them with the current term, "index", on man pages.

Signed-off-by: Utku Gultopu <ugultopu@gmail.com>
---
    doc: remove "directory cache" from man pages
    
    "directory cache" (or "directory cache index", "cache") are obsolete
    terms which have been superseded by "index". Keeping them in the
    documentation may be a source of confusion. This commit replaces them
    with the current term, "index", on man pages.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-943%2Fugultopu%2Fremove-directory-cache-from-man-pages-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-943/ugultopu/remove-directory-cache-from-man-pages-v1
Pull-Request: https://github.com/git/git/pull/943

 Documentation/git-ls-files.txt     | 5 ++---
 Documentation/git-update-index.txt | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index cbcf5263dd0..0a3b5265b34 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -23,9 +23,8 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-This merges the file listing in the directory cache index with the
-actual working directory list, and shows different combinations of the
-two.
+This merges the file listing in the index with the actual working
+directory list, and shows different combinations of the two.
 
 One or more of the options below may be used to determine the files
 shown:
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 1489cb09a09..2853f168d97 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -30,9 +30,8 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-Modifies the index or directory cache. Each file mentioned is updated
-into the index and any 'unmerged' or 'needs updating' state is
-cleared.
+Modifies the index. Each file mentioned is updated into the index and
+any 'unmerged' or 'needs updating' state is cleared.
 
 See also linkgit:git-add[1] for a more user-friendly way to do some of
 the most common operations on the index.

base-commit: 72c4083ddf91b489b7b7b812df67ee8842177d98
-- 
gitgitgadget

             reply	other threads:[~2021-01-08 16:55 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-08 16:54 Utku Gultopu via GitGitGadget [this message]
2021-01-08 18:32 ` [PATCH] doc: remove "directory cache" from man pages Taylor Blau
2021-01-08 19:51   ` Utku
2021-01-08 19:52     ` Taylor Blau
2021-01-10  6:58       ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=pull.943.git.git.1610124896385.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=ugultopu@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).