Documentation/git-worktree: wordsmith worktree-related manpages

[es: reword .git/worktrees and .git/worktrees/<id>/locked descriptions]

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index b56c2eb2a800c7e36e188d1e5ebe0ed2a0c8933d..0f70cf6141baff2b0694ab67e3c4c7a9fd13f25f 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1231,10 +1231,11 @@ gc.pruneexpire::
 
 gc.pruneworktreesexpire::
        When 'git gc' is run, it will call
 
 gc.pruneworktreesexpire::
        When 'git gc' is run, it will call

+       When 'git gc' is run, it calls

        'git worktree prune --expire 3.months.ago'.
        'git worktree prune --expire 3.months.ago'.

-       Override the grace period with this config variable. The value
-       "now" may be used to disable the grace period and prune
-       $GIT_DIR/worktrees immediately.
+       This config variable can be used to set a different grace
+       period. The value "now" may be used to disable the grace
+       period and prune $GIT_DIR/worktrees immediately.

 
 gc.reflogexpire::
 gc.<pattern>.reflogexpire::
 
 gc.reflogexpire::
 gc.<pattern>.reflogexpire::

diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index b53979c819df08ab6dde4147f431fedac10b84ea..577ee844e0ed09e9f0339de55cf14a29ca7bdab2 100644 (file)
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -251,25 +251,25 @@ modules::
        Contains the git-repositories of the submodules.
 
 worktrees::
        Contains the git-repositories of the submodules.
 
 worktrees::

-       Contains working tree specific information of linked
+       Contains administrative data for linked

        working trees. Each subdirectory contains the working tree-related
        part of a linked working tree. This directory is ignored if
        working trees. Each subdirectory contains the working tree-related
        part of a linked working tree. This directory is ignored if

-       $GIT_COMMON_DIR is set and "$GIT_COMMON_DIR/worktrees" will be
-       used instead.
+       $GIT_COMMON_DIR is set, in which case
+       "$GIT_COMMON_DIR/worktrees" will be used instead.

 
 worktrees/<id>/gitdir::
        A text file containing the absolute path back to the .git file
        that points to here. This is used to check if the linked
        repository has been manually removed and there is no need to
 
 worktrees/<id>/gitdir::
        A text file containing the absolute path back to the .git file
        that points to here. This is used to check if the linked
        repository has been manually removed and there is no need to

-       keep this directory any more. mtime of this file should be
+       keep this directory any more. The mtime of this file should be

        updated every time the linked repository is accessed.
 
 worktrees/<id>/locked::
        If this file exists, the linked working tree may be on a
        updated every time the linked repository is accessed.
 
 worktrees/<id>/locked::
        If this file exists, the linked working tree may be on a

-       portable device and not available. It does not mean that the
-       linked working tree is gone and `worktrees/<id>` could be
-       removed. The file's content contains a reason string on why
-       the repository is locked.
+       portable device and not available. The presence of this file
+       prevents `worktrees/<id>` from being pruned either automatically
+       or manually by `git worktree prune`. The file may contain a string
+       explaining why the repository is locked.

 
 worktrees/<id>/link::
        If this file exists, it is a hard link to the linked .git
 
 worktrees/<id>/link::
        If this file exists, it is a hard link to the linked .git