From patchwork Sun Oct 24 17:09:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 12580353 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F202C433F5 for ; Sun, 24 Oct 2021 17:09:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1F7866103D for ; Sun, 24 Oct 2021 17:09:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231511AbhJXRMP (ORCPT ); Sun, 24 Oct 2021 13:12:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229821AbhJXRMO (ORCPT ); Sun, 24 Oct 2021 13:12:14 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BB7BC061745 for ; Sun, 24 Oct 2021 10:09:53 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id ec8so13390535edb.6 for ; Sun, 24 Oct 2021 10:09:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/ae6v6ZUOlunu6pLJcs0OUkxh6cbNUDF8WfbDj5g890=; b=RIVpuMd3LO5vJu5IidrjH4xoEUZWLGo0oxTCSjOcIaFqo+ENowVhq8nHfCGuoLbkBm YvSftr+4kRKhwGUQFF7YXscahdOWkWGxzzb+J9xoUDTs+DilcciFkNr+V6jLRh+/vSbY KsgsuitJvYva9xar51LdVTRX7oX09r2rgqNWYAVdhM8HNg/v94A5MOlo6bB3/IwjFYqK HRehJxSB5Is4Qj7xe7qNYZl+BKtJP9OOndErVzM2YhgNDphtJv6XbVTLhUU99Y5jxgyc Irv3BlJZOgCE91qIEsYUqzyL9mi+loXBci62C/Ir9iyKvkd7tkmj7d5W+fexLA4g2wiS CD1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/ae6v6ZUOlunu6pLJcs0OUkxh6cbNUDF8WfbDj5g890=; b=S37mI5sdmVpUvNn5l3dqybDC4rIcNbweI4I18hWSfdvQJ6M3JTk0vFwrSAMm4DMoAF /BGAqt9ji/fd9hsTdd3okJGcF1I2BtO4+kywhVQ6odl5RULxzZDFBqzOZWiqYRWroyye nNXUdCUdDf4fJpzQWBAqXHV/Cwd0OhgtXFUxVDgb/KK2qquvSUgA1f2qdkmbHJ8us5RZ FRYVWxPq+2Ar4UxnW0YiIFjTRt8bjTc+ebOddKZ2uqH5mKbYGwajduRdasNvnHpAs+ob 4nAHDuBPbJsMgwtU/V7opXVOFgK3Cc2Jr1yBpT1S2WeEY7WA7WxoLZ84JH08rgWSY37e oqFg== X-Gm-Message-State: AOAM532F6dfG5G+k3A7bJSan+eVLMlmo+K3lThy5qYO8z4EFhwmeEaXb Foovh5eiSPVpVLnkFs4pZExfF5k/xcYJCQ== X-Google-Smtp-Source: ABdhPJwD0JOOuTXiX+dJmoSVGVPNUxpnWfjDskxxl7ueite9E5BHn2oOzX2H3C3ioqFOPnce3+QSTg== X-Received: by 2002:a05:6402:1a2f:: with SMTP id be15mr18024490edb.270.1635095391785; Sun, 24 Oct 2021 10:09:51 -0700 (PDT) Received: from lena.c.hoisthospitality.com ([194.209.187.34]) by smtp.gmail.com with ESMTPSA id j11sm6313670ejt.114.2021.10.24.10.09.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Oct 2021 10:09:51 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Derrick Stolee , Taylor Blau Subject: [PATCH 1/3] git-multi-pack-index.txt: change "folder" to "directory" Date: Sun, 24 Oct 2021 19:09:15 +0200 Message-Id: X-Mailer: git-send-email 2.33.1.711.g9d530dc002 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org We prefer "directory" over "folder" when discussing the file system concept. In all of our documentation, these are the only spots where we refer to the `.git` directory as a folder. Switch to "directory", and while doing so, add backticks to the ".git" filename to set it in monospace. Signed-off-by: Martin Ågren --- Documentation/git-multi-pack-index.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-multi-pack-index.txt b/Documentation/git-multi-pack-index.txt index b008ce2850..c588fb91af 100644 --- a/Documentation/git-multi-pack-index.txt +++ b/Documentation/git-multi-pack-index.txt @@ -99,13 +99,13 @@ associated `.keep` file will not be selected for the batch to repack. EXAMPLES -------- -* Write a MIDX file for the packfiles in the current .git folder. +* Write a MIDX file for the packfiles in the current `.git` directory. + ----------------------------------------------- $ git multi-pack-index write ----------------------------------------------- -* Write a MIDX file for the packfiles in the current .git folder with a +* Write a MIDX file for the packfiles in the current `.git` directory with a corresponding bitmap. + ------------------------------------------------------------- @@ -118,7 +118,7 @@ $ git multi-pack-index write --preferred-pack= --bitmap $ git multi-pack-index --object-dir write ----------------------------------------------- -* Verify the MIDX file for the packfiles in the current .git folder. +* Verify the MIDX file for the packfiles in the current `.git` directory. + ----------------------------------------------- $ git multi-pack-index verify From patchwork Sun Oct 24 17:09:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 12580355 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86DB2C433F5 for ; Sun, 24 Oct 2021 17:10:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 69D4B60FDA for ; Sun, 24 Oct 2021 17:10:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231534AbhJXRMV (ORCPT ); Sun, 24 Oct 2021 13:12:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230301AbhJXRMU (ORCPT ); Sun, 24 Oct 2021 13:12:20 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D244BC061764 for ; Sun, 24 Oct 2021 10:09:59 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id z20so9239114edc.13 for ; Sun, 24 Oct 2021 10:09:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Fhv2hWez0NNBdm9+lqo+ZqmQCpHp09DPoWan7PKqOFs=; b=PpZ2oi0qOUQdGx6C2k+V5b+spoPq09M/7nhaHZRDD+iTDRLqdQlCw6qu2CkUH9Fc+v TA4Fp44t35QPDcZT8WB4oUPod0CzvE2KqMYcANnWWf0rdOz7ooYtLiateC1qnFGCAEBa 96tKRE+++FuGNSmRM0hcqBgTGChyhnSsNvTBknwD4gEtsxhDrCJYDgtUFI07pMPa8tup it+6aQqb3jkzZRk0QLLGaqgc3OUSiRFTi9zqcm3YRBrkQN5iIIVb3kMjGKaaOIS06Mgv 6CXQ2vsvwFCM/eblm1TDEY2QrBrVBQ2YJZQ8X+BFg3jpK4lHubnjeD+X84zNXTYqU/zQ fN+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Fhv2hWez0NNBdm9+lqo+ZqmQCpHp09DPoWan7PKqOFs=; b=pBX95Qw9WTFNtAQUXzbRw0IOlh4gtizsWI47gGxV5sXdMpJ+/GGQMjCVPWe3rbX+nQ 04+50c6UprdH1y8BHpIiPlnGERevuWJI8YE+4QrHkUjYLbJ3kyB2B7iGUf1lEgcnGyNM 5IdqkT2mx0CCcGPmopSPZ3J32val9sDye8DTBJFegGbzX6+PfSRHC6AHp9j/Oo1nTkrw /RXPdBe6jGjW+0WF9LrheksMuzCSiIAoj1r+UoGdBgO6OO1kZJ0Vu4YYiZilOenGxYFJ nnEi6+iDK9r81M9WNg7V1O4Nj7dyyuRhrKNmPdO5S53GsrHci8+55STmtKq3OZ5p3TVa UULw== X-Gm-Message-State: AOAM532V34rO8jeAv2eL50VhLLPjoSNhZcFGM+jlXx0UkVG2pmgHLbU5 Mk8EObCvIH5z/WLfR8KcUo/JerCJkqGHQA== X-Google-Smtp-Source: ABdhPJzIEbym6JT5uUId9/rpvpMi8o7YTlx7hTTHEclgvX0CUT07mhghClCQGD7vlbLYafRFOH1jKw== X-Received: by 2002:a17:907:168b:: with SMTP id hc11mr16619090ejc.160.1635095398259; Sun, 24 Oct 2021 10:09:58 -0700 (PDT) Received: from lena.c.hoisthospitality.com ([194.209.187.34]) by smtp.gmail.com with ESMTPSA id j11sm6313670ejt.114.2021.10.24.10.09.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Oct 2021 10:09:57 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: "Dr . Adam Nielsen" Subject: [PATCH 2/3] gitignore.txt: change "folder" to "directory" Date: Sun, 24 Oct 2021 19:09:16 +0200 Message-Id: <4f3ba7fbce97fe74821664c80758ee9781c491c0.1635094161.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.33.1.711.g9d530dc002 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 --- 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.*`; From patchwork Sun Oct 24 17:09:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 12580357 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1F50C433F5 for ; Sun, 24 Oct 2021 17:10:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C932E60FDA for ; Sun, 24 Oct 2021 17:10:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231610AbhJXRMa (ORCPT ); Sun, 24 Oct 2021 13:12:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231642AbhJXRM0 (ORCPT ); Sun, 24 Oct 2021 13:12:26 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB9C0C061243 for ; Sun, 24 Oct 2021 10:10:05 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id s1so6600287edd.3 for ; Sun, 24 Oct 2021 10:10:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bxer6BQksOe79PDqJsxMk4+fs+6eYUURRsgJJGzFQeM=; b=LK75dzfA8K9jcL0HG+MpEDGvhheyrXa1iDxVfhMiYEcO5e05Vf9f1nQrv1Wr3KBFL7 D45DuXrVO9D5FE4ukXqIDBxhBQ3yukGTebD5WNAPPSr9LjndrBL3rHFL2AbuJBPta+xW VdT+Y/Ra02R6A9LTnmHy+3akrcqj5VEy+TSu71VhEdjxxOUkLMNVNsmaPs3RND/sBNXN /LC6LxLmR7fKpkFIlEk/awd2CvljXklSo8kQwaiJ2Tnf7WYRRsRpbyM4OtZy6wWFtzjA +jLCDiG4pqEsiGBnFsP2W1U3ltY2W4FD93rP9cPt1v+xdb2GR4O9ft154Ul0+QgRKMP7 zgkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bxer6BQksOe79PDqJsxMk4+fs+6eYUURRsgJJGzFQeM=; b=M68JvZ/1+5XVZioL9M1j+uw74p2A/4LfUfSCNEdIoHJhiS2kIeUFxs/wCslmCE57N5 962+pR+OIf/SYCJLsjtTMe4zh+2uNxZ+cEUS2TGZfQjcyofV5UGN6/5m6UAhJXp4jz0L ZWzU26WSOqs+FFEJc8ubkQEOa7sch+7G+pir5jndzyudSUdEKd+wmznN0eeQTf0keyJb 9XfnDiZDk+UWfxN7cW1a34pJIsWGzmMBvcPabG8OsptDdSDuCBwhyMm1t/HPZU/4YFPk ug45PeiV0FBN/ZREi7SG3VtnKGNkeK6Qf8FmInjhU4WIPshqcNtpd56eN9CT/8F5u1Oa G42A== X-Gm-Message-State: AOAM533twG2aAt8R7I2JJy8oU/Jc+rt6ubfV8HQ/XyTkknkefUA2d76n oFKK1FGrycldjshjyRCFrVDQPOEGmn3axw== X-Google-Smtp-Source: ABdhPJw4rONgiktUns3LPETw91n47USdkMl4exnhgLlyu8kSL6+2tj69SDRjwGDjUOVp8td4GadT9w== X-Received: by 2002:a17:907:6297:: with SMTP id nd23mr16662513ejc.62.1635095403667; Sun, 24 Oct 2021 10:10:03 -0700 (PDT) Received: from lena.c.hoisthospitality.com ([194.209.187.34]) by smtp.gmail.com with ESMTPSA id j11sm6313670ejt.114.2021.10.24.10.10.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Oct 2021 10:10:03 -0700 (PDT) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: =?utf-8?q?Jakub_Nar=C4=99bski?= Subject: [PATCH 3/3] gitweb.txt: change "folder" to "directory" Date: Sun, 24 Oct 2021 19:09:17 +0200 Message-Id: X-Mailer: git-send-email 2.33.1.711.g9d530dc002 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org We prefer "directory" over "folder" when discussing the file system concept. Change this instance for consistency. After this, the only hits for '\' in Documentation/ relate to IMAP folders. Signed-off-by: Martin Ågren --- Documentation/gitweb.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt index 3cc9b034c4..7cee9d3689 100644 --- a/Documentation/gitweb.txt +++ b/Documentation/gitweb.txt @@ -547,7 +547,7 @@ like this: # make the front page an internal rewrite to the gitweb script RewriteRule ^/$ /cgi-bin/gitweb.cgi [QSA,L,PT] - # look for a public_git folder in unix users' home + # look for a public_git directory in unix users' home # http://git.example.org/~/ RewriteRule ^/\~([^\/]+)(/|/gitweb.cgi)?$ /cgi-bin/gitweb.cgi \ [QSA,E=GITWEB_PROJECTROOT:/home/$1/public_git/,L,PT]