Абноўлена структура кнігі

Author: Morganov

.gitignore

@@ -2,10 +2,12 @@ output
 .DS_Store
 
 # build artifacts
+Gemfile.lock
 progit.html
 progit.pdf
 progit.pdfmarks
 progit.epub
 progit-kf8.epub
 progit.mobi
-/images/
+contributors.txt
+attributes-*

.mailmap

@@ -0,0 +1,2 @@
+Jean-Noël Avila <jn.avila@free.fr>
+Scott Chacon <schacon@gmail.com>

…nvironments/1-git-other-environments.asc A-git-in-other-environments.ascbook/A-git-in-other-environments/1-git-other-environments.asc renamed to A-git-in-other-environments.asc book/A-git-in-other-environments/1-git-other-environments.asc renamed to A-git-in-other-environments.asc

@@ -1,3 +1,4 @@
+[[A-git-in-other-environments]]
 [appendix]
 == Git in Other Environments
 
@@ -6,18 +7,21 @@ You can work with local files, connect your repository to others over a network,
 But the story doesn't end there; Git is usually used as part of a larger ecosystem, and the terminal isn't always the best way to work with it.
 Now we'll take a look at some of the other kinds of environments where Git can be useful, and how other applications (including yours) work alongside Git.
 
-include::sections/guis.asc[]
+include::book/A-git-in-other-environments/sections/guis.asc[]
 
-include::sections/visualstudio.asc[]
+include::book/A-git-in-other-environments/sections/visualstudio.asc[]
 
-include::sections/eclipse.asc[]
+include::book/A-git-in-other-environments/sections/visualstudiocode.asc[]
 
+include::book/A-git-in-other-environments/sections/jetbrainsides.asc[]
 
-include::sections/bash.asc[]
+include::book/A-git-in-other-environments/sections/sublimetext.asc[]
 
-include::sections/zsh.asc[]
+include::book/A-git-in-other-environments/sections/bash.asc[]
 
-include::sections/powershell.asc[]
+include::book/A-git-in-other-environments/sections/zsh.asc[]
+
+include::book/A-git-in-other-environments/sections/powershell.asc[]
 
 === Summary
 

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

@@ -0,0 +1,20 @@
+[[B-embedding-git-in-your-applications]]
+[appendix]
+== Embedding Git in your Applications
+
+If your application is for developers, chances are good that it could benefit from integration with source control.
+Even non-developer applications, such as document editors, could potentially benefit from version-control features, and Git's model works very well for many different scenarios.
+
+If you need to integrate Git with your application, you have essentially two options: spawn a shell and call the `git` command-line program, or embed a Git library into your application.
+Here we'll cover command-line integration and several of the most popular embeddable Git libraries.
+
+include::book/B-embedding-git/sections/command-line.asc[]
+
+include::book/B-embedding-git/sections/libgit2.asc[]
+
+include::book/B-embedding-git/sections/jgit.asc[]
+
+include::book/B-embedding-git/sections/go-git.asc[]
+
+include::book/B-embedding-git/sections/dulwich.asc[]
+

C-git-commands.asc

@@ -0,0 +1,44 @@
+# Contributing to Pro Git (2nd Edition)
+
+## Licensing your work to us
+
+When you open a pull request, 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).
+
+## Signaling an Issue
+
+Search for similar issues, before creating a new issue.
+
+Also, if this issue has been spotted on the git-scm.com site, cross-check that the issue is present in the pdf version.
+The issue may have already been corrected in the source files, but not yet deployed to the git-scm.com site.
+
+## Small Corrections
+
+Errata and basic clarifications will be accepted if we agree that they improve the content.
+You can also open an issue so that we can discuss how or if the issue 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.
+A large rewrite tends to be very subjective, often only clarifying things for a small amount of readers.
+Professional copy editors have already reviewed this content multiple times.
+It's unlikely that your prose is going to be *so* much better that it's worth changing large portions of text.
+
+## Figures
+
+The images in this book are generated using [Sketch 3](https://www.sketchapp.com/), with the [included sketchbook file](diagram-source/progit.sketch).
+
+To create a figure:
+
+1. Add a page to the sketchbook.
+Use the included symbols wherever possible.
+2. Add a "slice" to your page.
+Name the slice so that it matches the destination PNG filename, relative from the root of the source directory.
+3. Set your slice to export at "800w".
+
+## Translations
+
+If you want to contribute to translating Pro Git into your language, take a look at [TRANSLATING.md](TRANSLATING.md).

CONTRIBUTING.md

@@ -1,16 +1,16 @@
 source 'https://rubygems.org'
 
-gem 'rake'
-gem 'asciidoctor', '1.5.0'
+gem 'rake', '13.0.3'
+gem 'asciidoctor', '2.0.12'
 
-gem 'json'
-gem 'awesome_print'
+gem 'json', '2.5.1'
+gem 'awesome_print', '1.8.0'
 
-gem 'asciidoctor-epub3', '1.0.0.alpha.2'
-gem 'asciidoctor-pdf', '1.5.0.alpha.5'
+gem 'asciidoctor-epub3', '1.5.0.alpha.19'
+gem 'asciidoctor-pdf', '1.5.4'
 
-gem 'coderay'
-gem 'pygments.rb'
-gem 'thread_safe'
-gem 'epubcheck'
-gem 'kindlegen'
+gem 'coderay', '1.1.3'
+gem 'pygments.rb', '2.0.0'
+gem 'thread_safe', '0.3.6'
+gem 'epubcheck-ruby', '4.2.4.0'
+gem 'html-proofer', '3.18.5'

Gemfile

@@ -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, 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 https://creativecommons.org/licenses/by-nc-sa/3.0 or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.