Remove 'guide' layout

11 files changed, 30 insertions, 36 deletions

diff --git a/_layouts/guide.html b/_layouts/guide.html
deleted file mode 100644
index 1199c34..0000000
--- a/_layouts/guide.html
+++ /dev/null
@@ -1,13 +0,0 @@
----
-layout: default
----
-
-<div class="span-21" id="welcome">
-  <p>{{ page.subtitle }}</p>
-</div>
-
-<div class="content">
-  <div class="span-21">
-    {{ content }}
-  </div>
-</div>
diff --git a/_posts/2009-06-14-mac-git-installation.textile b/_posts/2009-06-14-mac-git-installation.textile
index ba47319..93627f9 100644
--- a/_posts/2009-06-14-mac-git-installation.textile
+++ b/_posts/2009-06-14-mac-git-installation.textile
@@ -1,12 +1,13 @@
 ---
-layout: guide
+layout: default
 title: Installing git (OSX)
-subtitle: There are a number of methods to install git on OSX.  This guide details the most common methods.
 description: How to install git on OSX
 categories: mac setup
 main_category: setup
 ---
 
+There are a number of methods to install git on OSX.  This guide details the most common methods.
+
 h2. Pre-compiled Installer
 
 Download and run "git-osx-installer":http://code.google.com/p/git-osx-installer/
diff --git a/_posts/2009-06-15-mac-key-setup.textile b/_posts/2009-06-15-mac-key-setup.textile
index 3f117db..68bae5d 100644
--- a/_posts/2009-06-15-mac-key-setup.textile
+++ b/_posts/2009-06-15-mac-key-setup.textile
@@ -1,12 +1,13 @@
 ---
-layout: guide
+layout: default
 title: Generating SSH keys (OSX)
-subtitle: This guide will step you through the process of generating a keypair on Mac OSX and uploading it to GitHub
 description: Setting up SSH keys on Mac OSX
 categories: mac setup
 main_category: setup
 ---
 
+This guide will step you through the process of generating a keypair on Mac OSX and uploading it to GitHub
+
 Generating an SSH key on OSX is a fairly straightforward process.  First and foremost, open up Terminal.app.  You can usually find it at @/Applications/Utilities@.
 
 h2. Backup and remove existing keys
diff --git a/_posts/2009-06-15-msysgit-key-setup.textile b/_posts/2009-06-15-msysgit-key-setup.textile
index f3c1a79..eb52271 100644
--- a/_posts/2009-06-15-msysgit-key-setup.textile
+++ b/_posts/2009-06-15-msysgit-key-setup.textile
@@ -1,12 +1,13 @@
 ---
-layout: guide
+layout: default
 title: Generating SSH keys (Win/msysgit)
-subtitle: This guide will step you through the process of generating a keypair in msysgit and uploading it to GitHub
 description: Setting up SSH keys with msysgit on Windows
 categories: windows setup
 main_category: setup
 ---
 
+This guide will step you through the process of generating a keypair in msysgit and uploading it to GitHub
+
 Generating an SSH key with msysgit is a fairly straightforward process.  First and foremost, make sure you're working in the Git Bash console, not cmd (the default Windows command line).  You can find Git Bash under the git folder in your start menu, or by right clicking on a folder and selecting "Git Bash Here" if you choose to install context menu items during the msysgit installation.
 
 h2. Backup and remove existing keys
diff --git a/_posts/2009-06-16-forking.textile b/_posts/2009-06-16-forking.textile
index 156bda2..5cfefb9 100644
--- a/_posts/2009-06-16-forking.textile
+++ b/_posts/2009-06-16-forking.textile
@@ -1,11 +1,12 @@
 ---
-layout: guide
+layout: default
 title: Forking a project
-subtitle: This guide will step you through the process of forking, pushing you changes, and pulling in changes from the upstream repo.
 description: How to fork a project, submit changes, and pull from other repos in the fork network
 categories: collaborating
 ---
 
+This guide will step you through the process of forking, pushing you changes, and pulling in changes from the upstream repo.
+
 In this guide, we will use "github-services":http://github.com/pjhyett/github-services as an example to fork, submit a change, and re-sync with the forked repo.  All the examples on this page assume you're working in the "master" branch.
 
 Note that this works for pulling from a forked repository to the original, as well.
diff --git a/_posts/2009-06-17-troubleshooting-ssh.textile b/_posts/2009-06-17-troubleshooting-ssh.textile
index 219cd68..27395a9 100644
--- a/_posts/2009-06-17-troubleshooting-ssh.textile
+++ b/_posts/2009-06-17-troubleshooting-ssh.textile
@@ -1,11 +1,12 @@
 ---
-layout: guide
+layout: default
 title: Troubleshooting SSH issues
-subtitle: This guide contains the solutions to the most common SSH connection issues encountered on GitHub
 description: Solutions to common SSH issues
 categories: setup
 ---
 
+This guide contains the solutions to the most common SSH connection issues encountered on GitHub
+
 The first step to testing your connection is to run <code>ssh git@github.com</code>.  If your key works, you should get a success message:
 <pre class="terminal">$ ssh git@github.com
 Hi username! You've successfully authenticated, but GitHub does not provide shell access.</pre>
diff --git a/_posts/2009-06-20-git-email-settings.textile b/_posts/2009-06-20-git-email-settings.textile
index 7a02f7c..11bd678 100644
--- a/_posts/2009-06-20-git-email-settings.textile
+++ b/_posts/2009-06-20-git-email-settings.textile
@@ -1,11 +1,12 @@
 ---
-layout: guide
+layout: default
 title: Setting user name, email and GitHub token
-subtitle: This guide covers basic git settings you should set before making any commits
 description: Configure your local git installation so that commits are linked to your GitHub account
 categories: setup
 ---
 
+This guide covers basic git settings you should set before making any commits
+
 h2. Setting user name and email globally in git
 
 Git needs to know your username and email address to properly credit your commits.  Setting this setting will also let GitHub link the commits you make to your GitHub account.  Only commits made after you change this setting will use the new info, old commits will preserve the info they were committed with.
diff --git a/_posts/2009-06-23-security.textile b/_posts/2009-06-23-security.textile
index b616694..878ec35 100644
--- a/_posts/2009-06-23-security.textile
+++ b/_posts/2009-06-23-security.textile
@@ -1,7 +1,6 @@
 ---
-layout: guide
+layout: default
 title: GitHub security
-subtitle: This guide details GitHub's server security design and practices.
 ---
 
 h2. Engine Yard security
diff --git a/_posts/2009-06-25-deleting-a-repo.textile b/_posts/2009-06-25-deleting-a-repo.textile
index ca55d33..d8e83dc 100644
--- a/_posts/2009-06-25-deleting-a-repo.textile
+++ b/_posts/2009-06-25-deleting-a-repo.textile
@@ -1,5 +1,5 @@
 ---
-layout: guide
+layout: default
 title: Deleting a repo
 description: How to remove a repo from your GitHub account
 categories: repos
diff --git a/_posts/2009-06-25-moving-a-repo.textile b/_posts/2009-06-25-moving-a-repo.textile
index 461ebcf..060a054 100644
--- a/_posts/2009-06-25-moving-a-repo.textile
+++ b/_posts/2009-06-25-moving-a-repo.textile
@@ -1,11 +1,12 @@
 ---
-layout: guide
+layout: default
 title: Moving a repo
-subtitle: This guide details the process of moving a repo to another account and transferring the network of forked repos.
 description: How to move a repo from one account to another
 categories: repos
 ---
 
+This guide details the process of moving a repo to another account and transferring the network of forked repos.
+
 h2. Creating a new repo
 
 The first step to moving a repo is to create a new repo on the target account.  If your current repo is public, you can simply fork the repo while logged into the target account.  If the repo is private, you will need to create a new private repo on the target account to push to.
diff --git a/_posts/2009-07-04-git-html-help.textile b/_posts/2009-07-04-git-html-help.textile
index 3491c28..6426601 100644
--- a/_posts/2009-07-04-git-html-help.textile
+++ b/_posts/2009-07-04-git-html-help.textile
@@ -1,13 +1,18 @@
 ---
-layout: guide
+layout: default
 title: Installing Git HTML help
-subtitle: 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.
 description: How to install the local git HTML help files
 categories: setup
 ---
 
+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.
+
 Most git installations will install man files for help, but not the HTML help files (the same files seen on git's "online documentation":http://www.kernel.org/pub/software/scm/git-core/docs/).  Installing these help files is a fairly simple process.
 
+h2. Windows
+
+"Msysgit":http://code.google.com/p/msysgit/ installs and sets the HTML help files as the default automatically.  You don't need to do anything!
+
 h2. OSX
 
 The following commands were run on an installation of the "git-osx-installer":http://code.google.com/p/git-osx-installer/.  Your documentation path may be different, pay attention to the output of @git help --web commit@ for where your git is set to look for the HTML files.
@@ -43,7 +48,3 @@ $ git help --web commit
  (web browser launches)
 
 $ git config --global help.format web</pre>
-
-h2. Windows
-
-"Msysgit":http://code.google.com/p/msysgit/ installs and sets the HTML help files as the default automatically.  You don't need to do anything!