On 09/25/14 06:41, oscar@xxxxxxx wrote: > From: Oscar Utbult <oscar@xxxxxxx> > > http://english.stackexchange.com/questions/3127/when-to-use-instead-of-and > > Signed-off-by: Oscar Utbult <oscar@xxxxxxx> Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Jiri, for trivial, please. > --- > Documentation/applying-patches.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/applying-patches.txt b/Documentation/applying-patches.txt > index a083ba3..77df55b 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. > > -- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
