# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1480206458 28800
# Node ID 513bcd0a1f905a32a2543dd3b17f0d2e463dd6f8
# Parent  7bc4df0225d1cd18970992a29721db8ddba4a76a# Parent  d4c09aa41e80ad7d068c51d6a89032f5b6aa25e1
Merge changes.

diff -r 7bc4df0225d1 -r 513bcd0a1f90 doc/gutentags.txt
--- a/doc/gutentags.txt	Thu Sep 22 22:14:17 2016 -0700
+++ b/doc/gutentags.txt	Sat Nov 26 16:27:38 2016 -0800
@@ -108,7 +108,7 @@
 The following commands are only available in buffers that have been found to
 belong to a project that should be managed by Gutentags. See
 |gutentags_project_root| for how Gutentags figures out the project a file
-belongs to. When not project is found (i.e. the file is not under any of the
+belongs to. When no project is found (i.e. the file is not under any of the
 known project markers), Gutentags is disabled for that buffer, and the
 following commands and remarks don't apply.