add new categories

21 files changed, 22 insertions, 22 deletions

diff --git a/_posts/2009-09-09-removing-sensitive-data.markdown b/_posts/2009-09-09-removing-sensitive-data.markdown
index ed316ed..c7719ce 100644
--- a/_posts/2009-09-09-removing-sensitive-data.markdown
+++ b/_posts/2009-09-09-removing-sensitive-data.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Removing 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/2009-09-27-splitting-a-subpath-to-a-new-repo.md
index 5f36bab..1b051a0 100644
--- a/_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.md
+++ b/_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.md
@@ -2,7 +2,7 @@
 layout: default
 title: Splitting a subpath out 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-05-dealing-with-lineendings.textile b/_posts/2009-10-05-dealing-with-lineendings.textile
index 3296e3d..77f0572 100644
--- a/_posts/2009-10-05-dealing-with-lineendings.textile
+++ b/_posts/2009-10-05-dealing-with-lineendings.textile
@@ -2,7 +2,7 @@
 layout: default
 title: Dealing with 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-10-10-subtree-merge.markdown b/_posts/2009-10-10-subtree-merge.markdown
index ab3ef49..3c50e76 100644
--- a/_posts/2009-10-10-subtree-merge.markdown
+++ b/_posts/2009-10-10-subtree-merge.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Working with 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-10-16-post-receive-hooks.markdown b/_posts/2009-10-16-post-receive-hooks.markdown
index 80a5d65..7ce36d5 100644
--- a/_posts/2009-10-16-post-receive-hooks.markdown
+++ b/_posts/2009-10-16-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-11-03-userscripts-and-bookmarklets.textile b/_posts/2009-11-03-userscripts-and-bookmarklets.textile
index 01f5325..d8b6db6 100644
--- a/_posts/2009-11-03-userscripts-and-bookmarklets.textile
+++ b/_posts/2009-11-03-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/2009-11-17-testing-webhooks.textile b/_posts/2009-11-17-testing-webhooks.textile
index 4f46191..6f4fb50 100644
--- a/_posts/2009-11-17-testing-webhooks.textile
+++ b/_posts/2009-11-17-testing-webhooks.textile
@@ -2,7 +2,7 @@
 layout: default
 title: Testing 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/2010-01-16-deploy-keys.markdown b/_posts/2010-01-16-deploy-keys.markdown
index 0d24a79..d08573a 100644
--- a/_posts/2010-01-16-deploy-keys.markdown
+++ b/_posts/2010-01-16-deploy-keys.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Understanding 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-17-capistrano.textile b/_posts/2010-01-17-capistrano.textile
index 6c351ff..44073b6 100644
--- a/_posts/2010-01-17-capistrano.textile
+++ b/_posts/2010-01-17-capistrano.textile
@@ -2,7 +2,7 @@
 layout: default
 title: Deploying 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/2010-01-19-managing-clients.markdown b/_posts/2010-01-19-managing-clients.markdown
index 6f04720..6c2e4d5 100644
--- a/_posts/2010-01-19-managing-clients.markdown
+++ b/_posts/2010-01-19-managing-clients.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Managing 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/2010-01-19-multiple-keys.markdown
index ea687ff..827d1ea 100644
--- a/_posts/2010-01-19-multiple-keys.markdown
+++ b/_posts/2010-01-19-multiple-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-19-textmate.markdown b/_posts/2010-01-19-textmate.markdown
index ae9de76..9ad9333 100644
--- a/_posts/2010-01-19-textmate.markdown
+++ b/_posts/2010-01-19-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/2010-01-27-remotes.markdown b/_posts/2010-01-27-remotes.markdown
index 6413e9c..99ebf51 100644
--- a/_posts/2010-01-27-remotes.markdown
+++ b/_posts/2010-01-27-remotes.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Working with 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/2010-01-28-git-ignore.markdown b/_posts/2010-01-28-git-ignore.markdown
index a05a6a5..2c2ad40 100644
--- a/_posts/2010-01-28-git-ignore.markdown
+++ b/_posts/2010-01-28-git-ignore.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Ignoring 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-01-29-rebase.markdown b/_posts/2010-01-29-rebase.markdown
index 40539cf..1f4e628 100644
--- a/_posts/2010-01-29-rebase.markdown
+++ b/_posts/2010-01-29-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-03-02-changing-author-info.markdown b/_posts/2010-03-02-changing-author-info.markdown
index 76890c9..dff42f9 100644
--- a/_posts/2010-03-02-changing-author-info.markdown
+++ b/_posts/2010-03-02-changing-author-info.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Changing 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-06-02-svn-importing.markdown b/_posts/2010-06-02-svn-importing.markdown
index 015a5c4..59956a8 100644
--- a/_posts/2010-06-02-svn-importing.markdown
+++ b/_posts/2010-06-02-svn-importing.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Importing from Subversion
-categories: other
+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/2010-08-29-pull-requests.md b/_posts/2010-08-29-pull-requests.md
index 78a9238..f212460 100644
--- a/_posts/2010-08-29-pull-requests.md
+++ b/_posts/2010-08-29-pull-requests.md
@@ -2,7 +2,7 @@
 layout: default
 title: Sending 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/2010-10-14-git-cheat-sheets.textile b/_posts/2010-10-14-git-cheat-sheets.textile
index 50b5449..ff97611 100644
--- a/_posts/2010-10-14-git-cheat-sheets.textile
+++ b/_posts/2010-10-14-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/2011-02-18-be-social.markdown b/_posts/2011-02-18-be-social.markdown
index 2601295..47a7c62 100644
--- a/_posts/2011-02-18-be-social.markdown
+++ b/_posts/2011-02-18-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/2011-04-04-leave-a-repo.markdown b/_posts/2011-04-04-leave-a-repo.markdown
index 8148be8..5e424d9 100644
--- a/_posts/2011-04-04-leave-a-repo.markdown
+++ b/_posts/2011-04-04-leave-a-repo.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Leave a repo
 description: Leave a repo you are collaborating on
-categories: collaborating
+categories: beginner
 ---
 
 To leave a repository on which you are collaborating: