Merge branch 'ep/fix-test-lib-functions-report' into maint

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 0cebc4f6927211ffbc013de9368f03f480dba65d..a09969ba086609af5d35bbb3c5f30dfea5db00b6 100644 (file)
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -4,13 +4,13 @@
 
 --root::
        Do not treat root commits as boundaries.  This can also be
-       controlled via the `blame.showroot` config option.
+       controlled via the `blame.showRoot` config option.
 
 --show-stats::
        Include additional statistics at the end of blame output.
 
 -L <start>,<end>::
--L :<regex>::
+-L :<funcname>::
        Annotate only the given line range. May be specified multiple times.
        Overlapping ranges are allowed.
 +