Merge branch 'site' of github.com:imathis/octopress into site

source/docs/blogging/plugins/index.markdown

@@ -62,7 +62,7 @@ Easily embed gists in your posts or pages.
 ## Include Code
 Import files on your filesystem into any blog post as embedded code snippets with syntax highlighting and a download link.
 
-{% include_code Testing include_code javascripts/test.js %}
+{% include_code Testing include_code test.js %}
 
 [Examples & documentation »](/docs/plugins/include-code/)
 

source/docs/plugins/image-tag/index.markdown

@@ -10,13 +10,14 @@ If you like Markdown's syntax for images, you'll love the simplicity of the Octo
 
 #### Syntax
 
-    {{ "{% img [class names] /path/to/image [width height] [title text]" }} %}
+    {{ "{% img [class names] /path/to/image [width] [height] [title text [alt text]]" }} %}
 
 ## Examples
 
     {{ "{% img http://placekitten.com/890/280" }} %}
     {{ "{% img left http://placekitten.com/320/250 Place Kitten #2" }} %}
     {{ "{% img right http://placekitten.com/300/500 150 250 Place Kitten #3" }} %}
+    {{ "{% img right http://placekitten.com/300/500 150 250 'Place Kitten #4' 'An image of a very cute kitten'" }} %}
 
 {% img http://placekitten.com/890/280 %}
 Bacon ipsum dolor sit amet exercitation ball tip consectetur tempor. Biltong exercitation aliqua, ribeye consequat veniam consectetur.
@@ -29,4 +30,6 @@ Brisket quis velit bresaola. Pork loin pork chop beef duis. Short loin fugiat of
 
 Filler text courtesy of [Bacon Ipsum](http://baconipsum.com), Images courtesy of [Place Kitten](http://placekitten.com).
 
+{% img http://placekitten.com/300/500 150 250 "Place Kitten #4" "An image of a very cute kitten" %}
+
 [« Plugins page](/docs/plugins)

source/docs/plugins/index.markdown

@@ -14,6 +14,7 @@ Octopress ships with the following plugins. Many have been written specially for
 - [Code Block](/docs/plugins/codeblock/) - *for sharing code with titles and links*
 - [Include Code](/docs/plugins/include-code/) - *embed code from your filesystem with a download link*
 - [Gist Tag](/docs/plugins/gist-tag/) - *automatically downloads and embeds Github gists*
+- [jsFiddle](/docs/plugins/jsfiddle-tag/) - *embeds code from jsFiddle*
 - [Image Tag](/docs/plugins/image-tag/) - *easily post images with class names and titles*
 - [Render Partial](/docs/plugins/render-partial/) - *insert any file into another post or page*
 - [Block Quote](/docs/plugins/blockquote/) - *generate beautiful, semantic block quotes*

source/docs/plugins/jsfiddle-tag/index.markdown

@@ -0,0 +1,38 @@
+---
+layout: page
+title: "jsFiddle Tag"
+date: 2011-09-26 12:33
+sidebar: false
+footer: false
+---
+
+All you need is the fiddle's id and you can easily embed it in your page. 
+
+#### Syntax
+    {{ "{% jsfiddle shorttag [tabs] [skin] [height] [width]" }} %}
+
+#### Example
+
+    {{ "{% jsfiddle ccWP7" }} %}
+
+{% jsfiddle ccWP7 %}
+
+
+#### Adjusting Tabs
+
+It’s possible to easily adjust the display order of the tabs. In this case, I’m moving the result to be the first item shown.
+
+    {{ "{% jsfiddle ccWP7 result,js,html,css" }} %}
+
+{% jsfiddle ccWP7 result,js,html,css %}
+
+
+#### Presentation: Skin
+
+We can easily adjust the skin. Right now, it looks like light and presentation are really the only supported options, but if jsFiddle announces new options, you can start using them immediately.
+
+    {{ "{% jsfiddle ccWP7 default presentation" }} %}
+
+{% jsfiddle ccWP7 default presentation %}
+
+This plugin was developed by [Brian Arnold](http://brianarn.github.com/blog/2011/08/jsfiddle-plugin/).

source/docs/setup/index.markdown

@@ -21,7 +21,7 @@ You can't use both rbenv and RVM on the same system, so choose one.
 If you don't have RVM yet, [Install RVM](/docs/setup/rvm) and then install Ruby 1.9.2.
 
 ```sh
-rvm install 1.9.2
+rvm install 1.9.2 && rvm use 1.9.2
 ```
 
 ### Using rbenv

source/docs/setup/rvm/index.markdown

@@ -29,6 +29,6 @@ source ~/.zshrc
 Install Ruby 1.9.2 and ensure RVM has the latest RubyGems.
 
 ```sh
-rvm install 1.9.2
+rvm install 1.9.2 && rvm use 1.9.2
 rvm rubygems latest
 ```