progit · iko206 · Dec 8, 2014 · Dec 8, 2014 · Dec 8, 2014 · Dec 9, 2014
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,4 @@ progit.pdfmarks
 progit.epub
 progit-kf8.epub
 progit.mobi
-images/
+/images/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,37 @@
+# Contributing to Pro Git (2nd Edition)
+
+
+## Licensing
+
+By opening a pull request to this repository, you agree to provide your work under the [project license](LICENSE.asc).
+Also, you agree to grant such license of your work as is required for the purposes of future print editions to @ben and @schacon.
+Should your changes appear in a printed edition, you'll be included in the [contributors list](book/contributors.asc).
+
+## Small Corrections
+
+Errata and basic clarifications will be accepted if we agree that they improve the content. You can also open an issue so we can figure out how or if it needs to be addressed.
+
+If you've never done this before, the [flow guide](https://guides.github.com/introduction/flow/) might be useful.
+
+## Large Rewrites
+
+Open an issue for discussion before you start. These changes tend to be very subjective, often only clarifying things for some small percentage of people and it's rarely worth the time to accept them. Professional copy editors have already reviewed this content multiple times so while you may have somewhat better taste and grammar than we do it's unlikely that your prose is going to be *so* much better that it's worth changing vast swaths of text.
+
+## Figures
+
+The images in this book were generated using [Sketch 3](http://bohemiancoding.com/sketch/), with the [included sketchbook file](diagram-source/progit.sketch).
+
+To add a figure:
+
+1. Add a page to the sketchbook. Try to use the included symbols wherever possible.
+1. Add a "slice" to your page. Give it a name that matches the destination PNG filename, relative from the root of the source directory.
+1. Make sure your slice is set to export at "800w".
+
+
+## Translations
+
+Translations to other languages are highly encouraged but handled a little differently than the first edition. We now keep each translation in a separate repository and automatically build the output files through Atlas. This was something that was really difficult in the last edition.
+
+Since each translation is a different repository, we can also have different maintainers for each project. The Pro Git team simply pulls them in and builds them for the translation teams. To get automatic builds, translations repositories will have to be under the [`progit` organization on GitHub](https://github.com/progit).
+
+You can find out information on all the current translations and information on how to start your own at http://progit.org/translations.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -23,7 +23,7 @@ GEM
       rubyzip (>= 1.1.1)
     hashery (2.1.1)
     json (1.8.1)
-    kindlegen (2.9.3)
+    kindlegen (2.9.4)
     mini_portile (0.6.0)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)

diff --git a/LICENSE.asc b/LICENSE.asc
@@ -1 +1 @@
-This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
+This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
diff --git a/README.asc b/README.asc
@@ -6,27 +6,24 @@ You can find this book online at: http://git-scm.com/book
 
 Like the first edition, the second edition of Pro Git is open source under a Creative Commons license.
 
-A couple of things have changed since open sourcing the first edition. For one, we've moved from Markdown to the amazing Asciidoc format for the text of the book. We've also moved to using O'Reilly's https://atlas.oreilly.com[Atlas platform] for generating continuous builds of the book so all major formats are always available in every language.
+A couple of things have changed since open sourcing the first edition.
+For one, we've moved from Markdown to the amazing Asciidoc format for the text of the book.
+We've also moved to using O'Reilly's https://atlas.oreilly.com[Atlas platform] for generating continuous builds of the book so all major formats are always available in every language.
 
-We've also moved to keeping the translations in seperate repositories rather than subdirectories of the English repository. See the Translations section for more information.
-
-== Contributing
-
-To contribute errata or new content to this repository, you will need to open up a Pull Request on GitHub. It is generally a good idea before doing anything major to open an issue and make sure your work will get accepted.
-
-Errata and basic clarifications will be accepted if we agree that they improve the content. You can also open an issue so we can figure out how or if it needs to be addressed.
-
-Please refrain from making sweeping copy edit changes as they tend to not get accepted and we don't want you wasting your time. These changes tend to be very subjective, often only clarifying things for some small percentage of people and it's rarely worth the time to accept them. Professional copy editors have already reviewed this content multiple times so while you may have somewhat better taste and grammar than we do it's unlikely that your prose is going to be *so* much better that it's worth changing vast swaths of text.
+We've also moved to keeping the translations in separate repositories rather than subdirectories of the English repository.
+See link:CONTRIBUTING.md[the Contributing document] for more information.
 
 == How To Generate the Book
 
 There are two ways to generate e-book content from this source code.
 
-The easiest way is simply to let us do it. A robot is standing by to look for new work on the main branch and automatically build it for everyone.
+The easiest way is simply to let us do it.
+A robot is standing by to look for new work on the main branch and automatically build it for everyone.
 
 You can find the current builds on http://git-scm.com/book[] and more information about the builds available at https://progit.org[].
 
-The other way to generate e-book files is to do so manually with Asciidoctor. If you run the following you _may_ actually get HTML, Epub, Mobi and PDF output files:
+The other way to generate e-book files is to do so manually with Asciidoctor.
+If you run the following you _may_ actually get HTML, Epub, Mobi and PDF output files:
 
 ----
 $ bundle install
@@ -43,20 +40,6 @@ Converting to PDF...
 
 This uses the `asciidoctor`, `asciidoctor-pdf` and `asciidoctor-epub` projects.
 
-== Translations
-
-Translations to other languages are highly encouraged but handled a little differently than the first edition. We now keep each translation in a seperate repository and automatically build the output files through Atlas. This was something that was really difficult in the last edition.
-
-Since each translation is a different repository, we can also have different maintainers for each project. The Pro Git team simply pulls them in and builds them for the translation teams. To get automatic builds, translations repositories will have to be under the https://github.com/progit[progit organization on GitHub].
-
-You can find out information on all the current translations and information on how to start your own at: http://progit.org/translations[].
-
-== Figures
-
-The images in this book were generated using http://bohemiancoding.com/sketch/[Sketch 3], with the link:diagram-source/progit.sketch[included sketchbook file].
-
-To add a figure:
+== Contributing
 
-. Add a page to the sketchbook. Try to use the included symbols wherever possible.
-. Add a ``slice'' to your page. Give it a name that matches the destination PNG filename, relative from the root of the source directory.
-. Make sure your slice is set to export at 3x size.
+If you'd like to help out by making a change or contributing a translation, take a look at the link:CONTRIBUTING.md[contributor's guide].
diff --git a/Rakefile b/Rakefile
@@ -26,3 +26,5 @@ namespace :book do
     puts " -- PDF  output at progit.pdf"
   end
 end
+
+task :default => "book:build"
diff --git a/TRANSLATION_NOTES.asc b/TRANSLATION_NOTES.asc
@@ -1,9 +1,11 @@
 == Translation Notes
 
-After forking this repository to translate the work, this file is where the notes for coordinating the translation work would go. Things like standardizing on words and expressions so that the work is consistent or notes on how the contributing process is to be handled.
+After forking this repository to translate the work, this file is where the notes for coordinating the translation work would go.
+Things like standardizing on words and expressions so that the work is consistent or notes on how the contributing process is to be handled.
 
 As a translation maintainer, also feel free to modify or completely rewrite the README file to contain instructions specific to your translation.
 
 === Translation Status
 
-As the work is translated, please update the `status.json` file to indicate the rough percentage complete each file is. This will be shown on various pages to let people know how much work is left to be done.
+As the work is translated, please update the `status.json` file to indicate the rough percentage complete each file is.
+This will be shown on various pages to let people know how much work is left to be done.
diff --git a/atlas.json b/atlas.json
@@ -33,7 +33,7 @@
     "epub": {
       "index": true,
       "toc": true,
-      "epubcheck": false,
+      "epubcheck": true,
       "embedded_fonts": [
         "fonts/DejaVuSerif.otf",
         "fonts/DejaVuSans-Bold.otf",

diff --git a/book/01-introduction/images/areas.png b/book/01-introduction/images/areas.png
diff --git a/book/01-introduction/images/centralized.png b/book/01-introduction/images/centralized.png
diff --git a/book/01-introduction/images/deltas.png b/book/01-introduction/images/deltas.png
diff --git a/book/01-introduction/images/distributed.png b/book/01-introduction/images/distributed.png
diff --git a/book/01-introduction/images/git-osx-installer.png b/book/01-introduction/images/git-osx-installer.png
diff --git a/book/01-introduction/images/local.png b/book/01-introduction/images/local.png
diff --git a/book/01-introduction/images/snapshots.png b/book/01-introduction/images/snapshots.png
diff --git a/book/01-introduction/sections/about-version-control.asc b/book/01-introduction/sections/about-version-control.asc
@@ -53,7 +53,7 @@ Local VCS systems suffer from this same problem – whenever you have the entire
 This is where Distributed Version Control Systems (DVCSs) step in.
 In a DVCS (such as Git, Mercurial, Bazaar or Darcs), clients don't just check out the latest snapshot of the files: they fully mirror the repository.
 Thus if any server dies, and these systems were collaborating via it, any of the client repositories can be copied back up to the server to restore it.
-Every checkout is really a full backup of all the data.
+Every clone is really a full backup of all the data.
 
 .Distributed version control.
 image::images/distributed.png[Distributed version control diagram]

diff --git a/book/01-introduction/sections/basics.asc b/book/01-introduction/sections/basics.asc
@@ -85,7 +85,7 @@ Staged means that you have marked a modified file in its current version to go i
 This leads us to the three main sections of a Git project: the Git directory, the working directory, and the staging area.
 
 .Working directory, staging area, and Git directory.
-image::images/areas.png[Working directory, staging area, and Git directory.]
+image::images/areas.png["Working directory, staging area, and Git directory."]
 
 The Git directory is where Git stores the metadata and object database for your project.
 This is the most important part of Git, and it is what is copied when you clone a repository from another computer.
@@ -103,6 +103,6 @@ The basic Git workflow goes something like this:
 3. You do a commit, which takes the files as they are in the staging area and stores that snapshot permanently to your Git directory.
 
 If a particular version of a file is in the Git directory, it's considered committed.
-If it's modified but has been added to the staging area, it is staged.
+If it has been modified and was added to the staging area, it is staged.
 And if it was changed since it was checked out but has not been staged, it is modified.
 In <<_git_basics_chapter>>, you'll learn more about these states and how you can either take advantage of them or skip the staged part entirely.
diff --git a/book/01-introduction/sections/command-line.asc b/book/01-introduction/sections/command-line.asc
@@ -4,7 +4,7 @@ There are a lot of different ways to use Git.
 There are the original command line tools, and there are many graphical user interfaces of varying capabilities.
 For this book, we will be using Git on the command line.
 For one, the command line is the only place you can run *all* Git commands – most of the GUIs only implement some subset of Git functionality for simplicity.
-If you know how to run the command line version, you can probably also figure out how to run the GUI version, while the opposite is not neccesarily true.
+If you know how to run the command line version, you can probably also figure out how to run the GUI version, while the opposite is not necessarily true.
 Also, while your choice of graphical client is a matter of personal taste, _all_ users will have the command-line tools installed and available.
 
 So we will expect you to know how to open Terminal in Mac or Command Prompt or Powershell in Windows.

diff --git a/book/01-introduction/sections/first-time-setup.asc b/book/01-introduction/sections/first-time-setup.asc
@@ -18,10 +18,13 @@ Each level overrides values in the previous level, so values in `.git/config` tr
 
 On Windows systems, Git looks for the `.gitconfig` file in the `$HOME` directory (`C:\Users\$USER` for most people).
 It also still looks for `/etc/gitconfig`, although it's relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer.
+If you are using Git for Windows 2.x or later, there is also a system-level config file at
+`C:\Documents and Settings\All Users\Application Data\Git\config` on Windows XP, and in `C:\ProgramData\Git\config` on Windows Vista and newer.
+This config file can only be changed by `git config -f <file>` as an admin.
 
 ==== Your Identity
 
-The first thing you should do when you install Git is to set your user name and e-mail address.
+The first thing you should do when you install Git is to set your user name and email address.
 This is important because every Git commit uses this information, and it's immutably baked into the commits you start creating:
 
 [source,console]
@@ -31,25 +34,45 @@ $ git config --global user.email [email protected]
 ----
 
 Again, you need to do this only once if you pass the `--global` option, because then Git will always use that information for anything you do on that system.
-If you want to override this with a different name or e-mail address for specific projects, you can run the command without the `--global` option when you're in that project.
+If you want to override this with a different name or email address for specific projects, you can run the command without the `--global` option when you're in that project.
 
 Many of the GUI tools will help you do this when you first run them.
 
 ==== Your Editor
 
 Now that your identity is set up, you can configure the default text editor that will be used when Git needs you to type in a message.
-If not configured, Git uses your system's default editor, which is generally Vim.
+If not configured, Git uses your system's default editor, which is system dependant.
+
 If you want to use a different text editor, such as Emacs, you can do the following:
 
 [source,console]
 ----
 $ git config --global core.editor emacs
 ----
 
+While on a Windows system, if you want to use a different text editor, such as Notepad++, you can do the following:
+
+On a x86 system
+[source,console]
+----
+$ git config --global core.editor "'C:/Program Files/Notepad++/notepad++.exe' -multiInst -nosession" 
+----
+On a x64 system
+[source,console]
+----
+$ git config --global core.editor "'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -nosession" 
+----
+
+[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.
+====
+
 [WARNING]
 ====
-Vim and Emacs are popular text editors often used by developers on Unix based systems like Linux and Mac. If you are not familiar with either of these editors or are on a Windows system, you may need to search for instructions for how to set up your favorite editor with Git.  
-If you don't set an editor like this and you don't know what Vim or Emacs are, you will likely get into a really confusing state when they are launched.
+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.
 ====
 
 ==== Checking Your Settings
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
		This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,3 +26,5 @@ namespace :book do @@
         puts " -- PDF  output at progit.pdf"
       end
     end
+    task :default => "book:build"