Merge pull request #201 from progit/epub-fix

Epub Fixes
haway · Dec 8, 2014 · 1e802bb · 1e802bb
2 parents 87f1d37 + 0a0016d
commit 1e802bb
Show file tree

Hide file tree

Showing 24 changed files with 6 additions and 6 deletions.
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/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.

diff --git a/book/03-git-branching/sections/rebasing.asc b/book/03-git-branching/sections/rebasing.asc
@@ -150,20 +150,20 @@ Suppose you clone from a central server and then do some work off that.
 Your commit history looks like this:
 
 .Clone a repository, and base some work on it
-image::images/perils-of-rebasing-1.png[Clone a repository, and base some work on it.]
+image::images/perils-of-rebasing-1.png["Clone a repository, and base some work on it."]
 
 Now, someone else does more work that includes a merge, and pushes that work to the central server.
 You fetch them and merge the new remote branch into your work, making your history look something like this:
 
 .Fetch more commits, and merge them into your work
-image::images/perils-of-rebasing-2.png[Fetch more commits, and merge them into your work.]
+image::images/perils-of-rebasing-2.png["Fetch more commits, and merge them into your work."]
 
 Next, the person who pushed the merged work decides to go back and rebase their work instead; they do a `git push --force` to overwrite the history on the server.
 You then fetch from that server, bringing down the new commits.
 
 [[_pre_merge_rebase_work]]
 .Someone pushes rebased commits, abandoning commits you've based your work on
-image::images/perils-of-rebasing-3.png[Someone pushes rebased commits, abandoning commits you've based your work on.]
+image::images/perils-of-rebasing-3.png["Someone pushes rebased commits, abandoning commits you've based your work on."]
 
 Now you're both in a pickle.
 If you do a `git pull`, you'll create a merge commit which includes both lines of history, and your repository will look like this:

diff --git a/book/06-github/sections/2-contributing.asc b/book/06-github/sections/2-contributing.asc
@@ -242,7 +242,7 @@ To https://github.com/tonychacon/blink
 
 Once you do that, the Pull Request will be automatically updated and re-checked to see if it merges cleanly.
 
-[[_pr_fail]]
+[[_pr_merge_fix]]
 .Pull Request now merges cleanly
 image::images/pr-02-merge-fix.png[PR fixed]
 

diff --git a/book/B-embedding-git/callouts/1.pdf b/book/B-embedding-git/callouts/1.pdf
diff --git a/book/B-embedding-git/callouts/1.png b/book/B-embedding-git/callouts/1.png
diff --git a/book/B-embedding-git/callouts/10.pdf b/book/B-embedding-git/callouts/10.pdf
diff --git a/book/B-embedding-git/callouts/10.png b/book/B-embedding-git/callouts/10.png
diff --git a/book/B-embedding-git/callouts/2.pdf b/book/B-embedding-git/callouts/2.pdf
diff --git a/book/B-embedding-git/callouts/2.png b/book/B-embedding-git/callouts/2.png
diff --git a/book/B-embedding-git/callouts/3.pdf b/book/B-embedding-git/callouts/3.pdf
diff --git a/book/B-embedding-git/callouts/3.png b/book/B-embedding-git/callouts/3.png
diff --git a/book/B-embedding-git/callouts/4.pdf b/book/B-embedding-git/callouts/4.pdf
diff --git a/book/B-embedding-git/callouts/4.png b/book/B-embedding-git/callouts/4.png
diff --git a/book/B-embedding-git/callouts/5.pdf b/book/B-embedding-git/callouts/5.pdf
diff --git a/book/B-embedding-git/callouts/5.png b/book/B-embedding-git/callouts/5.png
diff --git a/book/B-embedding-git/callouts/6.pdf b/book/B-embedding-git/callouts/6.pdf
diff --git a/book/B-embedding-git/callouts/6.png b/book/B-embedding-git/callouts/6.png
diff --git a/book/B-embedding-git/callouts/7.pdf b/book/B-embedding-git/callouts/7.pdf
diff --git a/book/B-embedding-git/callouts/7.png b/book/B-embedding-git/callouts/7.png
diff --git a/book/B-embedding-git/callouts/8.pdf b/book/B-embedding-git/callouts/8.pdf
diff --git a/book/B-embedding-git/callouts/8.png b/book/B-embedding-git/callouts/8.png
diff --git a/book/B-embedding-git/callouts/9.pdf b/book/B-embedding-git/callouts/9.pdf
diff --git a/book/B-embedding-git/callouts/9.png b/book/B-embedding-git/callouts/9.png