advice: make all entries stylistically consistent

In general, rewrite entries to the following form:

1. Clause or sentence describing when the advice is shown
2. Optional “to <verb>” clause which says what the advice is
   about (e.g. for resetNoRefresh: tell the user that they can use
   `--no-refresh`)

Concretely:

1. Use “shown” instead of “advice shown”
   • “advice” is implied and a bit repetitive
2. Use “when” instead of “if”
3. Lead with “Shown when” and end the entry with the effect it has,
   where applicable
4. Use “the user” instead of “a user” or “you”
5. implicitIdentity: rewrite description in order to lead with *when*
   the advice is shown (see point (3))
6. Prefer the present tense (with the exception of pushNonFFMatching)
7. waitingForEditor: give example of relevance in this new context
8. pushUpdateRejected: exception to the above principles

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index c7ea70f2e2e9d281912567bfb0408200e40fe11b..72cd9f9e9d96fb0df8410fc6ea943ffaa90133a7 100644 (file)
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -6,23 +6,23 @@ advice.*::
 +
 --
        addEmbeddedRepo::
-               Advice on what to do when you've accidentally added one
+               Shown when the user accidentally adds one
                git repo inside of another.
        addEmptyPathspec::
-               Advice shown if a user runs the add command without providing
+               Shown when the user runs the add command without providing
                the pathspec parameter.
        addIgnoredFile::
-               Advice shown if a user attempts to add an ignored file to
+               Shown when the user attempts to add an ignored file to
                the index.
        amWorkDir::
-               Advice that shows the location of the patch file when
-               linkgit:git-am[1] fails to apply it.
+               Shown when linkgit:git-am[1] fails to apply a patch
+               file, to tell the user the location of the file.
        ambiguousFetchRefspec::
-               Advice shown when a fetch refspec for multiple remotes maps to
+               Shown when a fetch refspec for multiple remotes maps to
                the same remote-tracking branch namespace and causes branch
                tracking set-up to fail.
        checkoutAmbiguousRemoteBranchName::
-               Advice shown when the argument to
+               Shown when the argument to
                linkgit:git-checkout[1] and linkgit:git-switch[1]
                ambiguously resolves to a
                remote tracking branch on more than one remote in
@@ -33,31 +33,31 @@ advice.*::
                to be used by default in some situations where this
                advice would be printed.
        commitBeforeMerge::
-               Advice shown when linkgit:git-merge[1] refuses to
+               Shown when linkgit:git-merge[1] refuses to
                merge to avoid overwriting local changes.
        detachedHead::
-               Advice shown when you used
+               Shown when the user uses
                linkgit:git-switch[1] or linkgit:git-checkout[1]
-               to move to the detached HEAD state, to instruct how to
-               create a local branch after the fact.
+               to move to the detached HEAD state, to tell the user how
+               to create a local branch after the fact.
        diverging::
-               Advice shown when a fast-forward is not possible.
+               Shown when a fast-forward is not possible.
        fetchShowForcedUpdates::
-               Advice shown when linkgit:git-fetch[1] takes a long time
+               Shown when linkgit:git-fetch[1] takes a long time
                to calculate forced updates after ref updates, or to warn
                that the check is disabled.
        forceDeleteBranch::
-               Advice shown when a user tries to delete a not fully merged
+               Shown when the user tries to delete a not fully merged
                branch without the force option set.
        ignoredHook::
-               Advice shown if a hook is ignored because the hook is not
+               Shown when a hook is ignored because the hook is not
                set as executable.
        implicitIdentity::
-               Advice on how to set your identity configuration when
-               your information is guessed from the system username and
-               domain name.
+               Shown when the user's information is guessed from the
+               system username and domain name, to tell the user how to
+               set their identity configuration.
        nestedTag::
-               Advice shown if a user attempts to recursively tag a tag object.
+               Shown when a user attempts to recursively tag a tag object.
        pushAlreadyExists::
                Shown when linkgit:git-push[1] rejects an update that
                does not qualify for fast-forwarding (e.g., a tag.)
@@ -71,12 +71,12 @@ advice.*::
                object that is not a commit-ish, or make the remote
                ref point at an object that is not a commit-ish.
        pushNonFFCurrent::
-               Advice shown when linkgit:git-push[1] fails due to a
+               Shown when linkgit:git-push[1] fails due to a
                non-fast-forward update to the current branch.
        pushNonFFMatching::
-               Advice shown when you ran linkgit:git-push[1] and pushed
-               'matching refs' explicitly (i.e. you used ':', or
-               specified a refspec that isn't your current branch) and
+               Shown when the user ran linkgit:git-push[1] and pushed
+               'matching refs' explicitly (i.e. used ':', or
+               specified a refspec that isn't the current branch) and
                it resulted in a non-fast-forward error.
        pushRefNeedsUpdate::
                Shown when linkgit:git-push[1] rejects a forced update of
@@ -95,17 +95,17 @@ advice.*::
                'pushFetchFirst', 'pushNeedsForce', and 'pushRefNeedsUpdate'
                simultaneously.
        resetNoRefresh::
-               Advice to consider using the `--no-refresh` option to
-               linkgit:git-reset[1] when the command takes more than 2 seconds
-               to refresh the index after reset.
+               Shown when linkgit:git-reset[1] takes more than 2
+               seconds to refresh the index after reset, to tell the user
+               that they can use the `--no-refresh` option.
        resolveConflict::
-               Advice shown by various commands when conflicts
+               Shown by various commands when conflicts
                prevent the operation from being performed.
        rmHints::
-               In case of failure in the output of linkgit:git-rm[1],
-               show directions on how to proceed from the current state.
+               Shown on failure in the output of linkgit:git-rm[1], to
+               give directions on how to proceed from the current state.
        sequencerInUse::
-               Advice shown when a sequencer command is already in progress.
+               Shown when a sequencer command is already in progress.
        skippedCherryPicks::
                Shown when linkgit:git-rebase[1] skips a commit that has already
                been cherry-picked onto the upstream branch.
@@ -123,27 +123,27 @@ advice.*::
                by linkgit:git-switch[1] or
                linkgit:git-checkout[1] when switching branches.
        statusUoption::
-               Advise to consider using the `-u` option to linkgit:git-status[1]
-               when the command takes more than 2 seconds to enumerate untracked
-               files.
+               Shown when linkgit:git-status[1] takes more than 2
+               seconds to enumerate untracked files, to tell the user that
+               they can use the `-u` option.
        submoduleAlternateErrorStrategyDie::
-               Advice shown when a submodule.alternateErrorStrategy option
+               Shown when a submodule.alternateErrorStrategy option
                configured to "die" causes a fatal error.
        submodulesNotUpdated::
-               Advice shown when a user runs a submodule command that fails
+               Shown when a user runs a submodule command that fails
                because `git submodule update --init` was not run.
        suggestDetachingHead::
-               Advice shown when linkgit:git-switch[1] refuses to detach HEAD
+               Shown when linkgit:git-switch[1] refuses to detach HEAD
                without the explicit `--detach` option.
        updateSparsePath::
-               Advice shown when either linkgit:git-add[1] or linkgit:git-rm[1]
+               Shown when either linkgit:git-add[1] or linkgit:git-rm[1]
                is asked to update index entries outside the current sparse
                checkout.
        waitingForEditor::
-               Print a message to the terminal whenever Git is waiting for
-               editor input from the user.
+               Shown when Git is waiting for editor input. Relevant
+               when e.g. the editor is not launched inside the terminal.
        worktreeAddOrphan::
-               Advice shown when a user tries to create a worktree from an
-               invalid reference, to instruct how to create a new unborn
+               Shown when the user tries to create a worktree from an
+               invalid reference, to tell the user how to create a new unborn
                branch instead.
 --