fixed a few innacuracies in the docs, and saved deployment to github setup

This commit is contained in:
Brandon Mathis 2011-12-30 10:56:23 -06:00
parent 948cba709a
commit f698e85343
4 changed files with 5 additions and 5 deletions

View File

@ -8,10 +8,10 @@ ssh_user = "imathis@octopress.org"
document_root = "~/octopress.org/"
ssh_port = "22"
rsync_delete = true
deploy_default = "rsync"
deploy_default = "push"
# This will be configured for you when you run config_deploy
deploy_branch = "gh-pages"
deploy_branch = "master"
## -- Misc Configs -- ##

View File

@ -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

View File

@ -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

View File

@ -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.