git p4: fix-up "import/export of labels to/from p4"

diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 612d51d4e76537724442a492fe4232540b18b6d0..01cc97bb110a508f9cbcd6f286c806721fa1f1a5 100644 (file)
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -267,7 +267,7 @@ These options can be used to modify 'git p4 submit' behavior.
        Re-author p4 changes before submitting to p4.  This option
        requires p4 admin privileges.
 
---export-labels:
+--export-labels::
        Export tags from git as p4 labels. Tags found in git are applied
        to the perforce working directory.
 
@@ -442,6 +442,11 @@ git-p4.branchList::
        by a colon (:).  This example declares that both branchA and
        branchB were created from main:
 
+-------------
+git config       git-p4.branchList main:branchA
+git config --add git-p4.branchList main:branchB
+-------------
+
 git-p4.ignoredP4Labels::
        List of p4 labels to ignore. This is built automatically as
        unimportable labels are discovered.
@@ -449,14 +454,9 @@ git-p4.ignoredP4Labels::
 git-p4.importLabels::
        Import p4 labels into git, as per --import-labels.
 
-git-p4.validLabelRegexp::
+git-p4.labelImportRegexp::
        Only p4 labels matching this regular expression will be imported. The
-       default value is '[A-Z0-9_\-.]+$'.
-
--------------
-git config       git-p4.branchList main:branchA
-git config --add git-p4.branchList main:branchB
--------------
+       default value is '[a-zA-Z0-9_\-.]+$'.
 
 git-p4.useClientSpec::
        Specify that the p4 client spec should be used to identify p4
@@ -515,9 +515,9 @@ git-p4.attemptRCSCleanup:
 git-p4.exportLabels::
        Export git tags to p4 labels, as per --export-labels.
 
-git-p4.validLabelRegexp::
+git-p4.labelExportRegexp::
        Only p4 labels matching this regular expression will be exported. The
-       default value is '[A-Z0-9_\-.]+$'.
+       default value is '[a-zA-Z0-9_\-.]+$'.
 
 IMPLEMENTATION DETAILS
 ----------------------