Reworking files structure to make ebook work

jnavila · jnavila · commit 6d42f6a120be · 2018-01-30T22:30:17.000+01:00
Some more files tweaking is needed to allow correct generation of pdf
and ebooks.
diff --git a/Gemfile b/Gemfile
@@ -1,13 +1,13 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'asciidoctor', '1.5.0'
+gem 'asciidoctor', :git => 'https://github.com/asciidoctor/asciidoctor'
 
 gem 'json'
 gem 'awesome_print'
 
-gem 'asciidoctor-epub3', '1.0.0.alpha.2'
-gem 'asciidoctor-pdf', '1.5.0.alpha.5'
+gem 'asciidoctor-epub3', :git => 'https://github.com/asciidoctor/asciidoctor-epub3'
+gem 'asciidoctor-pdf', '1.5.0.alpha.16'
 
 gem 'coderay'
 gem 'pygments.rb'
diff --git a/_customizing_git.asc b/_customizing_git.asc
@@ -5,13 +5,13 @@ So far, we've covered the basics of how Git works and how to use it, and we've i
 In this chapter, we'll see how you can make Git operate in a more customized fashion, by introducing several important configuration settings and the hooks system.
 With these tools, it's easy to get Git to work exactly the way you, your company, or your group needs it to.
 
-include::sections/config.asc[]
+include::book/08-customizing-git/sections/config.asc[]
 
-include::sections/attributes.asc[]
+include::book/08-customizing-git/sections/attributes.asc[]
 
-include::sections/hooks.asc[]
+include::book/08-customizing-git/sections/hooks.asc[]
 
-include::sections/policy.asc[]
+include::book/08-customizing-git/sections/policy.asc[]
 
 === Summary
 
diff --git a/_distributed_git.asc b/_distributed_git.asc
@@ -7,11 +7,11 @@ Now that you have a remote Git repository set up as a focal point for all the de
 In this chapter, you'll see how to work with Git in a distributed environment as a contributor and an integrator.
 That is, you'll learn how to contribute code successfully to a project and make it as easy on you and the project maintainer as possible, and also how to maintain a project successfully with a number of developers contributing.
 
-include::sections/distributed-workflows.asc[]
+include::book/05-distributed-git/sections/distributed-workflows.asc[]
 
-include::sections/contributing.asc[]
+include::book/05-distributed-git/sections/contributing.asc[]
 
-include::sections/maintaining.asc[]
+include::book/05-distributed-git/sections/maintaining.asc[]
 
 === Summary
 
diff --git a/_embedding_git_in_your_applications.asc b/_embedding_git_in_your_applications.asc
@@ -7,8 +7,8 @@ Even non-developer applications, such as document editors, could potentially ben
 
 If you need to integrate Git with your application, you have essentially three choices: spawning a shell and using the Git command-line tool; Libgit2; and JGit.
 
-include::sections/command-line.asc[]
+include::book/B-embedding-git/sections/command-line.asc[]
 
-include::sections/libgit2.asc[]
+include::book/B-embedding-git/sections/libgit2.asc[]
 
-include::sections/jgit.asc[]
+include::book/B-embedding-git/sections/jgit.asc[]
diff --git a/_getting_started.asc b/_getting_started.asc
@@ -5,19 +5,19 @@ This chapter will be about getting started with Git.
 We will begin by explaining some background on version control tools, then move on to how to get Git running on your system and finally how to get it set up to start working with.
 At the end of this chapter you should understand why Git is around, why you should use it and you should be all set up to do so.
 
-include::sections/about-version-control.asc[]
+include::book/01-introduction/sections/about-version-control.asc[]
 
-include::sections/history.asc[]
+include::book/01-introduction/sections/history.asc[]
 
-include::sections/basics.asc[]
+include::book/01-introduction/sections/basics.asc[]
 
-include::sections/command-line.asc[]
+include::book/01-introduction/sections/command-line.asc[]
 
-include::sections/installing.asc[]
+include::book/01-introduction/sections/installing.asc[]
 
-include::sections/first-time-setup.asc[]
+include::book/01-introduction/sections/first-time-setup.asc[]
 
-include::sections/help.asc[]
+include::book/01-introduction/sections/help.asc[]
 
 === Summary
 
diff --git a/_git_and_other_scms.asc b/_git_and_other_scms.asc
@@ -16,15 +16,15 @@ Git provides such a nice experience for developers that many people have figured
 There are a number of these adapters, called ``bridges,'' available.
 Here we'll cover the ones you're most likely to run into in the wild.
 
-include::sections/client-svn.asc[]
+include::book/09-git-and-other-scms/sections/client-svn.asc[]
 
-include::sections/client-hg.asc[]
+include::book/09-git-and-other-scms/sections/client-hg.asc[]
 
-include::sections/client-bzr.asc[]
+include::book/09-git-and-other-scms/sections/client-bzr.asc[]
 
-include::sections/client-p4.asc[]
+include::book/09-git-and-other-scms/sections/client-p4.asc[]
 
-include::sections/client-tfs.asc[]
+include::book/09-git-and-other-scms/sections/client-tfs.asc[]
 
 [[_migrating]]
 === Migrating to Git
@@ -34,17 +34,17 @@ If you have an existing codebase in another VCS but you've decided to start usin
 This section goes over some importers for common systems, and then demonstrates how to develop your own custom importer.
 You'll learn how to import data from several of the bigger professionally used SCM systems, because they make up the majority of users who are switching, and because high-quality tools for them are easy to come by.
 
-include::sections/import-svn.asc[]
+include::book/09-git-and-other-scms/sections/import-svn.asc[]
 
-include::sections/import-hg.asc[]
+include::book/09-git-and-other-scms/sections/import-hg.asc[]
 
-include::sections/import-bzr.asc[]
+include::book/09-git-and-other-scms/sections/import-bzr.asc[]
 
-include::sections/import-p4.asc[]
+include::book/09-git-and-other-scms/sections/import-p4.asc[]
 
-include::sections/import-tfs.asc[]
+include::book/09-git-and-other-scms/sections/import-tfs.asc[]
 
-include::sections/import-custom.asc[]
+include::book/09-git-and-other-scms/sections/import-custom.asc[]
 
 === Summary
 
diff --git a/_git_basics_chapter.asc b/_git_basics_chapter.asc
@@ -6,19 +6,19 @@ This chapter covers every basic command you need to do the vast majority of the
 By the end of the chapter, you should be able to configure and initialize a repository, begin and stop tracking files, and stage and commit changes.
 We'll also show you how to set up Git to ignore certain files and file patterns, how to undo mistakes quickly and easily, how to browse the history of your project and view changes between commits, and how to push and pull from remote repositories.
 
-include::sections/getting-a-repository.asc[]
+include::book/02-git-basics/sections/getting-a-repository.asc[]
 
-include::sections/recording-changes.asc[]
+include::book/02-git-basics/sections/recording-changes.asc[]
 
-include::sections/viewing-history.asc[]
+include::book/02-git-basics/sections/viewing-history.asc[]
 
-include::sections/undoing.asc[]
+include::book/02-git-basics/sections/undoing.asc[]
 
-include::sections/remotes.asc[]
+include::book/02-git-basics/sections/remotes.asc[]
 
-include::sections/tagging.asc[]
+include::book/02-git-basics/sections/tagging.asc[]
 
-include::sections/aliases.asc[]
+include::book/02-git-basics/sections/aliases.asc[]
 
 === Summary
 
diff --git a/_git_branching.asc b/_git_branching.asc
@@ -12,17 +12,17 @@ The way Git branches is incredibly lightweight, making branching operations near
 Unlike many other VCSs, Git encourages workflows that branch and merge often, even multiple times in a day.
 Understanding and mastering this feature gives you a powerful and unique tool and can entirely change the way that you develop.
 
-include::sections/nutshell.asc[]
+include::book/03-git-branching/sections/nutshell.asc[]
 
-include::sections/basic-branching-and-merging.asc[]
+include::book/03-git-branching/sections/basic-branching-and-merging.asc[]
 
-include::sections/branch-management.asc[]
+include::book/03-git-branching/sections/branch-management.asc[]
 
-include::sections/workflows.asc[]
+include::book/03-git-branching/sections/workflows.asc[]
 
-include::sections/remote-branches.asc[]
+include::book/03-git-branching/sections/remote-branches.asc[]
 
-include::sections/rebasing.asc[]
+include::book/03-git-branching/sections/rebasing.asc[]
 
 === Summary
 
diff --git a/_git_commands.asc b/_git_commands.asc
diff --git a/_git_in_other_environments.asc b/_git_in_other_environments.asc
@@ -7,18 +7,18 @@ 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/eclipse.asc[]
 
 
-include::sections/bash.asc[]
+include::book/A-git-in-other-environments/sections/bash.asc[]
 
-include::sections/zsh.asc[]
+include::book/A-git-in-other-environments/sections/zsh.asc[]
 
-include::sections/powershell.asc[]
+include::book/A-git-in-other-environments/sections/powershell.asc[]
 
 === Summary
 
diff --git a/_git_internals.asc b/_git_internals.asc
@@ -15,21 +15,21 @@ In the last few years, the UI has been refined until it's as clean and easy to u
 
 The content-addressable filesystem layer is amazingly cool, so we'll cover that first in this chapter; then, you'll learn about the transport mechanisms and the repository maintenance tasks that you may eventually have to deal with.
 
-include::sections/plumbing-porcelain.asc[]
+include::book/10-git-internals/sections/plumbing-porcelain.asc[]
 
-include::sections/objects.asc[]
+include::book/10-git-internals/sections/objects.asc[]
 
-include::sections/refs.asc[]
+include::book/10-git-internals/sections/refs.asc[]
 
-include::sections/packfiles.asc[]
+include::book/10-git-internals/sections/packfiles.asc[]
 
-include::sections/refspec.asc[]
+include::book/10-git-internals/sections/refspec.asc[]
 
-include::sections/transfer-protocols.asc[]
+include::book/10-git-internals/sections/transfer-protocols.asc[]
 
-include::sections/maintenance.asc[]
+include::book/10-git-internals/sections/maintenance.asc[]
 
-include::sections/environment.asc[]
+include::book/10-git-internals/sections/environment.asc[]
 
 === Summary
 
diff --git a/_git_on_the_server.asc b/_git_on_the_server.asc
@@ -20,23 +20,23 @@ A remote repository is generally a _bare repository_ -- a Git repository that ha
 Because the repository is only used as a collaboration point, there is no reason to have a snapshot checked out on disk; it's just the Git data.
 In the simplest terms, a bare repository is the contents of your project's `.git` directory and nothing else.
 
-include::sections/protocols.asc[]
+include::book/04-git-server/sections/protocols.asc[]
 
-include::sections/git-on-a-server.asc[]
+include::book/04-git-server/sections/git-on-a-server.asc[]
 
-include::sections/generating-ssh-key.asc[]
+include::book/04-git-server/sections/generating-ssh-key.asc[]
 
-include::sections/setting-up-server.asc[]
+include::book/04-git-server/sections/setting-up-server.asc[]
 
-include::sections/git-daemon.asc[]
+include::book/04-git-server/sections/git-daemon.asc[]
 
-include::sections/smart-http.asc[]
+include::book/04-git-server/sections/smart-http.asc[]
 
-include::sections/gitweb.asc[]
+include::book/04-git-server/sections/gitweb.asc[]
 
-include::sections/gitlab.asc[]
+include::book/04-git-server/sections/gitlab.asc[]
 
-include::sections/hosted.asc[]
+include::book/04-git-server/sections/hosted.asc[]
 
 === Summary
 
diff --git a/_git_tools.asc b/_git_tools.asc
@@ -6,33 +6,33 @@ You’ve accomplished the basic tasks of tracking and committing files, and you
 
 Now you’ll explore a number of very powerful things that Git can do that you may not necessarily use on a day-to-day basis but that you may need at some point.
 
-include::sections/revision-selection.asc[]
+include::book/07-git-tools/sections/revision-selection.asc[]
 
-include::sections/interactive-staging.asc[]
+include::book/07-git-tools/sections/interactive-staging.asc[]
 
-include::sections/stashing-cleaning.asc[]
+include::book/07-git-tools/sections/stashing-cleaning.asc[]
 
-include::sections/signing.asc[]
+include::book/07-git-tools/sections/signing.asc[]
 
-include::sections/searching.asc[]
+include::book/07-git-tools/sections/searching.asc[]
 
-include::sections/rewriting-history.asc[]
+include::book/07-git-tools/sections/rewriting-history.asc[]
 
-include::sections/reset.asc[]
+include::book/07-git-tools/sections/reset.asc[]
 
-include::sections/advanced-merging.asc[]
+include::book/07-git-tools/sections/advanced-merging.asc[]
 
-include::sections/rerere.asc[]
+include::book/07-git-tools/sections/rerere.asc[]
 
-include::sections/debugging.asc[]
+include::book/07-git-tools/sections/debugging.asc[]
 
-include::sections/submodules.asc[]
+include::book/07-git-tools/sections/submodules.asc[]
 
-include::sections/bundling.asc[]
+include::book/07-git-tools/sections/bundling.asc[]
 
-include::sections/replace.asc[]
+include::book/07-git-tools/sections/replace.asc[]
 
-include::sections/credentials.asc[]
+include::book/07-git-tools/sections/credentials.asc[]
 
 === Summary
 
diff --git a/_github.asc b/_github.asc
@@ -18,15 +18,15 @@ It's important to note that like many active websites, the UI elements in these
 Hopefully the general idea of what we're trying to accomplish here will still be there, but if you want more up to date versions of these screens, the online versions of this book may have newer screenshots.
 ====
 
-include::sections/1-setting-up-account.asc[]
+include::book/06-github/sections/1-setting-up-account.asc[]
 
-include::sections/2-contributing.asc[]
+include::book/06-github/sections/2-contributing.asc[]
 
-include::sections/3-maintaining.asc[]
+include::book/06-github/sections/3-maintaining.asc[]
 
-include::sections/4-managing-organization.asc[]
+include::book/06-github/sections/4-managing-organization.asc[]
 
-include::sections/5-scripting.asc[]
+include::book/06-github/sections/5-scripting.asc[]
 
 === Summary
 
diff --git a/progit.asc b/progit.asc
@@ -10,28 +10,28 @@ Pro Git
 include::book/preface.asc[]
 ifdef::ebook-format[:leveloffset: -1]
 
-include::book/01-introduction/1-introduction.asc[]
+include::_getting_started.asc[]
 
-include::book/02-git-basics/1-git-basics.asc[]
+include::_git_basics_chapter.asc[]
 
-include::book/03-git-branching/1-git-branching.asc[]
+include::_git_branching.asc[]
 
-include::book/04-git-server/1-git-server.asc[]
+include::_git_on_the_server.asc[]
 
-include::book/05-distributed-git/1-distributed-git.asc[]
+include::_distributed_git.asc[]
 
-include::book/06-github/1-github.asc[]
+include::_github.asc[]
 
-include::book/07-git-tools/1-git-tools.asc[]
+include::_git_tools.asc[]
 
-include::book/08-customizing-git/1-customizing-git.asc[]
+include::_customizing_git.asc[]
 
-include::book/09-git-and-other-scms/1-git-and-other-scms.asc[]
+include::_git_and_other_scms.asc[]
 
-include::book/10-git-internals/1-git-internals.asc[]
+include::_git_internals.asc[]
 
-include::book/A-git-in-other-environments/1-git-other-environments.asc[]
+include::_git_in_other_environments.asc[]
 
-include::book/B-embedding-git/1-embedding-git.asc[]
+include::_embedding_git_in_your_applications.asc[]
 
-include::book/C-git-commands/1-git-commands.asc[]
+include::_git_commands.asc[]
