Autogenerated HTML docs for v2.28.0-141-g4f0a8

27 files changed, 299 insertions, 35 deletions

diff --git a/RelNotes/2.29.0.txt b/RelNotes/2.29.0.txt
index 7f6b58243..d18555728 100644
--- a/RelNotes/2.29.0.txt
+++ b/RelNotes/2.29.0.txt
@@ -31,6 +31,23 @@ Performance, Internal Implementation, Development Support etc.
 
  * Dev support to limit the use of test_must_fail to only git commands.
 
+ * While packing many objects in a repository with a promissor remote,
+   lazily fetching missing objects from the promissor remote one by
+   one may be inefficient---the code now attempts to fetch all the
+   missing objects in batch (obviously this won't work for a lazy
+   clone that lazily fetches tree objects as you cannot even enumerate
+   what blobs are missing until you learn which trees are missing).
+
+ * The pretend-object mechanism checks if the given object already
+   exists in the object store before deciding to keep the data
+   in-core, but the check would have triggered lazy fetching of such
+   an object from a promissor remote.
+
+ * The argv_array API is useful for not just managing argv but any
+   "vector" (NULL-terminated array) of strings, and has seen adoption
+   to a certain degree.  It has been renamed to "strvec" to reduce the
+   barrier to adoption.
+
 
 Fixes since v2.28
 -----------------
@@ -40,7 +57,6 @@ Fixes since v2.28
    taught to fail when $elsewhere is not an empty directory.
    (merge dfaa209a79 bw/fail-cloning-into-non-empty later to maint).
 
-
  * With the base fix to 2.27 regresion, any new extensions in a v0
    repository would still be silently honored, which is not quite
    right.  Instead, complain and die loudly.
@@ -68,6 +84,13 @@ Fixes since v2.28
  * Fix to a regression introduced during 2.27 cycle.
    (merge cada7308ad en/fill-directory-exponential later to maint).
 
+ * Command line completion (in contrib/) update.
+   (merge 688b87c81b mp/complete-show-color-moved later to maint).
+
+ * All "mergy" operations that internally use the merge-recursive
+   machinery should honor the merge.renormalize configuration, but
+   many of them didn't.
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 84544f2ea3 sk/typofixes later to maint).
    (merge b17f411ab5 ar/help-guides-doc later to maint).
@@ -75,3 +98,9 @@ Fixes since v2.28
    (merge 861c4ce141 en/typofixes later to maint).
    (merge 60e47f6773 sg/ci-git-path-fix-with-pyenv later to maint).
    (merge e2bfa50ac3 jb/doc-packfile-name later to maint).
+   (merge 918d8ff780 es/worktree-cleanup later to maint).
+   (merge dc156bc31f ma/t1450-quotefix later to maint).
+   (merge 56e743426b en/merge-recursive-comment-fixes later to maint).
+   (merge 7d23ff818f rs/bisect-oid-to-hex-fix later to maint).
+   (merge de20baf2c9 ny/notes-doc-sample-update later to maint).
+   (merge f649aaaf82 so/rev-parser-errormessage-fix later to maint).
diff --git a/cmds-guide.txt b/cmds-guide.txt
new file mode 100644
index 000000000..28f5a10ff
--- /dev/null
+++ b/cmds-guide.txt
@@ -0,0 +1,60 @@
+linkgit:gitattributes[5]::
+	Defining attributes per path.
+
+linkgit:gitcli[7]::
+	Git command-line interface and conventions.
+
+linkgit:gitcore-tutorial[7]::
+	A Git core tutorial for developers.
+
+linkgit:gitcredentials[7]::
+	Providing usernames and passwords to Git.
+
+linkgit:gitcvs-migration[7]::
+	Git for CVS users.
+
+linkgit:gitdiffcore[7]::
+	Tweaking diff output.
+
+linkgit:giteveryday[7]::
+	A useful minimum set of commands for Everyday Git.
+
+linkgit:gitfaq[7]::
+	Frequently asked questions about using Git.
+
+linkgit:gitglossary[7]::
+	A Git Glossary.
+
+linkgit:githooks[5]::
+	Hooks used by Git.
+
+linkgit:gitignore[5]::
+	Specifies intentionally untracked files to ignore.
+
+linkgit:gitmodules[5]::
+	Defining submodule properties.
+
+linkgit:gitnamespaces[7]::
+	Git namespaces.
+
+linkgit:gitremote-helpers[7]::
+	Helper programs to interact with remote repositories.
+
+linkgit:gitrepository-layout[5]::
+	Git Repository Layout.
+
+linkgit:gitrevisions[7]::
+	Specifying revisions and ranges for Git.
+
+linkgit:gitsubmodules[7]::
+	Mounting one repository inside another.
+
+linkgit:gittutorial[7]::
+	A tutorial introduction to Git.
+
+linkgit:gittutorial-2[7]::
+	A tutorial introduction to Git: part two.
+
+linkgit:gitworkflows[7]::
+	An overview of recommended workflows with Git.
+
diff --git a/git-help.html b/git-help.html
index 427b5f01c..c6c20de7b 100644
--- a/git-help.html
+++ b/git-help.html
@@ -763,8 +763,8 @@ command and a list of the most commonly used Git commands are printed
 on the standard output.</p></div>

 <div class="paragraph"><p>If the option <code>--all</code> or <code>-a</code> is given, all available commands are

 printed on the standard output.</p></div>

-<div class="paragraph"><p>If the option <code>--guides</code> or <code>-g</code> is given, a list of the useful

-Git guides is also printed on the standard output.</p></div>

+<div class="paragraph"><p>If the option <code>--guides</code> or <code>-g</code> is given, a list of the

+Git concept guides is also printed on the standard output.</p></div>

 <div class="paragraph"><p>If a command, or a guide, is given, a manual page for that command or

 guide is brought up. The <em>man</em> program is used by default for this

 purpose, but this can be overridden by other options or configuration

@@ -823,7 +823,7 @@ former is internally converted into the latter.</p></div>
 </dt>

 <dd>

 <p>

-        Prints a list of useful guides on the standard output. This

+        Prints a list of the Git concept guides on the standard output. This

         option overrides any given command or guide name.

 </p>

 </dd>

@@ -1011,7 +1011,7 @@ See <a href="git-config.html">git-config(1)</a> for more information about this.
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-07-30 22:15:06 PDT

+ 2020-08-10 16:30:08 PDT

 </div>

 </div>

 </body>

diff --git a/git-help.txt b/git-help.txt
index 69c0c5c34..44fe8860b 100644
--- a/git-help.txt
+++ b/git-help.txt
@@ -21,8 +21,8 @@ on the standard output.
 If the option `--all` or `-a` is given, all available commands are
 printed on the standard output.
 
-If the option `--guides` or `-g` is given, a list of the useful
-Git guides is also printed on the standard output.
+If the option `--guides` or `-g` is given, a list of the
+Git concept guides is also printed on the standard output.
 
 If a command, or a guide, is given, a manual page for that command or
 guide is brought up. The 'man' program is used by default for this
@@ -58,7 +58,7 @@ OPTIONS
 
 -g::
 --guides::
-	Prints a list of useful guides on the standard output. This
+	Prints a list of the Git concept guides on the standard output. This
 	option overrides any given command or guide name.
 
 -i::
diff --git a/git-notes.html b/git-notes.html
index bdf611ae7..be28cc234 100644
--- a/git-notes.html
+++ b/git-notes.html
@@ -1110,7 +1110,7 @@ are taken from notes refs.  A notes ref is usually a branch which
 contains "files" whose paths are the object names for the objects

 they describe, with some directory separators included for performance

 reasons <span class="footnote"><br />[Permitted pathnames have the form

-<em>ab</em><code>/</code><em>cd</em><code>/</code><em>ef</em><code>/</code><em>&#8230;</em><code>/</code><em>abcdef&#8230;</em>: a sequence of directory

+<em>bf</em><code>/</code><em>fe</em><code>/</code><em>30</em><code>/</code><em>&#8230;</em><code>/</code><em>680d5a&#8230;</em>: a sequence of directory

 names of two hexadecimal digits each followed by a filename with the

 rest of the object ID.]<br /></span>.</p></div>

 <div class="paragraph"><p>Every notes change creates a new commit at the specified notes ref.

@@ -1344,7 +1344,7 @@ on the <code>notes.rewrite.&lt;command&gt;</code> and <code>notes.rewriteRef</co
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-03-10 08:03:13 PDT

+ 2020-08-10 16:30:08 PDT

 </div>

 </div>

 </body>

diff --git a/git-notes.txt b/git-notes.txt
index ced2e8280..0a4200674 100644
--- a/git-notes.txt
+++ b/git-notes.txt
@@ -223,7 +223,7 @@ are taken from notes refs.  A notes ref is usually a branch which
 contains "files" whose paths are the object names for the objects
 they describe, with some directory separators included for performance
 reasons footnote:[Permitted pathnames have the form
-'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence of directory
+'bf'`/`'fe'`/`'30'`/`'...'`/`'680d5a...': a sequence of directory
 names of two hexadecimal digits each followed by a filename with the
 rest of the object ID.].
 
diff --git a/git.html b/git.html
index b1d5ab1d8..9c1284e2b 100644
--- a/git.html
+++ b/git.html
@@ -2330,6 +2330,174 @@ users typically do not use them directly.</p></div>
 </div>

 </div>

 <div class="sect1">

+<h2 id="_guides">Guides</h2>

+<div class="sectionbody">

+<div class="paragraph"><p>The following documentation pages are guides about Git concepts.</p></div>

+<div class="dlist"><dl>

+<dt class="hdlist1">

+<a href="gitattributes.html">gitattributes(5)</a>

+</dt>

+<dd>

+<p>

+        Defining attributes per path.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gitcli.html">gitcli(7)</a>

+</dt>

+<dd>

+<p>

+        Git command-line interface and conventions.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>

+</dt>

+<dd>

+<p>

+        A Git core tutorial for developers.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gitcredentials.html">gitcredentials(7)</a>

+</dt>

+<dd>

+<p>

+        Providing usernames and passwords to Git.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gitcvs-migration.html">gitcvs-migration(7)</a>

+</dt>

+<dd>

+<p>

+        Git for CVS users.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gitdiffcore.html">gitdiffcore(7)</a>

+</dt>

+<dd>

+<p>

+        Tweaking diff output.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="giteveryday.html">giteveryday(7)</a>

+</dt>

+<dd>

+<p>

+        A useful minimum set of commands for Everyday Git.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gitfaq.html">gitfaq(7)</a>

+</dt>

+<dd>

+<p>

+        Frequently asked questions about using Git.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gitglossary.html">gitglossary(7)</a>

+</dt>

+<dd>

+<p>

+        A Git Glossary.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="githooks.html">githooks(5)</a>

+</dt>

+<dd>

+<p>

+        Hooks used by Git.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gitignore.html">gitignore(5)</a>

+</dt>

+<dd>

+<p>

+        Specifies intentionally untracked files to ignore.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gitmodules.html">gitmodules(5)</a>

+</dt>

+<dd>

+<p>

+        Defining submodule properties.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gitnamespaces.html">gitnamespaces(7)</a>

+</dt>

+<dd>

+<p>

+        Git namespaces.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gitremote-helpers.html">gitremote-helpers(7)</a>

+</dt>

+<dd>

+<p>

+        Helper programs to interact with remote repositories.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gitrepository-layout.html">gitrepository-layout(5)</a>

+</dt>

+<dd>

+<p>

+        Git Repository Layout.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gitrevisions.html">gitrevisions(7)</a>

+</dt>

+<dd>

+<p>

+        Specifying revisions and ranges for Git.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gitsubmodules.html">gitsubmodules(7)</a>

+</dt>

+<dd>

+<p>

+        Mounting one repository inside another.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gittutorial.html">gittutorial(7)</a>

+</dt>

+<dd>

+<p>

+        A tutorial introduction to Git.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gittutorial-2.html">gittutorial-2(7)</a>

+</dt>

+<dd>

+<p>

+        A tutorial introduction to Git: part two.

+</p>

+</dd>

+<dt class="hdlist1">

+<a href="gitworkflows.html">gitworkflows(7)</a>

+</dt>

+<dd>

+<p>

+        An overview of recommended workflows with Git.

+</p>

+</dd>

+</dl></div>

+</div>

+</div>

+<div class="sect1">

 <h2 id="_configuration_mechanism">Configuration Mechanism</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>Git uses a simple text format to store customizations that are per

@@ -3382,7 +3550,7 @@ the Git Security mailing list &lt;<a href="mailto:git-security@googlegroups.com"
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-06-22 16:55:13 PDT

+ 2020-08-10 16:30:08 PDT

 </div>

 </div>

 </body>

diff --git a/git.txt b/git.txt
index 3e5006519..81349a84e 100644
--- a/git.txt
+++ b/git.txt
@@ -304,6 +304,13 @@ users typically do not use them directly.
 
 include::cmds-purehelpers.txt[]
 
+Guides
+------
+
+The following documentation pages are guides about Git concepts.
+
+include::cmds-guide.txt[]
+
 
 Configuration Mechanism
 -----------------------
diff --git a/gitcredentials.html b/gitcredentials.html
index 7ef9b70dd..933fc172e 100644
--- a/gitcredentials.html
+++ b/gitcredentials.html
@@ -740,7 +740,7 @@ gitcredentials(7) Manual Page
 <h2>NAME</h2>

 <div class="sectionbody">

 <p>gitcredentials -

-   providing usernames and passwords to Git

+   Providing usernames and passwords to Git

 </p>

 </div>

 </div>

@@ -1106,7 +1106,7 @@ helpers will just ignore the new requests).</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-05-14 16:00:38 PDT

+ 2020-08-10 16:30:08 PDT

 </div>

 </div>

 </body>

diff --git a/gitcredentials.txt b/gitcredentials.txt
index 9e481aec8..758bf39ba 100644
--- a/gitcredentials.txt
+++ b/gitcredentials.txt
@@ -3,7 +3,7 @@ gitcredentials(7)
 
 NAME
 ----
-gitcredentials - providing usernames and passwords to Git
+gitcredentials - Providing usernames and passwords to Git
 
 SYNOPSIS
 --------
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index c99a3c1af..3372ec074 100644
--- a/howto/keep-canonical-history-correct.html
+++ b/howto/keep-canonical-history-correct.html
@@ -938,7 +938,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-01 15:33:48 PDT

+ 2020-08-10 16:31:03 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 07747a1a9..54a9bf793 100644
--- a/howto/maintain-git.html
+++ b/howto/maintain-git.html
@@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-01 15:33:48 PDT

+ 2020-08-10 16:31:04 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 56ce0a943..ef6d71481 100644
--- a/howto/new-command.html
+++ b/howto/new-command.html
@@ -863,7 +863,7 @@ letter [PATCH 0/n].
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-01 15:33:43 PDT

+ 2020-08-10 16:31:00 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 6cbf539ab..362f0eab2 100644
--- a/howto/rebase-from-internal-branch.html
+++ b/howto/rebase-from-internal-branch.html
@@ -895,7 +895,7 @@ the #1' commit.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-01 15:33:48 PDT

+ 2020-08-10 16:31:03 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index d1578d64c..25be4cae2 100644
--- a/howto/rebuild-from-update-hook.html
+++ b/howto/rebuild-from-update-hook.html
@@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-01 15:33:48 PDT

+ 2020-08-10 16:31:03 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index e41608324..a6683b53b 100644
--- a/howto/recover-corrupted-blob-object.html
+++ b/howto/recover-corrupted-blob-object.html
@@ -880,7 +880,7 @@ thing.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-01 15:33:47 PDT

+ 2020-08-10 16:31:03 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 0decb8e5c..9a35851d6 100644
--- a/howto/recover-corrupted-object-harder.html
+++ b/howto/recover-corrupted-object-harder.html
@@ -1189,7 +1189,7 @@ int main(int argc, char **argv)
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-01 15:33:47 PDT

+ 2020-08-10 16:31:03 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index c749f9061..1205bd1dc 100644
--- a/howto/revert-a-faulty-merge.html
+++ b/howto/revert-a-faulty-merge.html
@@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-01 15:33:46 PDT

+ 2020-08-10 16:31:02 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 8c42650f2..04f97feee 100644
--- a/howto/revert-branch-rebase.html
+++ b/howto/revert-branch-rebase.html
@@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-01 15:33:43 PDT

+ 2020-08-10 16:31:00 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index f0bef0bce..91eb6a712 100644
--- a/howto/separating-topic-branches.html
+++ b/howto/separating-topic-branches.html
@@ -841,7 +841,7 @@ o---o"master"</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-01 15:33:46 PDT

+ 2020-08-10 16:31:02 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 7fad0aee7..9296427e0 100644
--- a/howto/setup-git-server-over-http.html
+++ b/howto/setup-git-server-over-http.html
@@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-01 15:33:45 PDT

+ 2020-08-10 16:31:02 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 4794fa07f..57d7c22ea 100644
--- a/howto/update-hook-example.html
+++ b/howto/update-hook-example.html
@@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-01 15:33:45 PDT

+ 2020-08-10 16:31:01 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index cb42bcf9f..399ea9b68 100644
--- a/howto/use-git-daemon.html
+++ b/howto/use-git-daemon.html
@@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-01 15:33:44 PDT

+ 2020-08-10 16:31:01 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 65e636755..5ff87562e 100644
--- a/howto/using-merge-subtree.html
+++ b/howto/using-merge-subtree.html
@@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-01 15:33:44 PDT

+ 2020-08-10 16:31:00 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index 9669864d7..68321968b 100644
--- a/howto/using-signed-tag-in-pull-request.html
+++ b/howto/using-signed-tag-in-pull-request.html
@@ -952,7 +952,7 @@ as part of the merge commit.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-01 15:33:44 PDT

+ 2020-08-10 16:31:01 PDT

 </div>

 </div>

 </body>

diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html
index 1977736e6..57572718a 100644
--- a/technical/api-parse-options.html
+++ b/technical/api-parse-options.html
@@ -1162,12 +1162,12 @@ There are some macros to easily define options:</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

-<code>OPT_PASSTHRU_ARGV(short, long, &amp;argv_array_var, arg_str, description, flags)</code>

+<code>OPT_PASSTHRU_ARGV(short, long, &amp;strvec_var, arg_str, description, flags)</code>

 </dt>

 <dd>

 <p>

         Introduce an option where all instances of it on the command-line will

-        be reconstructed into an argv_array. This is useful when you need to

+        be reconstructed into a strvec. This is useful when you need to

         pass the command-line option, which can be specified multiple times,

         to another command.

 </p>

@@ -1290,7 +1290,7 @@ for real-world examples.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-03-10 08:03:13 PDT

+ 2020-08-10 16:30:08 PDT

 </div>

 </div>

 </body>

diff --git a/technical/api-parse-options.txt b/technical/api-parse-options.txt
index 2e2e7c10c..5a60bbfa7 100644
--- a/technical/api-parse-options.txt
+++ b/technical/api-parse-options.txt
@@ -232,9 +232,9 @@ There are some macros to easily define options:
 	will be overwritten, so this should only be used for options where
 	the last one specified on the command line wins.
 
-`OPT_PASSTHRU_ARGV(short, long, &argv_array_var, arg_str, description, flags)`::
+`OPT_PASSTHRU_ARGV(short, long, &strvec_var, arg_str, description, flags)`::
 	Introduce an option where all instances of it on the command-line will
-	be reconstructed into an argv_array. This is useful when you need to
+	be reconstructed into a strvec. This is useful when you need to
 	pass the command-line option, which can be specified multiple times,
 	to another command.