Update to 20190606 (progit#21)

* Hoofd-folder bijgewerkt en nieuwe documenten toegevoegd

* Gelijktrekken aan documenten v.a. ca 2018-06

A-git-in-other-environments.asc

@@ -1,7 +1,7 @@
 [[A-git-in-other-environments]]
 [appendix]
 ////
-Laatst bijgewerkt van progit/progit2 referentie: 7836cfed
+Laatst bijgewerkt van progit/progit2 referentie: 39260815e
 ////
 == Git in andere omgevingen
 
@@ -15,8 +15,12 @@ include::book/A-git-in-other-environments/sections/guis.asc[]
 
 include::book/A-git-in-other-environments/sections/visualstudio.asc[]
 
+include::book/A-git-in-other-environments/sections/visualstudiocode.asc[]
+
 include::book/A-git-in-other-environments/sections/eclipse.asc[]
 
+include::book/A-git-in-other-environments/sections/sublimetext.asc[]
+
 include::book/A-git-in-other-environments/sections/bash.asc[]
 
 include::book/A-git-in-other-environments/sections/zsh.asc[]

B-embedding-git-in-your-applications.asc

@@ -1,14 +1,14 @@
 [[B-embedding-git-in-your-applications]]
 [appendix]
 ////
-Laatst bijgewerkt van progit/progit2 referentie: 8d8780b1d
+Laatst bijgewerkt van progit/progit2 referentie: 93302a10
 ////
 == Git in je applicaties inbouwen
 
 Als je applicatie bestemd is voor ontwikkelaars, is er een grote kans dat het kan profiteren van integratie met versiebeheer.
 Zelfs applicaties voor niet-ontwikkelaars, zoals document editors, kunnen potentieel profiteren van versiebeheer functionaliteit, en het model van Git werkt erg goed voor vele verschillende scenarios.
 
-Als je Git moet integreren met je applicatie, heb je eigenlijk twee opties: een shell openen en de Git commando-regel tool gebruiken, of Git als library inbedden in je applicatie.
+Als je Git moet integreren met je applicatie, heb je eigenlijk twee opties: een shell openen en de `git` commando-regel tool aanroepen, of Git als library inbedden in je applicatie.
 We zullen hier de integratie van de commandoregel en een aantal van de meest populaire inbedbare Git libraries behandelen.
 
 include::book/B-embedding-git/sections/command-line.asc[]

C-git-commands.asc

@@ -1,7 +1,7 @@
 [[C-git-commands]]
 [appendix]
 ////
-Laatst bijgewerkt van progit/progit2 referentie: 7836cfed
+Laatst bijgewerkt van progit/progit2 referentie: a991588c
 ////
 == Git Commando's
 

LICENSE.asc

@@ -1 +1,2 @@
-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.
+This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
+To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/3.0 or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.

README.asc

@@ -6,7 +6,7 @@ Laatst bijgewerkt van progit/progit2 referentie: 7836cfed
 
 Welcome to the second edition of the Pro Git book.
 
-You can find this book online at: http://git-scm.com/book
+You can find this book online at: https://git-scm.com/book
 
 Like the first edition, the second edition of Pro Git is open source under a Creative Commons license.
 

Rakefile

@@ -2,37 +2,32 @@ namespace :book do
   desc 'build basic book formats'
   task :build do
 
-    `cp progit.asc progit.asc.bak`
     begin
       version_string = ENV['TRAVIS_TAG'] || `git describe --tags`.chomp
       if version_string.empty?
         version_string = '0'
       end
-      text = File.read('progit.asc')
-      new_contents = text.gsub("$$VERSION$$", version_string).gsub("$$DATE$$", Time.now.strftime("%Y-%m-%d"))
-      File.open("progit.asc", "w") {|file| file.puts new_contents }
-
+      date_string = Time.now.strftime("%Y-%m-%d")
+      params = "--attribute revnumber='#{version_string}' --attribute revdate='#{date_string}'"
       puts "Generating contributors list"
       `git shortlog -s | grep -v -E "(Straub|Chacon)" | cut -f 2- | column -c 120 > book/contributors.txt`
 
       puts "Converting to HTML..."
-      `bundle exec asciidoctor progit.asc`
+      `bundle exec asciidoctor #{params} progit.asc`
       puts " -- HTML output at progit.html"
 
       puts "Converting to EPub..."
-      `bundle exec asciidoctor-epub3 progit.asc`
+      `bundle exec asciidoctor-epub3 #{params} progit.asc`
       puts " -- Epub output at progit.epub"
 
       puts "Converting to Mobi (kf8)..."
-      `bundle exec asciidoctor-epub3 -a ebook-format=kf8 progit.asc`
+      `bundle exec asciidoctor-epub3 #{params} -a ebook-format=kf8 progit.asc`
       puts " -- Mobi output at progit.mobi"
 
       puts "Converting to PDF... (this one takes a while)"
-      `bundle exec asciidoctor-pdf progit.asc 2>/dev/null`
+      `bundle exec asciidoctor-pdf #{params} progit.asc 2>/dev/null`
       puts " -- PDF output at progit.pdf"
 
-    ensure
-      `mv progit.asc.bak progit.asc`
     end
   end
 end

TRANSLATING.md

@@ -1,110 +1,98 @@
 # Translating Pro Git (2nd Edition)
 
-The translation are managed in a decentralized way, with each translation teams maintaining their own project. Since each translation is a different repository, maintainers teams are self organized for each project.
+The translations are managed in a decentralized way. Each translation team maintains their own project. Each translation is in its own repository, the Pro Git team simply pulls the changes and builds them into the https://git-scm.com website when ready.
 
-The Pro Git team simply pulls them in and builds them for the translation teams on the git-scm.com website.
+## General guidance for translating Pro Git
 
-## A Word About the Activity of Translating
+Pro Git is a book about a technical tool, therefore translating it is difficult compared to a non-technical translation.
 
-Pro Git is a book about a technical tool. As such it combines a double difficulty for translators:
+The following are guidelines to help you on your way:
+* Before you begin, read the whole Git Pro book in English, so that you're aware of the content, and are familiar with the style used.
+* Ensure you have a good working knowledge of git, so that explaining the technical terms is doable.
+* Stick to a common style and format for the translation.
+* Be sure to read and understand the basics of [Asciidoc formatting](https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/). Not following the asciidoc syntax can lead to problems with building/compilation of the pdf, epub and html files needed for the book.
 
- * The translation of a book, even in parts requires that the translators be aware of the whole content of book. This usually requires for each translator to have read the book and to agree with some common style of output. These rules ensure that the reader won't feel transitions in the text when switching from a part produced by one translator to a part from another one.
- * Git is a computer tool. Pro Git tries to make it affordable to not so technical-savy people and it's really good that the translators do not work on the core of git, because it's a user's perspective that is needed for the most part of the book. That also means that the translation may be deceiving if the translator has never used Git. Good translators must be Git users to actually keep Progit understandable.
+## Translating the book to another language
 
-Moreover, the book was written in a formatting language called [Asciidoc](http://asciidoctor.org/). Some parts of the files making up the book are in fact Asciidoc commands. Upsetting these commands will make it impossible to assemble and to compile of the files into the PDF, epub and html output.
+### Helping with a existing project
 
-Be sure to have read and understood the basics of [how Asciidoc formatting works](https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/) before starting to change any file.
+* Check for an already existing project in the following table.
+* Go to the project's page on GitHub.
+* Open an issue, introduce yourself and ask where you can help.
 
-Translating Pro Git is such an endeavor that if you don't want to loose your energy on poor results, stress and deceived expectations, you have to set up, enforce and abide by rules stemming from these basic advices.
+| Language     | GitHub page     |
+| :------------- | :------------- |
+| العربية | [progit2-ar/progit2](https://github.com/progit2-ar/progit2) |
+| Беларуская  | [progit/progit2-be](https://github.com/progit/progit2-be) |
+| български език | [progit/progit2-bg](https://github.com/progit/progit2-bg) |
+| Čeština    | [progit-cs/progit2-cs](https://github.com/progit-cs/progit2-cs) |
+| English    | [progit/progit2](https://github.com/progit/progit2) |
+| Español    | [progit/progit2-es](https://github.com/progit/progit2-es) |
+| فارسی | [progit2-fa/progit2](https://github.com/progit2-fa/progit2) |
+| Français   | [progit/progit2-fr](https://github.com/progit/progit2-fr) |
+| Deutsch    | [progit-de/progit2](https://github.com/progit-de/progit2) |
+| Ελληνικά   | [progit2-gr/progit2](https://github.com/progit2-gr/progit2) |
+| Indonesian | [progit/progit2-id](https://github.com/progit/progit2-id) |
+| Italiano   | [progit/progit2-it](https://github.com/progit/progit2-it) |
+| 日本語   | [progit/progit2-ja](https://github.com/progit/progit2-ja) |
+| 한국어   | [progit/progit2-ko](https://github.com/progit/progit2-ko) |
+| Македонски | [progit2-mk/progit2](https://github.com/progit2-mk/progit2) |
+| Bahasa Melayu| [progit2-ms/progit2](https://github.com/progit2-ms/progit2) |
+| Nederlands | [progit/progit2-nl](https://github.com/progit/progit2-nl) |
+| Polski | [progit2-pl/progit2-pl](https://github.com/progit2-pl/progit2-pl) |
+| Português (Brasil) | [progit2-pt-br/progit2](https://github.com/progit2-pt-br/progit2) |
+| Русский   | [progit/progit2-ru](https://github.com/progit/progit2-ru) |
+| Slovenščina  | [progit/progit2-sl](https://github.com/progit/progit2-sl) |
+| Српски   | [progit/progit2-sr](https://github.com/progit/progit2-sr) |
+| Tagalog   | [progit2-tl/progit2](https://github.com/progit2-tl/progit2) |
+| Türkçe   | [progit/progit2-tr](https://github.com/progit/progit2-tr) |
+| Українська| [progit/progit2-uk](https://github.com/progit/progit2-uk) |
+| Ўзбекча  | [progit/progit2-uz](https://github.com/progit/progit2-uz) |
+| 简体中文  | [progit/progit2-zh](https://github.com/progit/progit2-zh) |
+| 正體中文  | [progit/progit2-zh-tw](https://github.com/progit/progit2-zh-tw) |
 
-## Translating the Book to Another Language
+### Starting a new translation
 
-### Existing Projects
+If there is no project for your language, you can start your own translation.
 
-If you wish to help at translating Progit 2nd edition to your language, first check for an already existing project in the following list and get in touch with the people in charge of itif there's already one. Go to the project page, open an issue, present yourself and ask what can be done.
+Base your work on the second edition of the book, available [here](https://github.com/progit/progit2). To do so:
+ 1. Pick the correct [ISO 639 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) for your language.
+ 1. Create a [GitHub organization](https://help.github.com/articles/creating-a-new-organization-from-scratch/), for example: `progit2-[your code]` on GitHub.
+ 1. Create a project ``progit2``.
+ 1. Copy the structure of progit/progit2 (this project) in your project and start translating.
 
-Existing projects include:
+### Updating the status of your translation
 
-  Language   |   Project
------------- | -------------
-Беларуская  | [progit/progit2-be](https://github.com/progit/progit2-be)
-Čeština    | [progit-cs/progit2-cs](https://github.com/progit-cs/progit2-cs)
-English    | [progit/progit2](https://github.com/progit/progit2)
-Español    | [progit/progit2-es](https://github.com/progit/progit2-es)
-Français   | [progit/progit2-fr](https://github.com/progit/progit2-fr)
-Deutsch    | [progit-de/progit2](https://github.com/progit-de/progit2)
-Ελληνικά   | [progit2-gr/progit2](https://github.com/progit2-gr/progit2)
-Indonesian | [progit/progit2-id](https://github.com/progit/progit2-id)
-Italiano   | [progit/progit2-it](https://github.com/progit/progit2-it)
-日本語   | [progit/progit2-ja](https://github.com/progit/progit2-ja)
-한국어   | [progit/progit2-ko](https://github.com/progit/progit2-ko)
-Македонски | [progit2-mk/progit2](https://github.com/progit2-mk/progit2)
-Bahasa Melayu| [progit2-ms/progit2](https://github.com/progit2-ms/progit2)
-Nederlands | [progit/progit2-nl](https://github.com/progit/progit2-nl)
-Polski | [progit2-pl/progit2-pl](https://github.com/progit2-pl/progit2-pl)
-Português (Brasil) | [progit2-pt-br/progit2](https://github.com/progit2-pt-br/progit2)
-Русский   | [progit/progit2-ru](https://github.com/progit/progit2-ru)
-Slovenščina  | [progit/progit2-sl](https://github.com/progit/progit2-sl)
-Српски   | [progit/progit2-sr](https://github.com/progit/progit2-sr)
-Tagalog   | [progit2-tl/progit2](https://github.com/progit2-tl/progit2)
-Türkçe   | [progit/progit2-tr](https://github.com/progit/progit2-tr)
-Українська| [progit/progit2-uk](https://github.com/progit/progit2-uk)
-Ўзбекча  | [progit/progit2-uz](https://github.com/progit/progit2-uz)
-简体中文  | [progit/progit2-zh](https://github.com/progit/progit2-zh)
-正體中文  | [progit/progit2-zh-tw](https://github.com/progit/progit2-zh-tw)
+On https://git-scm.com, the translations are divided into three categories. Once you have reached one of these levels, contact the maintainers of https://git-scm.com/ so that they can pull the changes.
 
-### Your Language is not Listed
+| Category | Completion     |
+| :------------- | :------------- |
+| Translation started for | Introduction translated, not much else. |
+| Partial translations available in | up to chapter 6 has been translated. |
+| Full translation available in |the book is (almost) fully translated. |
 
-Then you're lucky! You're gonna be the initiator of a new translation project!
+## Continuous integration with Travis CI
 
-You can start to make your own version with the second edition in English, available here. To do so,
+Travis CI is a [continuous integration](https://en.wikipedia.org/wiki/Continuous_integration) service that integrates with GitHub. Travis CI is used to ensure that a pull-request doesn't break the build or compilation. Travis CI can also provide compiled versions of the book.
 
- 1. Pick your the [ISO 639 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) and [create a GitHub organization](https://help.github.com/articles/creating-a-new-organization-from-scratch/), say `progit2-[your code]` on github
- 2. Create a project progit2
- 3. Copy the structure of progit/progit2 (this project) in your project and start translating. You can reuse some material from the first edition, but beware that:
-    1. the text has been reworked in numerous parts
-    2. the markup has changed from markdown to [asciidoc](http://asciidoc.org)
- 4. Push to the new repo a few translated chapters
- 5. Ping an organizer so that the second edition of Progit in your language is pushed on git-scm.com.
+Setting up Travis CI requires administrative control over the repository.
 
-### Updating the Status of Your Translation
+### Registering for Travis continuous integration
 
-On git-scm.com, the translations are listed in three categories:
+1. Register a Travis account [here](https://travis-ci.org/).
+1. Register your project in Travis.
+Please refer to the [Travis documentation](https://docs.travis-ci.com/) for more information.
 
- 1. Translation just started. The introduction is translated at least, but there's not much to read. It's time to translate the meat of the book.
- 2. Partially translated. The chapters up to chapter 6 have been translated. The book is becoming useful to help the reader become a fluent Git user.
- 3. Fully Translated. The book is almost fully translated.
+### Setting up your repository for continuous integration
 
- Once you have reached one of these levels, just contact the maintainers of the git-scm site to make your translation appear in the right category.
+Travis CI works by scanning your project's root directory for a file named `.travis.yml` and following the 'recipe' that it contains. The good news is: there's already a working `.travis.yml` file in the Pro Git 2 source [here](https://raw.githubusercontent.com/progit/progit2-pub/master/travis.yml).
+Copy that file, and put it in your working directory. Commit the .yml file and push it to your translation repository; that should fire up a compilation and a check of the book's contents.
 
-## Using Travis-CI for Continuous Integration
+## Setting up a publication chain for e-books
 
-Travis-CI is a [continuous integration](https://en.wikipedia.org/wiki/Continuous_integration) service that fits nicely with GitHub. It can be used to automatically check that the pull-requests from the collaborators don't break the Asciidoc markup but can also provide compiled versions of the books.
+This is a technical task, please ping @jnavila to get started with epub publication.
 
-Setting up Travis-CI requires to have administrative privileges over the repository. If you're not an administrator of the repository, let them know that they can enhance the visibility of the project by doing the following steps.
-
-### Checking the Validity of the Text
-
-This is the most useful set up for contributors. It allows to check at any moment that the book compiles properly and provides the same checks for pull-requests.
-
-#### Registering for CI
-
-If you don't already have an account at travis-ci.org, then go to [their page](https://travis-ci.org/) and log in. Otherwise you can register with your GitHub account.
-
-Register your project in Travis. If a build is not fired automatically, it can be forced. The logs of build provide useful data when the build fails.
-
-Please refer to the documentation on Travis-ci.org for further information on using their system.
-
-#### Setting up Your Repo for CI
-
-Travis-CI works by scanning your project's root directory for a file named `.travis.yml` and following the recipe that it contains. The good news is that you don't really need to understand how all of this works. There's a project already set up to simplify the setup. Download the file [here](https://raw.githubusercontent.com/progit/progit2-pub/master/travis.yml) and save it as `.travis.yml` in your working copy. Commit it and push it; that should fire up a compilation and a check of the book's contents.
-
-
-### Setting Up a Publication Chain for Ebooks
-
-This is a quite technical task. Please ping @jnavila for this.
-
-## Beyond Progit
+## Beyond Pro Git
 
 Translating the book is the first step. Once this is finished, you could consider translating the user interface of Git itself.
 

book/01-introduction/sections/about-version-control.asc

@@ -1,5 +1,5 @@
 ////
-Laatst bijgewerkt van progit/progit2 referentie: 7836cfed
+Laatst bijgewerkt van progit/progit2 referentie: c9a270177
 ////
 === Over versiebeheer
 
@@ -25,7 +25,7 @@ Om met dit probleem om te gaan hebben programmeurs lang geleden lokale VCSen ont
 .Lokale versiebeheer.
 image::images/local.png[Een diagram van een lokaal versiebeheersysteem]
 
-Een populair gereedschap voor VCS was een systeem genaamd RCS, wat vandaag de dag nog steeds met veel computers wordt meegeleverd.
+Een van de meest populaire gereedschappen voor VCS was een systeem genaamd RCS, wat vandaag de dag nog steeds met veel computers wordt meegeleverd.
 RCS werkt door verzamelingen van 'patches' (dat zijn de verschillen tussen bestanden) van de opvolgende bestandsversies in een speciaal formaat op de harde schijf op te slaan.
 Zo kan je een bestand reproduceren zoals deze er uitzag op elk willekeurig moment in tijd door alle patches bij elkaar op te tellen.