Merge branch 'ls/travis-enable-httpd-tests'

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index dcc68b9429f3dcccd8a68a11f8a328d93d9ecdcc..9eab1f5fa42859651c6a0928ae0434799d5ce30e 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -52,7 +52,7 @@ ifndef::git-pull[]
 
 -p::
 --prune::
-       After fetching, remove any remote-tracking references that no
+       Before fetching, remove any remote-tracking references that no
        longer exist on the remote.  Tags are not subject to pruning
        if they are fetched only because of the default tag
        auto-following or due to a --tags option.  However, if tags