Merge pull request #30 from github/reorder-nav

Reorder nav, reduce each post to one category, rename for usability

68 files changed, 191 insertions, 119 deletions

diff --git a/_posts/2009-06-13-linux-set-up-git.markdown b/_posts/2008-01-01-linux-set-up-git.markdown
index b1968d4..0d1d92b 100644
--- a/_posts/2009-06-13-linux-set-up-git.markdown
+++ b/_posts/2008-01-01-linux-set-up-git.markdown
@@ -1,11 +1,12 @@
 ---
 layout: default
-title: Set Up Git (Linux)
+title: Set Up Git
 description: A quick guide to help you get started with Git
-categories: linux
 ---
 
-<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 ab060ad..99f742b 100644
--- a/_posts/2009-06-13-mac-set-up-git.markdown
+++ b/_posts/2008-01-01-mac-set-up-git.markdown
@@ -1,11 +1,12 @@
 ---
 layout: default
-title: Set Up Git (OSX)
+title: Set Up Git
 description: A quick guide to help you get started with Git
-categories: mac
 ---
 
-<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/2008-02-15-set-up-git-redirect.markdown b/_posts/2008-01-01-set-up-git-redirect.markdown
index c8d5858..afecf45 100644
--- a/_posts/2008-02-15-set-up-git-redirect.markdown
+++ b/_posts/2008-01-01-set-up-git-redirect.markdown
@@ -2,7 +2,7 @@
 layout: os_redirect
 title: Set Up Git
 description: A quick guide to help you get started with Git
-categories: bootcamp
+categories: beginner
 redirect_win: /win-set-up-git
 redirect_mac: /mac-set-up-git
 redirect_linux: /linux-set-up-git
diff --git a/_posts/2009-06-13-win-set-up-git.markdown b/_posts/2008-01-01-win-set-up-git.markdown
index ffb1467..681252a 100644
--- a/_posts/2009-06-13-win-set-up-git.markdown
+++ b/_posts/2008-01-01-win-set-up-git.markdown
@@ -1,11 +1,12 @@
 ---
 layout: default
-title: Set Up Git (Windows)
+title: Set Up Git
 description: A quick guide to help you get started with Git
-categories: windows
 ---
 
-<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 d15501a..f10d79e 100644
--- a/_posts/2008-02-16-create-a-repo.markdown
+++ b/_posts/2008-01-02-create-a-repo.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Create A Repo
 description: Create the place where your commits will be stored
-categories: bootcamp
+categories: beginner
 ---
 
 <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>
diff --git a/_posts/2009-06-13-fork-a-repo.markdown b/_posts/2008-01-03-fork-a-repo.markdown
index 8e8d3e1..eccf8df 100644
--- a/_posts/2009-06-13-fork-a-repo.markdown
+++ b/_posts/2008-01-03-fork-a-repo.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Fork A Repo
 description: Copy a repo to create a new, unique project from its contents.
-categories: bootcamp collaborating
+categories: beginner
 ---
 
 <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>
diff --git a/_posts/2011-02-18-be-social.markdown b/_posts/2008-01-04-be-social.markdown
index 37693dd..8e3ec81 100644
--- a/_posts/2011-02-18-be-social.markdown
+++ b/_posts/2008-01-04-be-social.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Be Social
 description: Follow a friend. Watch a project.
-categories: bootcamp
+categories: beginner
 ---
 
 <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>
diff --git a/_posts/2009-06-25-deleting-a-repo.markdown b/_posts/2008-01-05-delete-a-repo.markdown
index 3b67373..fa770ea 100644
--- a/_posts/2009-06-25-deleting-a-repo.markdown
+++ b/_posts/2008-01-05-delete-a-repo.markdown
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Deleting a repo
+title: Delete a repo
 description: How to remove a repo from your GitHub account
-categories: repos
+categories: beginner
 ---
 
 <p class="attention">Deleting a private repo will delete all forks of the repo.  Deleting a public repo will not.</p>
diff --git a/_posts/2009-06-25-moving-a-repo.markdown b/_posts/2008-01-06-move-a-repo.markdown
index dd60665..c95d3f6 100644
--- a/_posts/2009-06-25-moving-a-repo.markdown
+++ b/_posts/2008-01-06-move-a-repo.markdown
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Moving a repo
+title: Move a repo
 description: How to move a repo from one account to another
-categories: repos
+categories: beginner
 ---
 
 This guide details the process of moving a repo to another account.
diff --git a/_posts/2011-04-04-leave-a-repo.markdown b/_posts/2008-01-07-leave-a-collaborative-repo.markdown
index 8148be8..10ae198 100644
--- a/_posts/2011-04-04-leave-a-repo.markdown
+++ b/_posts/2008-01-07-leave-a-collaborative-repo.markdown
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Leave a repo
+title: Leave a collaborative repo
 description: Leave a repo you are collaborating on
-categories: collaborating
+categories: beginner
 ---
 
 To leave a repository on which you are collaborating:
diff --git a/_posts/2010-08-29-pull-requests.md b/_posts/2008-01-08-send-pull-requests.md
index f1a3737..d45bbf0 100644
--- a/_posts/2010-08-29-pull-requests.md
+++ b/_posts/2008-01-08-send-pull-requests.md
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Sending pull requests
+title: Send pull requests
 description: How to notify others of your changes using Pull Requests.
-categories: collaborating
+categories: beginner
 ---
 
 <style type="text/css">
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 76890c9..045b056 100644
--- a/_posts/2010-03-02-changing-author-info.markdown
+++ b/_posts/2008-02-01-change-author-info.markdown
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Changing author info
+title: Change author info
 description: How to modify author info in your repo's history
-categories: git_ninjutsu
+categories: intermediate
 ---
 
 <p class="intro">If you need to modify the author info in your repo's history, you can do so with this script.</p>
diff --git a/_posts/2010-01-16-deploy-keys.markdown b/_posts/2008-02-02-deploy-keys.markdown
index 0d24a79..c5f6812 100644
--- a/_posts/2010-01-16-deploy-keys.markdown
+++ b/_posts/2008-02-02-deploy-keys.markdown
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Understanding deploy keys
+title: Deploy keys
 description: Do you need a deploy key?
-categories: deploying
+categories: intermediate
 ---
 
 <p class="intro">Deploy keys are a handy yet misunderstood feature here on github.  This guide will explain when and how to use them instead of normal user keys.</p>
diff --git a/_posts/2010-01-28-git-ignore.markdown b/_posts/2008-02-03-ignore-files.markdown
index a05a6a5..cc81daa 100644
--- a/_posts/2010-01-28-git-ignore.markdown
+++ b/_posts/2008-02-03-ignore-files.markdown
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Ignoring files
+title: Ignore files
 description: How to tell git to ignore files
-categories: everyday_git
+categories: intermediate
 ---
 
 <p class="intro">From time to time there are files you don't want git to track. There are a few methods of telling git what files to ignore.</p>
diff --git a/_posts/2010-06-02-svn-importing.markdown b/_posts/2008-02-04-import-from-subversion.markdown
index 015a5c4..e50ee0a 100644
--- a/_posts/2010-06-02-svn-importing.markdown
+++ b/_posts/2008-02-04-import-from-subversion.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
-title: Importing from Subversion
-categories: other
+title: Import from Subversion
+categories: intermediate
 ---
 
 <p class="intro">GitHub can directly import SVN projects.  All you need is the repository URL.  After creating a repo you can pick "Import a Subversion Repository" option:</p>
diff --git a/_posts/2009-07-04-git-html-help.markdown b/_posts/2008-02-05-install-git-html-help.markdown
index d77d28f..579096b 100644
--- a/_posts/2009-07-04-git-html-help.markdown
+++ b/_posts/2008-02-05-install-git-html-help.markdown
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Installing Git HTML help
+title: Install Git HTML help
 description: How to install the local git HTML help files
-categories: other
+categories: intermediate
 ---
 
 <p class="intro">This guide will help you install the local git HTML help files and set git to use them by default instead of the man pages.</p>
diff --git a/_posts/2010-01-19-managing-clients.markdown b/_posts/2008-02-06-manage-multiple-clients.markdown
index 6f04720..aba1ce4 100644
--- a/_posts/2010-01-19-managing-clients.markdown
+++ b/_posts/2008-02-06-manage-multiple-clients.markdown
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Managing multiple clients
+title: Manage multiple clients
 description: How to manage multiple clients and their repositories
-categories: collaborating
+categories: intermediate
 ---
 
 <p class="intro">Are you a freelance developer working on multiple projects for multiple clients, and want to manage them here on GitHub?  Never fear, this guide will detail the most common solutions to this problem.</p>
diff --git a/_posts/2010-01-19-multiple-keys.markdown b/_posts/2008-02-07-multiple-ssh-keys.markdown
index ea687ff..827d1ea 100644
--- a/_posts/2010-01-19-multiple-keys.markdown
+++ b/_posts/2008-02-07-multiple-ssh-keys.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Multiple SSH keys
 description: How to push using different SSH keys on the same computer
-categories: other
+categories: intermediate
 ---
 
 <p class="intro">This guide assumes you have already created two keypairs and attached them to different GitHub user accounts.  For this example we will be using <code>~/.ssh/id_rsa</code> attached to the user <code>joe</code> and <code>~/.ssh/id_rsa_client</code> attached to the user <code>client</code>.</p>
diff --git a/_posts/2010-01-29-rebase.markdown b/_posts/2008-02-08-rebase.markdown
index 40539cf..1f4e628 100644
--- a/_posts/2010-01-29-rebase.markdown
+++ b/_posts/2008-02-08-rebase.markdown
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: All your rebase
+title: Rebase
 description: Using git rebase to restructure a branch
-categories: everyday_git
+categories: intermediate
 ---
 
 <p class="intro">One often overlooked feature of git is the <code>git rebase</code> command. Rebase allows you to easily change a series of commits, reordering, editing, or squashing commits together into a single commit.</p>
diff --git a/_posts/2010-01-27-remotes.markdown b/_posts/2008-02-09-remotes.markdown
index 6413e9c..832c307 100644
--- a/_posts/2010-01-27-remotes.markdown
+++ b/_posts/2008-02-09-remotes.markdown
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Working with remotes
+title: Remotes
 description: Pushing, fetching, merging and deleting remote branches
-categories: everyday_git
+categories: intermediate
 ---
 
 <p class="intro">This guide will cover all the basic day-to-day commands you will use with git to interact with remote repos.  For push operations you can only interact with repos you own or are a collaborator on.  To gain access to a public repo, check out the <a href="/forking">forking guide</a>.</p>
diff --git a/_posts/2009-09-03-working-with-key-passphrases.textile b/_posts/2008-02-10-ssh-key-passphrases.textile
index e585983..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: windows mac 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-with-capistrano.textile
index 6c351ff..8d54682 100644
--- a/_posts/2010-01-17-capistrano.textile
+++ b/_posts/2008-03-01-deploy-with-capistrano.textile
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Deploying with Capistrano
+title: Deploy with Capistrano
 description: How to set up capistrano to pull from a GitHub repo
-categories: deploying
+categories: advanced
 ---
 
 To prepare your project for "Capistrano":http://www.capify.org/, go into the root directory of that project and run @capify@:
diff --git a/_posts/2009-10-16-post-receive-hooks.markdown b/_posts/2008-03-02-post-receive-hooks.markdown
index 80a5d65..7ce36d5 100644
--- a/_posts/2009-10-16-post-receive-hooks.markdown
+++ b/_posts/2008-03-02-post-receive-hooks.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Post-Receive Hooks
 description: Working with GitHub's post-receive web hooks.
-categories: collaborating
+categories: advanced
 ---
 
 _For help testing webhooks, see [this guide](/testing-webhooks)_
diff --git a/_posts/2009-09-09-removing-sensitive-data.markdown b/_posts/2008-03-03-remove-sensitive-data.markdown
index ed316ed..8f7b9f3 100644
--- a/_posts/2009-09-09-removing-sensitive-data.markdown
+++ b/_posts/2008-03-03-remove-sensitive-data.markdown
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Removing sensitive data
+title: Remove sensitive data
 description: Dealing with accidentally committed passwords or other sensitive information
-categories: popular git_ninjutsu
+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-into-a-new-repo.md
index 5f36bab..608c994 100644
--- a/_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.md
+++ b/_posts/2008-03-04-split-a-subpath-into-a-new-repo.md
@@ -1,8 +1,8 @@
 ---
 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: git_ninjutsu
+categories: advanced
 ---
 
 <p class="intro">From time to time you may find that you want to make a new repo from a subpath of an existing repo.  Perhaps you're moving some code out into a library or just want to have a common submodule across projects.  Thanks to git, it's easy to do this without losing the history of that subpath in the process.</p>
diff --git a/_posts/2009-10-10-subtree-merge.markdown b/_posts/2008-03-05-subtree-merge.markdown
index ab3ef49..31645e5 100644
--- a/_posts/2009-10-10-subtree-merge.markdown
+++ b/_posts/2008-03-05-subtree-merge.markdown
@@ -1,8 +1,8 @@
 ---
 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: git_ninjutsu
+categories: advanced
 ---
 
 <p class="intro">There are times when submodules are not adequate for the task at hand.  For example, blending multiple repos together into one single repo while still maintaining the history of each repo.  To do this, the subtree merge strategy is a better solution.</p>
diff --git a/_posts/2009-11-17-testing-webhooks.textile b/_posts/2008-03-06-test-webhooks.textile
index 4f46191..cf760ae 100644
--- a/_posts/2009-11-17-testing-webhooks.textile
+++ b/_posts/2008-03-06-test-webhooks.textile
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Testing webhooks
+title: Test webhooks
 description: How to test post-receive webhook calls from your repo
-categories: collaborating troubleshooting
+categories: advanced
 ---
 
 <p class="intro">Testing that a webhook works can be a bit of a pain.  Thankfully with the help of "PostBin":http://www.postbin.org/ the pain can be avoided.</p>
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 3296e3d..3a51f09 100644
--- a/_posts/2009-10-05-dealing-with-lineendings.textile
+++ b/_posts/2008-04-05-line-endings.textile
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Dealing with line endings
+title: Line endings
 description: How to ensure that line endings are consistent in your repo
-categories: troubleshooting windows mac linux
+categories: troubleshooting
 ---
 
 <p class="intro">Line endings... the scourge of every Windows-based developer that tries to mingle with linux- or mac-based developers.  Though most modern text editors can handle both newline types without issue, git is not as graceful.</p>
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 ae9de76..9ad9333 100644
--- a/_posts/2010-01-19-textmate.markdown
+++ b/_posts/2008-05-01-textmate.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Textmate
 description: How to use Textmate as your git editor
-categories: mac
+categories: third_party
 ---
 
 Using Textmate as your git editor is fairly simple, you just need to to make sure Textmate informs git when the document is closed.  You can do this by using `mate -w`:
diff --git a/_posts/2009-11-03-userscripts-and-bookmarklets.textile b/_posts/2008-06-01-userscripts-and-bookmarklets.textile
index 01f5325..d8b6db6 100644
--- a/_posts/2009-11-03-userscripts-and-bookmarklets.textile
+++ b/_posts/2008-06-01-userscripts-and-bookmarklets.textile
@@ -2,7 +2,7 @@
 layout: default
 title: Userscripts and Bookmarklets
 description: Various bits of code to enhance and personalize GitHub
-categories: other
+categories: github_resources
 ---
 
 This page contains userscripts and bookmarklets to enhance and customize GitHub.  If you have a link to add, please "fork this repo":http://github.com/github/help.github.com.
diff --git a/_posts/2010-10-14-git-cheat-sheets.textile b/_posts/2008-07-01-git-cheat-sheets.textile
index 50b5449..ff97611 100644
--- a/_posts/2010-10-14-git-cheat-sheets.textile
+++ b/_posts/2008-07-01-git-cheat-sheets.textile
@@ -2,7 +2,7 @@
 layout: default
 title: Git cheat sheets
 description: Quick-reference guides to git
-categories: everyday_git
+categories: git_resources
 ---
 
 h3. Cheat sheets
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/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
diff --git a/_posts/2009-06-24-creating-a-repo.markdown b/_posts/2009-06-24-creating-a-repo.markdown
index 515e4c2..0c87474 100644
--- a/_posts/2009-06-24-creating-a-repo.markdown
+++ b/_posts/2009-06-24-creating-a-repo.markdown
@@ -1,20 +1,6 @@
 ---
-layout: default
+layout: redirect
 title: Creating a repo
 description: How to create a new repo on GitHub
-categories: repos
----
-
-Creating a new repo is a simple process.  Log in and go to the [dashboard](https://github.com/).
-
-Click "New Repository" on the right side of the page:
-
-![](http://img.skitch.com/20100527-nbjhrwesgdjye6nieddmqfigbt.png)
-
-Fill in the form (only the name is required):
-
-![](http://img.skitch.com/20100527-dih5dmamhfqhwr65hsa3eek6aj.png)
-
-After the repo is created, you'll be presented with the empty repo page.  This page provides instructions on how to create a new local repo, push an existing repo, or import from an SVN repo.
-
-![](http://img.skitch.com/20100527-r6h2yp7m8tuxdfhppepjdsetfb.png)
\ No newline at end of file
+redirect_to: /create-a-repo
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-capistrano.textile b/_posts/2010-01-01-capistrano.textile
new file mode 100644
index 0000000..f2b3aea
--- /dev/null
+++ b/_posts/2010-01-01-capistrano.textile
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Capistrano
+redirect_to: /deploy-with-capistrano
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-changing-author-info.markdown b/_posts/2010-01-01-changing-author-info.markdown
new file mode 100644
index 0000000..37ed782
--- /dev/null
+++ b/_posts/2010-01-01-changing-author-info.markdown
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Changing author info
+redirect_to: /change-author-info
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-dealing-with-lineendings.textile b/_posts/2010-01-01-dealing-with-lineendings.textile
new file mode 100644
index 0000000..8b695e3
--- /dev/null
+++ b/_posts/2010-01-01-dealing-with-lineendings.textile
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Dealing with line endings
+redirect_to: /line-endings
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-deleting-a-repo.markdown b/_posts/2010-01-01-deleting-a-repo.markdown
new file mode 100644
index 0000000..65d27de
--- /dev/null
+++ b/_posts/2010-01-01-deleting-a-repo.markdown
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Deleting a repo
+redirect_to: /delete-a-repo
+---
diff --git a/_posts/2010-01-01-dmca.md b/_posts/2010-01-01-dmca.md
new file mode 100644
index 0000000..9a950e6
--- /dev/null
+++ b/_posts/2010-01-01-dmca.md
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: DMCA Takedown
+redirect_to: /dmca-takedown
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-egit-bad-tree.markdown b/_posts/2010-01-01-egit-bad-tree.markdown
new file mode 100644
index 0000000..256537e
--- /dev/null
+++ b/_posts/2010-01-01-egit-bad-tree.markdown
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Fixing bad tree
+redirect_to: /fix-a-bad-tree
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-egit-corruption.markdown b/_posts/2010-01-01-egit-corruption.markdown
new file mode 100644
index 0000000..5839252
--- /dev/null
+++ b/_posts/2010-01-01-egit-corruption.markdown
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Fixing egit corruption
+redirect_to: /fix-egit-corruption
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-git-email-settings.markdown b/_posts/2010-01-01-git-email-settings.markdown
new file mode 100644
index 0000000..cd85a2b
--- /dev/null
+++ b/_posts/2010-01-01-git-email-settings.markdown
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Setting user name, email and GitHub token
+redirect_to: /set-your-user-name-email-and-github-token
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-git-html-help.markdown b/_posts/2010-01-01-git-html-help.markdown
new file mode 100644
index 0000000..c54f035
--- /dev/null
+++ b/_posts/2010-01-01-git-html-help.markdown
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Installing Git HTML help
+redirect_to: /install-git-html-help
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-git-ignore.markdown b/_posts/2010-01-01-git-ignore.markdown
new file mode 100644
index 0000000..69f9847
--- /dev/null
+++ b/_posts/2010-01-01-git-ignore.markdown
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Ignoring files
+redirect_to: /ignore-files
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-leave-a-repo.markdown b/_posts/2010-01-01-leave-a-repo.markdown
new file mode 100644
index 0000000..14c5484
--- /dev/null
+++ b/_posts/2010-01-01-leave-a-repo.markdown
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Leave a repo
+redirect_to: /leave-a-collaborative-repo
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-managing-clients.markdown b/_posts/2010-01-01-managing-clients.markdown
new file mode 100644
index 0000000..31d8198
--- /dev/null
+++ b/_posts/2010-01-01-managing-clients.markdown
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Managing multiple clients
+redirect_to: /manage-multiple-clients
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-moving-a-repo.markdown b/_posts/2010-01-01-moving-a-repo.markdown
new file mode 100644
index 0000000..c3d238a
--- /dev/null
+++ b/_posts/2010-01-01-moving-a-repo.markdown
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Moving a repo
+redirect_to: /move-a-repo
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-multiple-keys.markdown b/_posts/2010-01-01-multiple-keys.markdown
new file mode 100644
index 0000000..80c8651
--- /dev/null
+++ b/_posts/2010-01-01-multiple-keys.markdown
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Multiple SSH keys
+redirect_to: /multiple-ssh-keys
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-privacy.markdown b/_posts/2010-01-01-privacy.markdown
new file mode 100644
index 0000000..9a9e0bd
--- /dev/null
+++ b/_posts/2010-01-01-privacy.markdown
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: GitHub Privacy Policy
+redirect_to: /privacy-policy
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-pull-requests.md b/_posts/2010-01-01-pull-requests.md
new file mode 100644
index 0000000..ddaedac
--- /dev/null
+++ b/_posts/2010-01-01-pull-requests.md
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Sending pull requests
+redirect_to: /send-pull-requests
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-removing-sensitive-data.markdown b/_posts/2010-01-01-removing-sensitive-data.markdown
new file mode 100644
index 0000000..ea4a467
--- /dev/null
+++ b/_posts/2010-01-01-removing-sensitive-data.markdown
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Removing sensitive data
+redirect_to: /remove-sensitive-data
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-splitting-a-subpath-to-a-new-repo.md b/_posts/2010-01-01-splitting-a-subpath-to-a-new-repo.md
new file mode 100644
index 0000000..4b77996
--- /dev/null
+++ b/_posts/2010-01-01-splitting-a-subpath-to-a-new-repo.md
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Splitting a subpath out into a new repo
+redirect_to: /split-a-subpath-into-a-new-repo
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-svn-importing.markdown b/_posts/2010-01-01-svn-importing.markdown
new file mode 100644
index 0000000..e12c5ca
--- /dev/null
+++ b/_posts/2010-01-01-svn-importing.markdown
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Importing from Subversion
+redirect_to: /import-from-subversion
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-terms.markdown b/_posts/2010-01-01-terms.markdown
new file mode 100644
index 0000000..9cad0fa
--- /dev/null
+++ b/_posts/2010-01-01-terms.markdown
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: GitHub Terms of Service
+redirect_to: /terms-of-service
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-testing-webhooks.textile b/_posts/2010-01-01-testing-webhooks.textile
new file mode 100644
index 0000000..bfb7892
--- /dev/null
+++ b/_posts/2010-01-01-testing-webhooks.textile
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Testing webhooks
+redirect_to: /test-webhooks
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-troubleshooting-common-issues.md b/_posts/2010-01-01-troubleshooting-common-issues.md
new file mode 100644
index 0000000..3a6a9f3
--- /dev/null
+++ b/_posts/2010-01-01-troubleshooting-common-issues.md
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Troubleshooting Common Issues
+redirect_to: /common-issues-and-questions
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-troubleshooting-ssh.textile b/_posts/2010-01-01-troubleshooting-ssh.textile
new file mode 100644
index 0000000..0a28143
--- /dev/null
+++ b/_posts/2010-01-01-troubleshooting-ssh.textile
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Troubleshooting SSH issues
+redirect_to: /ssh-issues
+---
\ No newline at end of file
diff --git a/_posts/2010-01-01-working-with-key-passphrases.textile b/_posts/2010-01-01-working-with-key-passphrases.textile
new file mode 100644
index 0000000..52f2685
--- /dev/null
+++ b/_posts/2010-01-01-working-with-key-passphrases.textile
@@ -0,0 +1,5 @@
+---
+layout: redirect
+title: Working with SSH key passphrases
+redirect_to: /ssh-key-passphrases
+---
\ No newline at end of file
diff --git a/_posts/2010-01-16-api.markdown b/_posts/2010-01-16-api.markdown
deleted file mode 100644
index fbc1e41..0000000
--- a/_posts/2010-01-16-api.markdown
+++ /dev/null
@@ -1,37 +0,0 @@
----
-layout: default
-title: GitHub API
-categories: other
----
-
-The GitHub API is documented at <http://develop.github.com>
-
-Projects using the API
-======================
-
-* [GitHub Badge](http://drnicjavascript.rubyforge.org/github_badge/)  (see also [initial blog post](http://drnicwilliams.com/2008/05/03/github-badge-for-your-blog/))
-
-* [Badjo](http://github.com/zmack/badjo/tree/master)
-
-* [YAGHB](http://github.com/schleyfox/yaghb/tree/master) -- Yet another github badge
-
-* [textmate gem](http://github.com/wycats/textmate/) -- Command-line package manager for textmate
-
-* [github commit badge](https://github.com/heipei/github-commit-badge/tree) -- GitHub commit badge, showing the most recent commits of chosen repos
-
-* GitHub Projects Wordpress Plug-in -- Available at the official Wordpress [plug-in directory](http://wordpress.org/extend/plugins/github-projects/)
-
-* [github-repos](http://github.com/johnbender/github-repos/tree/master) -- [Tutorial and Example](http://nickelcode.com/2008/11/27/github-repo-information-in-your-webpages/)
-
-* [github-terminal](http://github.com/prtksxna/github-terminal/tree/master), working example at [Github Terminal](http://prtksxna.github.com/github-terminal/)
-
-* [git-trip](http://github.com/Oshuma/git-trip/tree) -- Visualize git repositories.
-
-* [github-social-badge](http://github.com/kentbrew/github-social-badge) -- Social badge: visualize projects and followers.  [Working example](http://kentbrew.github.com)
-
-* [codeigniter-github](http://github.com/philsturgeon/codeigniter-github/tree/master) -- CodeIgniter / PHP wrapper library.
-
-* [github user page bookmarklet](http://tagaholic.me/2009/04/06/github-bookmarklet-for-user-pages.html) -- adds additional repo stats to github user pages and provides repository sorting.
-
-* [GithubNotifier](http://github.com/ctshryock/GithubNotifier) -- Little OS X menu-bar app that posts Growl notifications from your Github network activity.
-* [ForkFeed](http://github.com/svetlyak40wt/forkfeed) -- Utility to track changes in all forks of your projects on GitHub.