From e3126f7502e16b8d15dc795b7cb0d57652e73617 Mon Sep 17 00:00:00 2001 From: marutanm Date: Fri, 11 Nov 2011 08:39:04 +0900 Subject: [PATCH 1/5] Fix brief overview of HTML5 Video Tag --- source/docs/plugins/index.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/docs/plugins/index.markdown b/source/docs/plugins/index.markdown index e17baba..e76409b 100644 --- a/source/docs/plugins/index.markdown +++ b/source/docs/plugins/index.markdown @@ -9,7 +9,7 @@ footer: false Octopress ships with the following plugins. Many have been written specially for Octopress, but some have been selected from the Jekyll community with various changes and improvements. -- [HTML5 Video Tag](/docs/plugins/video-tag/) - *easily post images with class names and titles* +- [HTML5 Video Tag](/docs/plugins/video-tag/) - *embeds mp4 encoded HTML5 videos* - [Backtick Code Block](/docs/plugins/backtick-codeblock/) - *for simple lightweight code sharing* - [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* From ffb31492d26f9d3555362e7083afc770775548b1 Mon Sep 17 00:00:00 2001 From: Trey Hunner Date: Thu, 17 Nov 2011 10:21:14 -0800 Subject: [PATCH 2/5] Fix wrapping in and around code elements --- sass/partials/_syntax.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sass/partials/_syntax.scss b/sass/partials/_syntax.scss index 3645d75..5a58c93 100644 --- a/sass/partials/_syntax.scss +++ b/sass/partials/_syntax.scss @@ -89,8 +89,7 @@ h3.filename { p, li { code { @extend .mono; - display: inline-block; - white-space: no-wrap; + white-space: pre; background: #fff; font-size: .8em; line-height: 1.5em; From 5ae24737c92c09b8a27a482b71eff901361c79f2 Mon Sep 17 00:00:00 2001 From: Frederic Hemberger Date: Sat, 10 Dec 2011 12:17:12 +0100 Subject: [PATCH 3/5] Clarify RVM/rbenv relation, add to installation instructions. Closes #313,#306. --- source/docs/setup/index.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/docs/setup/index.markdown b/source/docs/setup/index.markdown index 9efe2fe..b88099d 100644 --- a/source/docs/setup/index.markdown +++ b/source/docs/setup/index.markdown @@ -14,7 +14,7 @@ If that sounds daunting, Octopress probably isn't for you. You'll need to [install Git](http://git-scm.com/) and set up your Ruby environment. **Octopress requires Ruby 1.9.2** wich you can easily install with [RVM](http://rvm.beginrescueend.com) or [rbenv](https://github.com/sstephenson/rbenv). -You can't use both rbenv and RVM on the same system, so choose one. +You can't use both rbenv and RVM on the same system, as they are competing Ruby environment managers, so choose one. ### Using RVM @@ -46,6 +46,7 @@ Next, install dependencies. ```sh gem install bundler +rbenv rehash # If you use rbenv, rehash to be able to run the bundle command bundle install ``` From 23a3efc7f173f282fa9fcc00914e290cb680ff14 Mon Sep 17 00:00:00 2001 From: Frederic Hemberger Date: Sat, 10 Dec 2011 12:58:42 +0100 Subject: [PATCH 4/5] Add reference to Liquid tags and 'more' comment, closes #254 --- source/docs/blogging/index.markdown | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/docs/blogging/index.markdown b/source/docs/blogging/index.markdown index 1a87a07..0321b39 100644 --- a/source/docs/blogging/index.markdown +++ b/source/docs/blogging/index.markdown @@ -94,7 +94,14 @@ Like with the new post task, the default file extension is `markdown` but you ca The title is derived from the filename so you'll likely want to change that. This is very similar to the post yaml except it doesn't include categories, and you can toggle sharing and comments or remove the footer altogether. If you don't want to show a date on your page, just remove it from the yaml. +## Content + +The page and post content will be rendered by whichever markup engine you have specified in the site configuration file. Additionally, you can use any of the [liquid template features](https://github.com/Shopify/liquid/wiki/Liquid-for-Designers) that are described in the [Jekyll docs](https://github.com/mojombo/jekyll/wiki/Template-Data). + +Inserting a `` comment into your post will prevent the post content below this mark from being displayed on the index page for the blog posts, a "Continue →" button links to the full post. + ## Generate & Preview + ``` sh rake generate # Generates posts and pages into the public directory rake watch # Watches source/ and sass/ for changes and regenerates From 116d4336b9f9b0a2710c42b32ec8d83119613f42 Mon Sep 17 00:00:00 2001 From: Frederic Hemberger Date: Sat, 10 Dec 2011 15:38:09 +0100 Subject: [PATCH 5/5] Add information about atom feeds and local preview of posts --- source/docs/blogging/index.markdown | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/docs/blogging/index.markdown b/source/docs/blogging/index.markdown index 0321b39..407d9b6 100644 --- a/source/docs/blogging/index.markdown +++ b/source/docs/blogging/index.markdown @@ -7,7 +7,7 @@ comments: false footer: false --- -Octopress offers some rake tasks to create post and pages preloaded with metadata and according to Jekyll's naming conventions. +Octopress offers some rake tasks to create post and pages preloaded with metadata and according to Jekyll's naming conventions. It also generates a global and a category based feed for your posts (You can find them in `atom.xml` and `blog/categories//atom.xml`). ## Blog Posts Blog posts must be stored in the `source/_posts` directory and named according to Jekyll's naming conventions: `YYYY-MM-DD-post-title.markdown`. The name of the file will be used @@ -108,6 +108,8 @@ Inserting a `` comment into your post will prevent the post content rake preview # Watches, and mounts a webserver at http://localhost:4000 ``` +If you want to work on posts without publishing them, you can add a `published: false` to your post's YAML header. You can preview these posts with `rake preview` on your local server, but they won't get published by `rake generate`. + Using the `rake preview` server is nice, but If you're a [POW](http://pow.cx) user, you can set up your Octopress site like this. ``` sh