From 40ef9f0c864ab080daf0e1b0fc2093dad6cc6962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20S=C4=99d=C5=82ak-Jakubowski?= Date: Wed, 21 Mar 2018 10:08:47 +0100 Subject: [PATCH 1/2] Update GitHub Desktop information --- book/01-introduction/sections/installing.asc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/01-introduction/sections/installing.asc b/book/01-introduction/sections/installing.asc index 920ba0623..00fa3b2d1 100644 --- a/book/01-introduction/sections/installing.asc +++ b/book/01-introduction/sections/installing.asc @@ -65,11 +65,11 @@ Note that this is a project called Git for Windows, which is separate from Git i To get an automated installation you can use the https://chocolatey.org/packages/git[Git Chocolatey package]. Note that the Chocolatey package is community maintained. -Another easy way to get Git installed is by installing GitHub for Windows. +Another easy way to get Git installed is by installing GitHub Desktop. The installer includes a command line version of Git as well as the GUI. It also works well with Powershell, and sets up solid credential caching and sane CRLF settings.(((Powershell)))(((CRLF)))(((credential caching))) We'll learn more about those things a little later, but suffice it to say they're things you want. -You can download this from the GitHub for Windows website, at http://windows.github.com[]. +You can download this from the https://desktop.github.com/[GitHub Desktop website]. ==== Installing from Source From d4576a33b85386743d6dde23ae84bb20c291c78a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20S=C4=99d=C5=82ak-Jakubowski?= Date: Wed, 21 Mar 2018 10:12:43 +0100 Subject: [PATCH 2/2] Update installing on Linux Change `apt-get` to `apt`. Minor language fixes. --- book/01-introduction/sections/installing.asc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/book/01-introduction/sections/installing.asc b/book/01-introduction/sections/installing.asc index 00fa3b2d1..a176f8bd7 100644 --- a/book/01-introduction/sections/installing.asc +++ b/book/01-introduction/sections/installing.asc @@ -14,22 +14,22 @@ Since Git is quite excellent at preserving backwards compatibility, any version ==== Installing on Linux (((Linux, installing))) -If you want to install the basic Git tools on Linux via a binary installer, you can generally do so through the basic package-management tool that comes with your distribution. -If you're on Fedora for example (or any closely-related RPM-based distro such as RHEL or CentOS), you can use `dnf`: +If you want to install the basic Git tools on Linux via a binary installer, you can generally do so through the package management tool that comes with your distribution. +If you're on Fedora (or any closely-related RPM-based distribution, such as RHEL or CentOS), you can use `dnf`: [source,console] ---- $ sudo dnf install git-all ---- -If you're on a Debian-based distribution like Ubuntu, try `apt-get`: +If you're on a Debian-based distribution, such as Ubuntu, try `apt`: [source,console] ---- -$ sudo apt-get install git-all +$ sudo apt install git-all ---- -For more options, there are instructions for installing on several different Unix flavors on the Git website, at http://git-scm.com/download/linux[]. +For more options, there are instructions for installing on several different Unix distributions on the Git website, at http://git-scm.com/download/linux[]. ==== Installing on Mac