Browse Source

Merge branch 'master' into sass

Mark Otto 10 years ago
parent
commit
68a55e96a4
3 changed files with 4 additions and 5 deletions
  1. 2 3
      README.md
  2. 1 1
      _config.yml
  3. 1 1
      _posts/2014-01-02-introducing-poole.md

+ 2 - 3
README.md

@@ -66,13 +66,12 @@ Open <http://localhost:4000> in your browser, and voilà.
 If you host your code on GitHub, you can use [GitHub Pages](https://pages.github.com) to host your project.
 If you host your code on GitHub, you can use [GitHub Pages](https://pages.github.com) to host your project.
 
 
 1. Fork this repo and switch to the `gh-pages` branch.
 1. Fork this repo and switch to the `gh-pages` branch.
-2a. If you're [using a custom domain name](https://help.github.com/articles/setting-up-a-custom-domain-with-github-pages), modify the `CNAME` file to point to your new domain.
-2b. If you're not using a custom domain name, **modify the `baseurl` in `_config.yml`** to point to your GitHub Pages URL. Example: for a repo at `github.com/username/poole`, use `http://username.github.io/poole/`. **Be sure to include the trailing slash.**
+  1. If you're [using a custom domain name](https://help.github.com/articles/setting-up-a-custom-domain-with-github-pages), modify the `CNAME` file to point to your new domain.
+  2. If you're not using a custom domain name, **modify the `baseurl` in `_config.yml`** to point to your GitHub Pages URL. Example: for a repo at `github.com/username/poole`, use `http://username.github.io/poole/`. **Be sure to include the trailing slash.**
 3. Done! Head to your GitHub Pages URL or custom domain.
 3. Done! Head to your GitHub Pages URL or custom domain.
 
 
 No matter your production or hosting setup, be sure to verify the `baseurl` option file and `CNAME` settings. Not applying this correctly can mean broken styles on your site.
 No matter your production or hosting setup, be sure to verify the `baseurl` option file and `CNAME` settings. Not applying this correctly can mean broken styles on your site.
 
 
-
 ## Options
 ## Options
 
 
 Poole includes some customizable options, typically applied via classes on the `<body>` element.
 Poole includes some customizable options, typically applied via classes on the `<body>` element.

+ 1 - 1
_config.yml

@@ -1,5 +1,5 @@
 # Dependencies
 # Dependencies
-markdown:            redcarpet
+markdown:            kramdown
 highlighter:         pygments
 highlighter:         pygments
 
 
 # Permalinks
 # Permalinks

+ 1 - 1
_posts/2014-01-02-introducing-poole.md

@@ -31,7 +31,7 @@ Additional features are available in individual themes.
 
 
 ### Browser support
 ### Browser support
 
 
-Poole and it's themes are by preference a forward-thinking project. In addition to the latest versions of Chrome, Safari (mobile and desktop), and Firefox, it is only compatible with Internet Explorer 9 and above.
+Poole and its themes are by preference a forward-thinking project. In addition to the latest versions of Chrome, Safari (mobile and desktop), and Firefox, it is only compatible with Internet Explorer 9 and above.
 
 
 ### Download
 ### Download