Reorder files to alphabetize. Update titles to be more conducive to quick scans.

The posts have been re-dated to not only alphabetize them within their categories, but also to make them easier to find with their directory. Files marked 2008 are active post files. Files marked 2009 are outdated or are redirects to newer files. Files have been renamed to match their title for easier updating.

42 files changed, 40 insertions, 34 deletions

diff --git a/_posts/2009-06-13-linux-set-up-git.markdown b/_posts/2008-01-01-linux-set-up-git.markdown
index 474df21..0d1d92b 100644
--- a/_posts/2009-06-13-linux-set-up-git.markdown
+++ b/_posts/2008-01-01-linux-set-up-git.markdown
@@ -1,10 +1,12 @@
 ---
 layout: default
-title: Set Up Git (Linux)
+title: Set Up Git
 description: A quick guide to help you get started with Git
 ---
 
-<span class="intro">If you&rsquo;ve found yourself on this page, we&rsquo;re assuming you&rsquo;re brand new to Git and GitHub. This guide will walk you through the basics and explain a little bit about how everything works along the way.</span>
+<p class="intro">If you&rsquo;ve found yourself on this page, we&rsquo;re assuming you&rsquo;re brand new to Git and GitHub. This guide will walk you through the basics and explain a little bit about how everything works along the way.</p>
+
+<p class="intro">This is the guide for setting up git in <strong>OSX</strong>. There are also guides for <strong><a href="/mac-set-up-git">OSX</a></strong> and <strong><a href="/win-set-up-git">Windows</a></strong>.</p>
 
 ##<span class="step">First:</span> Download and Install Git
 
diff --git a/_posts/2009-06-13-mac-set-up-git.markdown b/_posts/2008-01-01-mac-set-up-git.markdown
index bf270d5..99f742b 100644
--- a/_posts/2009-06-13-mac-set-up-git.markdown
+++ b/_posts/2008-01-01-mac-set-up-git.markdown
@@ -1,10 +1,12 @@
 ---
 layout: default
-title: Set Up Git (OSX)
+title: Set Up Git
 description: A quick guide to help you get started with Git
 ---
 
-<span class="intro">If you&rsquo;ve found yourself on this page, we&rsquo;re assuming you&rsquo;re brand new to Git and GitHub. This guide will walk you through the basics and explain a little bit about how everything works along the way.</span>
+<p class="intro">If you&rsquo;ve found yourself on this page, we&rsquo;re assuming you&rsquo;re brand new to Git and GitHub. This guide will walk you through the basics and explain a little bit about how everything works along the way.</p>
+
+<p class="intro">This is the guide for setting up git in <strong>OSX</strong>. There are also guides for <strong><a href="/win-set-up-git">Windows</a></strong> and <strong><a href="/linux-set-up-git">Linux</a></strong>.</p>
 
 ##<span class="step">First:</span> Download and Install Git
 
diff --git a/_posts/2009-06-13-win-set-up-git.markdown b/_posts/2008-01-01-win-set-up-git.markdown
index 91e6bd2..a468fab 100644
--- a/_posts/2009-06-13-win-set-up-git.markdown
+++ b/_posts/2008-01-01-win-set-up-git.markdown
@@ -1,10 +1,12 @@
 ---
 layout: default
-title: Set Up Git (Windows)
+title: Set Up Git
 description: A quick guide to help you get started with Git
 ---
 
-<span class="intro">If you&rsquo;ve found yourself on this page, we&rsquo;re assuming you&rsquo;re brand new to Git and GitHub. This guide will walk you through the basics and explain a little bit about how everything works along the way.</span>
+<p class="intro">If you&rsquo;ve found yourself on this page, we&rsquo;re assuming you&rsquo;re brand new to Git and GitHub. This guide will walk you through the basics and explain a little bit about how everything works along the way.</p>
+
+<p class="intro">This is the guide for setting up git in <strong>OSX</strong>. There are also guides for <strong><a href="/mac-set-up-git">OSX</a></strong> and <strong><a href="/linux-set-up-git">Linux</a></strong>.</p>
 
 ##<span class="step">First:</span> Download and Install Git
 
diff --git a/_posts/2008-02-16-create-a-repo.markdown b/_posts/2008-01-02-create-a-repo.markdown
index f10d79e..f10d79e 100644
--- a/_posts/2008-02-16-create-a-repo.markdown
+++ b/_posts/2008-01-02-create-a-repo.markdown
diff --git a/_posts/2009-06-13-fork-a-repo.markdown b/_posts/2008-01-03-fork-a-repo.markdown
index eccf8df..eccf8df 100644
--- a/_posts/2009-06-13-fork-a-repo.markdown
+++ b/_posts/2008-01-03-fork-a-repo.markdown
diff --git a/_posts/2011-02-18-be-social.markdown b/_posts/2008-01-04-be-social.markdown
index 47a7c62..47a7c62 100644
--- a/_posts/2011-02-18-be-social.markdown
+++ b/_posts/2008-01-04-be-social.markdown
diff --git a/_posts/2009-06-25-deleting-a-repo.markdown b/_posts/2008-01-05-delete-a-repo.markdown
index 05da252..fa770ea 100644
--- a/_posts/2009-06-25-deleting-a-repo.markdown
+++ b/_posts/2008-01-05-delete-a-repo.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Deleting a repo
+title: Delete a repo
 description: How to remove a repo from your GitHub account
 categories: beginner
 ---
diff --git a/_posts/2009-06-25-moving-a-repo.markdown b/_posts/2008-01-06-move-a-repo.markdown
index 3f33ac5..c95d3f6 100644
--- a/_posts/2009-06-25-moving-a-repo.markdown
+++ b/_posts/2008-01-06-move-a-repo.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Moving a repo
+title: Move a repo
 description: How to move a repo from one account to another
 categories: beginner
 ---
diff --git a/_posts/2011-04-04-leave-a-repo.markdown b/_posts/2008-01-07-leave-a-collaborative-repo.markdown
index 5e424d9..10ae198 100644
--- a/_posts/2011-04-04-leave-a-repo.markdown
+++ b/_posts/2008-01-07-leave-a-collaborative-repo.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Leave a repo
+title: Leave a collaborative repo
 description: Leave a repo you are collaborating on
 categories: beginner
 ---
diff --git a/_posts/2010-08-29-pull-requests.md b/_posts/2008-01-08-send-pull-requests.md
index f212460..464ca1b 100644
--- a/_posts/2010-08-29-pull-requests.md
+++ b/_posts/2008-01-08-send-pull-requests.md
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Sending pull requests
+title: Send pull requests
 description: How to notify others of your changes using Pull Requests.
 categories: beginner
 ---
diff --git a/_posts/2009-06-20-git-email-settings.markdown b/_posts/2008-01-09-set-your-user-name-email-and-github-token.markdown
index e29eec5..6eaea57 100644
--- a/_posts/2009-06-20-git-email-settings.markdown
+++ b/_posts/2008-01-09-set-your-user-name-email-and-github-token.markdown
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Setting user name, email and GitHub token
+title: Set your user name, email and GitHub token
 description: Configure your local git installation so that commits are linked to your GitHub account
-categories: troubleshooting popular
+categories: beginner popular
 ---
 
 <p class="intro">This guide covers basic git settings you should set before making any commits.</p>
diff --git a/_posts/2010-03-02-changing-author-info.markdown b/_posts/2008-02-01-change-author-info.markdown
index dff42f9..045b056 100644
--- a/_posts/2010-03-02-changing-author-info.markdown
+++ b/_posts/2008-02-01-change-author-info.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Changing author info
+title: Change author info
 description: How to modify author info in your repo's history
 categories: intermediate
 ---
diff --git a/_posts/2010-01-16-deploy-keys.markdown b/_posts/2008-02-02-deploy-keys.markdown
index d08573a..c5f6812 100644
--- a/_posts/2010-01-16-deploy-keys.markdown
+++ b/_posts/2008-02-02-deploy-keys.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Understanding deploy keys
+title: Deploy keys
 description: Do you need a deploy key?
 categories: intermediate
 ---
diff --git a/_posts/2010-01-28-git-ignore.markdown b/_posts/2008-02-03-ignore-files.markdown
index 2c2ad40..cc81daa 100644
--- a/_posts/2010-01-28-git-ignore.markdown
+++ b/_posts/2008-02-03-ignore-files.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Ignoring files
+title: Ignore files
 description: How to tell git to ignore files
 categories: intermediate
 ---
diff --git a/_posts/2010-06-02-svn-importing.markdown b/_posts/2008-02-04-import-from-subversion.markdown
index 59956a8..e50ee0a 100644
--- a/_posts/2010-06-02-svn-importing.markdown
+++ b/_posts/2008-02-04-import-from-subversion.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Importing from Subversion
+title: Import from Subversion
 categories: intermediate
 ---
 
diff --git a/_posts/2009-07-04-git-html-help.markdown b/_posts/2008-02-05-install-git-html-help.markdown
index 6c268b0..579096b 100644
--- a/_posts/2009-07-04-git-html-help.markdown
+++ b/_posts/2008-02-05-install-git-html-help.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Installing Git HTML help
+title: Install Git HTML help
 description: How to install the local git HTML help files
 categories: intermediate
 ---
diff --git a/_posts/2010-01-19-managing-clients.markdown b/_posts/2008-02-06-manage-multiple-clients.markdown
index 6c2e4d5..aba1ce4 100644
--- a/_posts/2010-01-19-managing-clients.markdown
+++ b/_posts/2008-02-06-manage-multiple-clients.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Managing multiple clients
+title: Manage multiple clients
 description: How to manage multiple clients and their repositories
 categories: intermediate
 ---
diff --git a/_posts/2010-01-19-multiple-keys.markdown b/_posts/2008-02-07-multiple-ssh-keys.markdown
index 827d1ea..827d1ea 100644
--- a/_posts/2010-01-19-multiple-keys.markdown
+++ b/_posts/2008-02-07-multiple-ssh-keys.markdown
diff --git a/_posts/2010-01-29-rebase.markdown b/_posts/2008-02-08-rebase.markdown
index 1f4e628..1f4e628 100644
--- a/_posts/2010-01-29-rebase.markdown
+++ b/_posts/2008-02-08-rebase.markdown
diff --git a/_posts/2010-01-27-remotes.markdown b/_posts/2008-02-09-remotes.markdown
index 99ebf51..832c307 100644
--- a/_posts/2010-01-27-remotes.markdown
+++ b/_posts/2008-02-09-remotes.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Working with remotes
+title: Remotes
 description: Pushing, fetching, merging and deleting remote branches
 categories: intermediate
 ---
diff --git a/_posts/2009-09-03-working-with-key-passphrases.textile b/_posts/2008-02-10-ssh-key-passphrases.textile
index 8a0bfc6..c673220 100644
--- a/_posts/2009-09-03-working-with-key-passphrases.textile
+++ b/_posts/2008-02-10-ssh-key-passphrases.textile
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Working with SSH key passphrases
+title: SSH key passphrases
 description: SSH key passphrases, why you should use them, and how to avoid re-entering them
-categories: troubleshooting
+categories: intermediate
 ---
 
 <p class="intro">This guide will step you through the process of securing your ssh keys while avoiding re-entry of your passphrase every time you use the key.</p>
diff --git a/_posts/2010-01-17-capistrano.textile b/_posts/2008-03-01-deploy-capistrano.textile
index 44073b6..8d54682 100644
--- a/_posts/2010-01-17-capistrano.textile
+++ b/_posts/2008-03-01-deploy-capistrano.textile
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Deploying with Capistrano
+title: Deploy with Capistrano
 description: How to set up capistrano to pull from a GitHub repo
 categories: advanced
 ---
diff --git a/_posts/2009-10-16-post-receive-hooks.markdown b/_posts/2008-03-02-post-receive-hooks.markdown
index 7ce36d5..7ce36d5 100644
--- a/_posts/2009-10-16-post-receive-hooks.markdown
+++ b/_posts/2008-03-02-post-receive-hooks.markdown
diff --git a/_posts/2009-09-09-removing-sensitive-data.markdown b/_posts/2008-03-03-remove-sensitive-data.markdown
index c7719ce..8f7b9f3 100644
--- a/_posts/2009-09-09-removing-sensitive-data.markdown
+++ b/_posts/2008-03-03-remove-sensitive-data.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Removing sensitive data
+title: Remove sensitive data
 description: Dealing with accidentally committed passwords or other sensitive information
 categories: popular advanced
 terminal_pres: true
diff --git a/_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.md b/_posts/2008-03-04-split-a-subpath-to-a-new-repo.md
index 1b051a0..608c994 100644
--- a/_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.md
+++ b/_posts/2008-03-04-split-a-subpath-to-a-new-repo.md
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Splitting a subpath out into a new repo
+title: Split a subpath into a new repo
 description: How to generate a new repo from a subpath, retaining history.
 categories: advanced
 ---
diff --git a/_posts/2009-10-10-subtree-merge.markdown b/_posts/2008-03-05-subtree-merge.markdown
index 3c50e76..31645e5 100644
--- a/_posts/2009-10-10-subtree-merge.markdown
+++ b/_posts/2008-03-05-subtree-merge.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Working with subtree merge
+title: Subtree Merge
 description: How to use subtree merge to merge one repo into another as a subpath.
 categories: advanced
 ---
diff --git a/_posts/2009-11-17-testing-webhooks.textile b/_posts/2008-03-06-test-webhooks.textile
index 6f4fb50..cf760ae 100644
--- a/_posts/2009-11-17-testing-webhooks.textile
+++ b/_posts/2008-03-06-test-webhooks.textile
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Testing webhooks
+title: Test webhooks
 description: How to test post-receive webhook calls from your repo
 categories: advanced
 ---
diff --git a/_posts/2009-06-16-troubleshooting-common-issues.markdown b/_posts/2008-04-01-common-issues-and-questions.markdown
index fc886c0..fc886c0 100644
--- a/_posts/2009-06-16-troubleshooting-common-issues.markdown
+++ b/_posts/2008-04-01-common-issues-and-questions.markdown
diff --git a/_posts/2010-06-03-firewalls-and-proxies.markdown b/_posts/2008-04-02-firewalls-and-proxies.markdown
index ab06515..47647dc 100644
--- a/_posts/2010-06-03-firewalls-and-proxies.markdown
+++ b/_posts/2008-04-02-firewalls-and-proxies.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Dealing with firewalls and proxies
+title: Firewalls and proxies
 categories: troubleshooting
 ---
 
diff --git a/_posts/2011-03-07-egit-bad-tree.markdown b/_posts/2008-04-03-fix-a-bad-tree.markdown
index 42341dc..95be750 100644
--- a/_posts/2011-03-07-egit-bad-tree.markdown
+++ b/_posts/2008-04-03-fix-a-bad-tree.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Fixing bad tree
+title: Fix a bad tree
 description: How to fix the bad tree error on a github repo caused by egit
 categories: troubleshooting
 ---
diff --git a/_posts/2009-11-16-egit-corruption.markdown b/_posts/2008-04-04-fix-egit-corruption.markdown
index eb6f95c..1c3a6fc 100644
--- a/_posts/2009-11-16-egit-corruption.markdown
+++ b/_posts/2008-04-04-fix-egit-corruption.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Fixing egit corruption
+title: Fix egit corruption
 description: How to fix corruption in a remote repo caused by egit
 categories: troubleshooting
 ---
diff --git a/_posts/2009-10-05-dealing-with-lineendings.textile b/_posts/2008-04-05-line-endings.textile
index 77f0572..3a51f09 100644
--- a/_posts/2009-10-05-dealing-with-lineendings.textile
+++ b/_posts/2008-04-05-line-endings.textile
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Dealing with line endings
+title: Line endings
 description: How to ensure that line endings are consistent in your repo
 categories: troubleshooting
 ---
diff --git a/_posts/2009-06-17-troubleshooting-ssh.textile b/_posts/2008-04-06-ssh-issues.textile
index 7e58cf8..45c6caa 100644
--- a/_posts/2009-06-17-troubleshooting-ssh.textile
+++ b/_posts/2008-04-06-ssh-issues.textile
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Troubleshooting SSH issues
+title: SSH issues
 description: Solutions to common SSH issues
 categories: troubleshooting popular
 main_category: troubleshooting
diff --git a/_posts/2010-01-19-textmate.markdown b/_posts/2008-05-01-textmate.markdown
index 9ad9333..9ad9333 100644
--- a/_posts/2010-01-19-textmate.markdown
+++ b/_posts/2008-05-01-textmate.markdown
diff --git a/_posts/2009-11-03-userscripts-and-bookmarklets.textile b/_posts/2008-06-01-userscripts-and-bookmarklets.textile
index d8b6db6..d8b6db6 100644
--- a/_posts/2009-11-03-userscripts-and-bookmarklets.textile
+++ b/_posts/2008-06-01-userscripts-and-bookmarklets.textile
diff --git a/_posts/2010-10-14-git-cheat-sheets.textile b/_posts/2008-07-01-git-cheat-sheets.textile
index ff97611..ff97611 100644
--- a/_posts/2010-10-14-git-cheat-sheets.textile
+++ b/_posts/2008-07-01-git-cheat-sheets.textile
diff --git a/_posts/2010-01-12-privacy.markdown b/_posts/2008-08-01-privacy-policy.markdown
index d83ac0c..248e664 100644
--- a/_posts/2010-01-12-privacy.markdown
+++ b/_posts/2008-08-01-privacy-policy.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: GitHub Privacy Policy
+title: Privacy Policy
 categories: site_policy
 ---
 
diff --git a/_posts/2009-06-23-security.markdown b/_posts/2008-08-02-security.markdown
index b136465..e398ba7 100644
--- a/_posts/2009-06-23-security.markdown
+++ b/_posts/2008-08-02-security.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: GitHub Security
+title: Security
 categories: site_policy
 ---
 
diff --git a/_posts/2010-01-12-terms.markdown b/_posts/2008-08-03-terms-of-service.markdown
index 5e484c0..00b6082 100644
--- a/_posts/2010-01-12-terms.markdown
+++ b/_posts/2008-08-03-terms-of-service.markdown
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: GitHub Terms of Service
+title: Terms of Service
 categories: site_policy
 ---
 
diff --git a/_posts/2010-01-15-dmca.markdown b/_posts/2008-08-04-dmca-takedown.markdown
index 3efab6a..3efab6a 100644
--- a/_posts/2010-01-15-dmca.markdown
+++ b/_posts/2008-08-04-dmca-takedown.markdown
diff --git a/_posts/2008-02-15-set-up-git-redirect.markdown b/_posts/2009-01-01-set-up-git-redirect.markdown
index afecf45..afecf45 100644
--- a/_posts/2008-02-15-set-up-git-redirect.markdown
+++ b/_posts/2009-01-01-set-up-git-redirect.markdown
diff --git a/_posts/2009-06-11-forking.markdown b/_posts/2009-01-30-forking.markdown
index aaf8b5b..aaf8b5b 100644
--- a/_posts/2009-06-11-forking.markdown
+++ b/_posts/2009-01-30-forking.markdown