From 75b46443cdc0929bea87cb062b101b3deaafc584 Mon Sep 17 00:00:00 2001 From: William Turrell Date: Sun, 14 May 2017 14:11:46 +0100 Subject: [PATCH 1/2] Minor text changes to First-time Git setup - Text referred to "either" editor when several were listed - Make the "Warning" less vague/confusing (I interpret it as being about what could happen if Git can't find an editor) --- book/01-introduction/sections/first-time-setup.asc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/book/01-introduction/sections/first-time-setup.asc b/book/01-introduction/sections/first-time-setup.asc index be27d8fa1..1b77c3388 100644 --- a/book/01-introduction/sections/first-time-setup.asc +++ b/book/01-introduction/sections/first-time-setup.asc @@ -66,13 +66,12 @@ $ git config --global core.editor "'C:/Program Files (x86)/Notepad++/notepad++.e [NOTE] ==== Vim, Emacs and Notepad++ are popular text editors often used by developers on Unix based systems like Linux and OS X or a Windows system. -If you are not familiar with either of these editors, you may need to search for specific instructions for how to set up your favorite editor with Git. +If you are not familiar with these editors, you may need to search for specific instructions for how to set up your favorite editor with Git. ==== [WARNING] ==== -You may find, if you don't setup an editor like this, you will likely get into a really confusing state when they are launched. -Such example on a Windows system may include a prematurely terminated Git operation during a Git initiated edit. +You may find, if you don't setup your editor like this, you get into a really confusing state when Git attempts to launch it. An example on a Windows system may include a prematurely terminated Git operation during a Git initiated edit. ==== ==== Checking Your Settings From 41d6cbef15a8aebca601a7d2a8bb095665e307a6 Mon Sep 17 00:00:00 2001 From: William Turrell Date: Mon, 15 May 2017 09:40:17 +0100 Subject: [PATCH 2/2] Reformat Warning text as requested in PR Add a line-break so sentences are on separate lines. --- book/01-introduction/sections/first-time-setup.asc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/book/01-introduction/sections/first-time-setup.asc b/book/01-introduction/sections/first-time-setup.asc index 1b77c3388..48bd81b05 100644 --- a/book/01-introduction/sections/first-time-setup.asc +++ b/book/01-introduction/sections/first-time-setup.asc @@ -71,7 +71,8 @@ If you are not familiar with these editors, you may need to search for specific [WARNING] ==== -You may find, if you don't setup your editor like this, you get into a really confusing state when Git attempts to launch it. An example on a Windows system may include a prematurely terminated Git operation during a Git initiated edit. +You may find, if you don't setup your editor like this, you get into a really confusing state when Git attempts to launch it. +An example on a Windows system may include a prematurely terminated Git operation during a Git initiated edit. ==== ==== Checking Your Settings