doc: avoid colloquialism

Trott · evanlucas · commit af0067cc5ea9 · 2017-05-02T12:46:12.000-05:00
I witnessed an English-as-a-second-language speaker puzzle over the word "borked" in our documentation today. Reword to avoid colloquialisms. It's more precise and clear this way anyway. Also reformat `Optional:` to be consistent with how it appears elsewhere in the doc. PR-URL: #12417 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
@@ -345,7 +345,7 @@ Additionally:
 
 ### Technical HOWTO
 
-_Optional:_ ensure that you are not in a borked `am`/`rebase` state
+Clear any `am`/`rebase` that may already be underway.
 
 ```text
 $ git am --abort
