git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Patrick Steinhardt <ps@pks.im>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
	Patrick Steinhardt <ps@pks.im>
Subject: [PATCH v2] doc: fix inconsistent spelling of "packfile"
Date: Fri, 22 May 2015 08:22:04 +0200	[thread overview]
Message-ID: <1432275724-3187-1-git-send-email-ps@pks.im> (raw)
In-Reply-To: <1432193225-3502-1-git-send-email-ps@pks.im>

Fix remaining instances where "pack-file" is used instead of
"packfile". Some places remain where we still use "pack-file",
This is the case when we explicitly refer to a file with a
".pack" extension as opposed to a data source providing a pack
data stream.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 Documentation/git-unpack-objects.txt      | 2 +-
 Documentation/technical/pack-protocol.txt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt
index 894d20b..07d4329 100644
--- a/Documentation/git-unpack-objects.txt
+++ b/Documentation/git-unpack-objects.txt
@@ -9,7 +9,7 @@ git-unpack-objects - Unpack objects from a packed archive
 SYNOPSIS
 --------
 [verse]
-'git unpack-objects' [-n] [-q] [-r] [--strict] < <pack-file>
+'git unpack-objects' [-n] [-q] [-r] [--strict] < <packfile>
 
 
 DESCRIPTION
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index 812d857..fc09c63 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -465,7 +465,7 @@ contain all the objects that the server will need to complete the new
 references.
 
 ----
-  update-request    =  *shallow ( command-list | push-cert ) [pack-file]
+  update-request    =  *shallow ( command-list | push-cert ) [packfile]
 
   shallow           =  PKT-LINE("shallow" SP obj-id LF)
 
@@ -491,7 +491,7 @@ references.
 		      *PKT-LINE(gpg-signature-lines LF)
 		      PKT-LINE("push-cert-end" LF)
 
-  pack-file         = "PACK" 28*(OCTET)
+  packfile          = "PACK" 28*(OCTET)
 ----
 
 If the receiving end does not support delete-refs, the sending end MUST
-- 
2.4.1

  parent reply	other threads:[~2015-05-22  6:22 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-17  6:56 [PATCH 1/3] git-verify-pack.txt: fix inconsistent spelling of "packfile" Patrick Steinhardt
2015-05-17  6:56 ` [PATCH 2/3] git-unpack-objects.txt: " Patrick Steinhardt
2015-05-17  6:56 ` [PATCH 3/3] pack-protocol.txt: fix insconsistent " Patrick Steinhardt
2015-05-19 19:34 ` [PATCH 1/3] git-verify-pack.txt: fix inconsistent " Junio C Hamano
2015-05-19 22:24   ` Jeff King
2015-05-20 19:22     ` Junio C Hamano
2015-05-20 19:45       ` Junio C Hamano
2015-05-20 19:49         ` Jeff King
2015-05-20 22:37           ` Junio C Hamano
2015-05-21  2:04             ` Jeff King
2015-05-21  4:54               ` Junio C Hamano
2015-05-21  7:27                 ` [PATCH] doc: " Patrick Steinhardt
2015-05-21 16:37                   ` Junio C Hamano
2015-05-22  6:10                     ` Patrick Steinhardt
2015-05-22  6:22                   ` Patrick Steinhardt [this message]
2015-05-22 16:00                     ` [PATCH v2] " Junio C Hamano
2015-05-20  5:13   ` [PATCH 1/3] git-verify-pack.txt: " Patrick Steinhardt

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=1432275724-3187-1-git-send-email-ps@pks.im \
    --to=ps@pks.im \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /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).