summaryrefslogtreecommitdiff
path: root/Documentation/applying-patches.txt
diff options
context:
space:
mode:
authorOscar Utbult <oscar@oscr.io>2014-09-25 17:41:35 +0400
committerJiri Kosina <jkosina@suse.cz>2014-09-26 13:10:11 +0400
commit2d69049ab7028ac656a8545a068cc10a663a9805 (patch)
treee3239dfeb1e261637d74dae82b3fcbb52b12785b /Documentation/applying-patches.txt
parent00703e0b79906969f3ac27ab9fab646afc671fb4 (diff)
downloadlinux-2d69049ab7028ac656a8545a068cc10a663a9805.tar.xz
Documentation: change "&" to "and" in Documentation/applying-patches.txt
http://english.stackexchange.com/questions/3127/when-to-use-instead-of-and Signed-off-by: Oscar Utbult <oscar@oscr.io> Acked-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation/applying-patches.txt')
-rw-r--r--Documentation/applying-patches.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/applying-patches.txt b/Documentation/applying-patches.txt
index a083ba35d1ad..77df55b0225a 100644
--- a/Documentation/applying-patches.txt
+++ b/Documentation/applying-patches.txt
@@ -94,7 +94,7 @@ Common errors when patching
---
When patch applies a patch file it attempts to verify the sanity of the
file in different ways.
-Checking that the file looks like a valid patch file & checking the code
+Checking that the file looks like a valid patch file and checking the code
around the bits being modified matches the context provided in the patch are
just two of the basic sanity checks patch does.