git-worktree.txt: fix typo "to"/"two", and add comma

diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index dddb1675b83a7edd29cf3661315b0b219613b992..88ba42b4550a1ac7b579c48445f5933aaf13a20a 100644 (file)
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -520,15 +520,13 @@ git-p4.pathEncoding::
 git-p4.largeFileSystem::
        Specify the system that is used for large (binary) files. Please note
        that large file systems do not support the 'git p4 submit' command.
-       Only Git LFS [1] is implemented right now. Download
-       and install the Git LFS command line extension to use this option
-       and configure it like this:
+       Only Git LFS is implemented right now (see https://git-lfs.github.com/
+       for more information). Download and install the Git LFS command line
+       extension to use this option and configure it like this:
 +
 -------------
 git config       git-p4.largeFileSystem GitLFS
 -------------
-+
-       [1] https://git-lfs.github.com/
 
 git-p4.largeFileExtensions::
        All files matching a file extension in the list will be processed
@@ -553,6 +551,17 @@ git-p4.keepEmptyCommits::
        A changelist that contains only excluded files will be imported
        as an empty commit if this boolean option is set to true.
 
+git-p4.mapUser::
+       Map a P4 user to a name and email address in Git. Use a string
+       with the following format to create a mapping:
++
+-------------
+git config --add git-p4.mapUser "p4user = First Last <mail@address.com>"
+-------------
++
+A mapping will override any user information from P4. Mappings for
+multiple P4 user can be defined.
+
 Submit variables
 ~~~~~~~~~~~~~~~~
 git-p4.detectRenames::