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

Conflicts:
	source/_includes/head.html

.themes/classic/source/_includes/head.html

@@ -7,7 +7,7 @@
   <title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title>
   <meta name="author" content="{{ site.author }}">
 
-  {% capture description %}{% if page.description %}{{ page.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %}
+  {% capture description %}{% if page.description %}{{ page.description }}{% elsif site.description %}{{ site.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %}
   <meta name="description" content="{{ description | strip_html | condense_spaces | truncate:150 }}">
   {% if page.keywords %}<meta name="keywords" content="{{ page.keywords }}">{% endif %}
 

_config.yml

@@ -2,7 +2,7 @@
 #      Main Configs       #
 # ----------------------- #
 
-url: http://octopress.org
+url: http://octopress.github.com
 title: Octopress
 subtitle: A blogging framework for hackers.
 author: Brandon Mathis

source/CNAME

@@ -0,0 +1 @@
+octopress.org

source/_includes/head.html

@@ -7,7 +7,7 @@
   <title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title>
   <meta name="author" content="{{ site.author }}">
 
-  {% capture description %}{% if page.description %}{{ page.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %}
+  {% capture description %}{% if page.description %}{{ page.description }}{% elsif site.description %}{{ site.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %}
   <meta name="description" content="{{ description | strip_html | condense_spaces | truncate:150 }}">
   {% if page.keywords %}<meta name="keywords" content="{{ page.keywords }}">{% endif %}
 

source/_posts/2011-07-22-octopress-20-surfaces.markdown

@@ -18,7 +18,7 @@ Short answer: Everything. Octopress is now based on [mojombo/jekyll](http://gith
 Octopress comes with:
 
 - A semantic HTML5 template
-- A Mobile friendly responsive ([320 and up](http://stuffandnonsense.co.uk/projects/320andup/)) layout (rotate, or resize your browser and see)
+- A Mobile first responsive layout (rotate, or resize your browser and see)
 - Built in 3rd party support for Twitter, Google Plus One, Disqus Comments, Pinboard, Delicious, and Google Analytics
 - An easy deployment strategy using Github pages or Rsync
 - Built in support for POW and Rack servers

source/docs/configuring/index.markdown

@@ -33,6 +33,7 @@ In the `_config.yml` there are three sections for configuring your Octopress Blo
     subtitle:           # A description used in the header
     author:             # Your name, for RSS, Copyright, Metadata
     simple_search:      # Search engine for simple site search
+    description:        # A default meta description for your site
     subscribe_rss:      # Url for your blog's feed, defauts to /atom.xml
     subscribe_email:    # Url to subscribe by email (service required)
     email:              # Email address for the RSS feed if you want it.
@@ -67,7 +68,7 @@ These configurations are used by Jekyll and Plugins. If you're not familiar with
 If you want to change the way permalinks are written for your blog posts, see [Jekyll's permalink docs](https://github.com/mojombo/jekyll/wiki/Permalinks).
 
 **Note:** Jekyll has a `baseurl` config which offers mock subdirectory publishing support by adding a redirect to Jekyll's WEBrick server. **Please don't use this.**
-If you want to publish your site to a subdirectory, [(see Deploying Octopress to a Subdirectory)](/docs/deploying/#deploy_subdir).
+If you want to publish your site to a subdirectory, [(see Deploying Octopress to a Subdirectory)](/docs/deploying/subdir/).
 
 <h3 id="third_party">3rd Party Settings</h3>
 These third party integrations are already set up for you. Simply fill in the configurations and they'll be added to your site.

source/docs/deploying/rsync/index.markdown

@@ -1,30 +1,54 @@
 ---
 layout: page
-title: "Deploying with Rsync"
+title: "Deploying with rsync"
 date: 2011-09-10 17:53
 sidebar: false
 footer: false
 ---
 
-<h2 id="rsync">Deploying with Rsync via SSH</h2>
+<h2 id="rsync">Deploying with rsync via SSH</h2>
 
-Add your server configurations to the `Rakefile` under Rsync deploy config. To deploy with Rsync, be sure your public key is listed in your server's `~/.ssh/authorized_keys` file.
+Add your server configurations to the `Rakefile` under Rsync deploy config. To deploy with rsync, be sure your public key is listed in your server's `~/.ssh/authorized_keys` file.
 
 ``` ruby
-    ssh_user       = "user@domain.com"
+ssh_user       = "user@domain.com"
-    document_root  = "~/website.com/"
+document_root  = "~/website.com/"
-    deploy_default = "rsync"
+rsync_delete   = true
+deploy_default = "rsync"
 ```
 
 Now if you run
 
 ``` sh
-    rake generate   # If you haven't generated your blog yet
+rake generate   # If you haven't generated your blog yet
-    rake deploy     # Syncs your blog via ssh
+rake deploy     # Syncs your blog via ssh
 ```
 
 in your terminal, your `public` directory will be synced to your server's document root.
 
+<h2 id="delete">Regarding rsync delete</h2>
+
+If you choose to delete on sync, rsync will create a 1:1 match. Files will be added, updated *and deleted* from your deploy directory to mirror your local copy.
+
+If you do not choose to delete:
+
+- You can store files beneath your site's deploy directory which aren't found in your local version.
+- Files you have removed from your local site must be removed manually from the server.
+
+<h3 id="exclude">Excluding files from sync</h3>
+
+If you would like to keep your Octopress files synced but also want the convenience of keeping some files or directories on the server without having to mirror them locally, you can exclude them from rsync.
+
+When syncing, rsync can exclude files or directories locally or on the server. Simply add an `rsync-exclude` file to the root directory of your project like this:
+
+```sh rsync-exclude
+some-file.txt
+some-directory/
+*.mp4
+```
+
+Note: using excludes will prevent rsync from uploading local files, or if the delete option is specified, it will prevent rsync from deleting excluded items on the server.
+
 ## Version control
 
 You'll want to keep your blog source in a remote git repository,
@@ -38,8 +62,8 @@ git remote add origin (your repository url)
 git config branch.master.remote origin
 ```
 
-
 {% render_partial docs/deploying/_self_hosted_git.markdown %}
 
-{% render_partial docs/deploying/_subdir.markdown %}
+## Deploying to a subdirectory
 
+If for you wanted to host an Octopress blog at `http://yoursite.com/blog/` you would need to configure Octopress for [deploying to a subdirectory](/docs/deploying/subdir).

source/docs/deploying/subdir/index.markdown

@@ -1,4 +1,10 @@
-<h2 id="deploy_subdir">Deploying to a Subdirectory</h2>
+---
+layout: page
+title: "Deploying to a Subdirectory"
+date: 2011-09-10 17:53
+sidebar: false
+footer: false
+---
 
 If you're deploying to a subdirectory on your site, or if you're using Github's project pages, make sure you set up your urls correctly in your configs.
 You can do this *almost* automatically:

source/docs/theme/styles/_styles.markdown

@@ -1 +1 @@
-If you want to add or override styles, edit `sass/custom/_styles.css`. This stylesheet is imported last, so you can override styles with the cascade.
+If you want to add or override styles, edit `sass/custom/_styles.scss`. This stylesheet is imported last, so you can override styles with the cascade.