From: Mark Otto Date: Sun, 19 Apr 2015 05:08:46 +0000 (-0700) Subject: Merge branch 'master' into sass X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=68a55e96a41b80de4b350c67f4e6feed7a3079fe;hp=117ed984ed3458c4b0d0762dcc5f047c75fa5d02;p=blog Merge branch 'master' into sass --- diff --git a/README.md b/README.md index d470c87..58e8edd 100644 --- a/README.md +++ b/README.md @@ -66,13 +66,12 @@ Open 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. 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. 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 Poole includes some customizable options, typically applied via classes on the `` element. diff --git a/_config.yml b/_config.yml index 30929c2..a2229f2 100644 --- a/_config.yml +++ b/_config.yml @@ -1,5 +1,5 @@ # Dependencies -markdown: redcarpet +markdown: kramdown highlighter: pygments # Permalinks diff --git a/_posts/2014-01-02-introducing-poole.md b/_posts/2014-01-02-introducing-poole.md index 39be932..b77ba60 100644 --- a/_posts/2014-01-02-introducing-poole.md +++ b/_posts/2014-01-02-introducing-poole.md @@ -31,7 +31,7 @@ Additional features are available in individual themes. ### 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