All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: "Dr . Adam Nielsen" <admin@in-ici.net>
Subject: [PATCH 2/3] gitignore.txt: change "folder" to "directory"
Date: Sun, 24 Oct 2021 19:09:16 +0200	[thread overview]
Message-ID: <4f3ba7fbce97fe74821664c80758ee9781c491c0.1635094161.git.martin.agren@gmail.com> (raw)
In-Reply-To: <cover.1635094161.git.martin.agren@gmail.com>

We prefer "directory" over "folder" when discussing the file system
concept. Change this instance for consistency -- indeed, even within
this paragraph, we already use "directory".

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
 Documentation/gitignore.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index f8a1fc2014..f2738b10db 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -155,7 +155,7 @@ accessed from the index or a tree versus from the filesystem.
 EXAMPLES
 --------
 
- - The pattern `hello.*` matches any file or folder
+ - The pattern `hello.*` matches any file or directory
    whose name begins with `hello.`. If one wants to restrict
    this only to the directory and not in its subdirectories,
    one can prepend the pattern with a slash, i.e. `/hello.*`;
-- 
2.33.1.711.g9d530dc002


  parent reply	other threads:[~2021-10-24 17:10 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-24 17:09 [PATCH 0/3] Documentation: change "folder" to "directory" Martin Ågren
2021-10-24 17:09 ` [PATCH 1/3] git-multi-pack-index.txt: " Martin Ågren
2021-10-24 17:09 ` Martin Ågren [this message]
2021-10-24 17:09 ` [PATCH 3/3] gitweb.txt: " Martin Ågren
2021-10-25  9:19 ` [PATCH 0/3] Documentation: " Bagas Sanjaya
2021-10-26  6:02   ` Martin Ågren
2021-10-27 18:48     ` Junio C Hamano
2021-10-25 15:31 ` Derrick Stolee
2021-10-25 18:08 ` 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=4f3ba7fbce97fe74821664c80758ee9781c491c0.1635094161.git.martin.agren@gmail.com \
    --to=martin.agren@gmail.com \
    --cc=admin@in-ici.net \
    --cc=git@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.