From 6caf836e3390faefaad8257b9cec2eb97bdbfb41 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Mon, 3 Apr 2017 10:23:37 -0700
Subject: Global fix

---
 docs/misc/patch.md | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'docs/misc/patch.md')

diff --git a/docs/misc/patch.md b/docs/misc/patch.md
index a8dffc92..73d4979a 100644
--- a/docs/misc/patch.md
+++ b/docs/misc/patch.md
@@ -15,7 +15,8 @@ To apply a patch to a single file, do that in it's directory:
 
 
 Assuming that the patch is distributed in unified format identifying the
-file the patch should be applied to, the above will work. Otherwise:\
+file the patch should be applied to, the above will work. Otherwise:
+
     $ patch foo.txt < bar.patch
 
 You can apply a patch to an entire directory, but note the "p level".
@@ -24,7 +25,8 @@ intend to patch, identified by path names that might be different when
 the files ane located on your own computer instead of on the computer
 where the patch was created. 'p' level instructs the 'patch' utility
 to ignore parts of the path name to identify the files correctly.
-Usually a p level of 1 will work, so you would use:\
+Usually a p level of 1 will work, so you would use:
+
     $ patch -p1 < baz.patch
 
 Change to the top level directory before running this. If a patch level
@@ -32,14 +34,16 @@ of 1 cannot identify the files to patch, then inspect the patch file for
 file names. For example:\
 **/home/user/do/not/panic/yet.c**
 
-and you are working in a directory that contains panic/yet.c, use:\
+and you are working in a directory that contains panic/yet.c, use:
+
     $ patch -p5 < baz.patch
 
 You usually count one up for each path separator (forward slash) removed
 from the beginning of the path, until you are left with a path that
 exists in the current working directory. The count is the p level.
 
-Removing a patch using the -R flag\
+Removing a patch using the -R flag
+
     $ patch -p5 -R < baz.patch
 
 [Back to top of page.](#pagetop)
@@ -49,13 +53,16 @@ Removing a patch using the -R flag\
 Create a patch with diff
 ========================
 
-Diff can create a patch for a single file:\
+Diff can create a patch for a single file:
+
     $ diff -u original.c new.c > original.patch
 
-For diff'ing a source tree:\
+For diff'ing a source tree:
+
     $ cp -R original new
 
-Do whatever you want in new/ and then diff it:\
+Do whatever you want in new/ and then diff it:
+
     $ diff -rupN original/ new/ > original.patch
 
 [Back to top of page.](#pagetop)
@@ -69,10 +76,12 @@ git is something special.
 
 Note: this won't show new files created.
 
-Just make whatever changes you want to a git clone and then:\
+Just make whatever changes you want to a git clone and then:
+
     $ git diff > patch.git
 
-Note the git revision that you did this with:\
+Note the git revision that you did this with:
+
     $ git log
 
 Alternatively (better yet), commit your changes and then use:
@@ -89,10 +98,12 @@ git apply
 it really is.
 
 Now to apply that patch in the future, just git clone it again and do
-with the git revision you found from above:\
+with the git revision you found from above:
+
     $ git reset --hard REVISIONNUMBER
 
-Now put patch.git in the git clone directory and do:\
+Now put patch.git in the git clone directory and do:
+
     $ git apply patch.git
 
 If you use a patch from git format-patch, then use **git am patch.git**
-- 
cgit v1.2.3-70-g09d2