Sagittarius
diff --git a/‎.gitignore
+1 b/‎.gitignore
+1
diff --git a/‎TODO.markdown
+78 b/‎TODO.markdown
+78
diff --git a/‎layout/pdf_template.html
+1-6 b/‎layout/pdf_template.html
+1-6
diff --git a/‎output/book.pdf
-21.7 KB b/‎output/book.pdf
-21.7 KB
diff --git a/‎output/full_book.texttile
-5 b/‎output/full_book.texttile
-5
diff --git a/‎output/index.html
-41 b/‎output/index.html
-41
diff --git a/‎script/html.rb
+5-4 b/‎script/html.rb
+5-4
diff --git a/‎script/merge.rb
+2-2 b/‎script/merge.rb
+2-2
@@ -0,0 +1 @@
+output/*
@@ -1 +1,79 @@
+= Maint Tasks
+
 * Generate HTML only output - one page per chapter
+
+
+= Content
+
+=== Introduction
+
+* Introduction (Why Git)
+* Git Object DB Basics (Git vs SVN, what is a DAG)
+* The Git Index
+* Git directory and working directory
+
+=== First Time
+
+* Installing Git
+* Setup and Initialization
+
+=== Basic Usage
+
+* Normal Workflow
+* Basic Branching and Merging
+* Reviewing History – Git Log
+* Comparing Commits – Git Diff
+* Distributed Workflows – clone, fetch, push
+* Git Tag
+
+=== Intermediate Usage
+
+* Rebasing
+* Interactive Rebasing
+* Interactive Adding
+* Stashing
+* Git Treeishes
+* Tracking Branches
+* Finding in Git – git grep
+* Advanced Git Log
+* Re-doing – git reset and revert
+* Maintaining Git – gc and prune, fsck
+* Setting up a Public Repo – git, http/s, ssh, gitosis
+* Git Workflows
+
+=== Advanced Git
+
+* Creating New Empty Branches
+* Advanced Branching and Merging
+* Finding Issues – Git Bisect
+* Finding Issues – Git Blame
+* Git and Email – git-am, git-format-patch
+* Stacked Git – stgit, guilt
+* Customizing Git – git config
+* Git Hooks
+* Git Recovery – corrupted blob objects
+* Advanced Merging – multiway, merge subtree
+* Git Submodules
+
+=== Working With Git
+
+* Git on Windows
+* Capistrano and Git
+* Subversion Integration
+* Subversion Migration
+* Graphical Git – gitgui
+* Hosting Git – Gitorious, GitHub
+* Alternative Uses of Git – TicGit
+* Alternative Uses of Git – Content Distribution
+* Ruby and Git – grit, gruby, Ruby/Git
+* Git and Editors (Textmate, Eclipse, etc)
+
+=== Internals and Plumbing
+
+* How Git Stores Objects (loose and packed)
+* Browsing Git Objects - cat-file, ls-tree, gitk
+* Git References - update-ref
+* The Git Index – ls-files
+* Working with Packfiles unpack, listing pack contents
+* Raw Git git read-tree, write-tree
+
@@ -9,16 +9,11 @@
 <body>
 	<div class="frontcover"></div>
 
-	<div class="halftitlepage">
-		<h1 class="no-toc">Git Community Book</h1>
-		<h2 class="no-toc">What's New</h2>
-	</div>
-
 	<div class="titlepage">
 	<h1 class="no-toc">Git Community Book</h1>
 	<h2 class="no-toc">What's New</h2>
 
-	<p class="no-toc">Scott Chacon</p>
+	<p class="no-toc">by Scott Chacon</p>
 	<!-- also, the publisher's name would typically be printed here -->
 	</div>
 
 
@@ -1,13 +1,14 @@
 require 'rubygems'
-require 'discount'
+require 'rdiscount'
 require "uv"
 
 desc 'Create the HTML version'
 task :html => :merge do
-  if File.exists?('output/full_book.texttile')
-    output = File.new('output/full_book.texttile').read
-    output = Discount.new(output).to_html
+  if File.exists?('output/full_book.markdown')
+    output = File.new('output/full_book.markdown').read
+    output = RDiscount.new(output).to_html
 
+    # code highlighting
     File.open('output/index.html', 'w') do |f|
       html_template = File.new("layout/pdf_template.html").read
       html_template.gsub!("#body", output)
 
@@ -1,7 +1,7 @@
-desc 'Agrupa todos os arquivos em um único arquivo'
+desc 'Merge all of the texttile output into a single file for pdf conversion'
 
 task :merge do
-  File.open('output/full_book.texttile', 'w+') do |f|
+  File.open('output/full_book.markdown', 'w+') do |f|
     Dir["text/**/*.markdown"].sort.each do |path|
       f << File.new(path).read + "\r\n"
     end