Merge pull request #2601 from alfredxing/master
This commit is contained in:
		
						commit
						7f48331ed4
					
				|  | @ -106,7 +106,7 @@ The [Jekyll wiki]({{ site.repository }}/wiki) on GitHub | |||
| can be freely updated without a pull request as all | ||||
| GitHub users have access. | ||||
| 
 | ||||
| If you want to add your plugin to the [list of plugins](/docs/plugins/#available_plugins), | ||||
| If you want to add your plugin to the [list of plugins](/docs/plugins/#available-plugins), | ||||
| please submit a pull request modifying the [plugins page source | ||||
| file]({{ site.repository }}/blob/master/site/docs/plugins.md) by adding a | ||||
| link to your plugin under the proper subheading depending upon its type. | ||||
|  |  | |||
|  | @ -86,7 +86,7 @@ this script from within Textmate. | |||
| 
 | ||||
| ## Rack-Jekyll | ||||
| 
 | ||||
| [Rack-Jekyll](https://github.com/adaoraul/rack-jekyll/) is an easy way to deploy your site on any Rack server such as Amazon EC2, Slicehost, Heroku, and so forth. It also can run with [shotgun](https://github.com/rtomakyo/shotgun/), [rackup](https://github.com/rack/rack), [mongrel](https://github.com/mongrel/mongrel), [unicorn](https://github.com/defunkt/unicorn/), and [others](https://github.com/adaoraul/rack-jekyll#readme). | ||||
| [Rack-Jekyll](https://github.com/adaoraul/rack-jekyll/) is an easy way to deploy your site on any Rack server such as Amazon EC2, Slicehost, Heroku, and so forth. It also can run with [shotgun](https://github.com/rtomayko/shotgun/), [rackup](https://github.com/rack/rack), [mongrel](https://github.com/mongrel/mongrel), [unicorn](https://github.com/defunkt/unicorn/), and [others](https://github.com/adaoraul/rack-jekyll#readme). | ||||
| 
 | ||||
| Read [this post](http://blog.crowdint.com/2010/08/02/instant-blog-using-jekyll-and-heroku.html) on how to deploy to Heroku using Rack-Jekyll. | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,9 +0,0 @@ | |||
| --- | ||||
| layout: docs | ||||
| title: Heroku | ||||
| prev_section: github-pages | ||||
| next_section: manual-deployment | ||||
| permalink: /docs/heroku/ | ||||
| --- | ||||
| 
 | ||||
| Move along, people. Nothing to see here. | ||||
|  | @ -16,7 +16,7 @@ development of Jekyll itself. | |||
| Jekyll is a simple, blog-aware, static site generator. It takes a template | ||||
| directory containing raw text files in various formats, runs it through | ||||
| [Markdown](http://daringfireball.net/projects/markdown/) (or | ||||
| [Textile](http://textile.sitemonks.com/)) and | ||||
| [Textile](http://redcloth.org/textile)) and | ||||
| [Liquid](http://wiki.shopify.com/Liquid) | ||||
| converters, and spits out a complete, ready-to-publish static website suitable | ||||
| for serving with your favorite web server. Jekyll also happens to be the engine | ||||
|  |  | |||
|  | @ -34,7 +34,7 @@ you’ll need to make sure your system has before you start. | |||
| ## Install with RubyGems | ||||
| 
 | ||||
| The best way to install Jekyll is via | ||||
| [RubyGems](http://docs.rubygems.org/read/chapter/3). At the terminal prompt, | ||||
| [RubyGems](http://rubygems.org/pages/download). At the terminal prompt, | ||||
| simply run the following command to install Jekyll: | ||||
| 
 | ||||
| {% highlight bash %} | ||||
|  |  | |||
|  | @ -18,7 +18,7 @@ and web-based CMS systems, this will be a welcome change! | |||
| As explained on the [directory structure](../structure/) page, the `_posts` | ||||
| folder is where your blog posts will live. These files can be either | ||||
| [Markdown](http://daringfireball.net/projects/markdown/) or | ||||
| [Textile](http://textile.sitemonks.com/) formatted text files, and as long as | ||||
| [Textile](http://redcloth.org/textile) formatted text files, and as long as | ||||
| they have [YAML front-matter](../frontmatter/), they will be converted from their | ||||
| source format into an HTML page that is part of your static site. | ||||
| 
 | ||||
|  | @ -44,7 +44,7 @@ file. For example, the following are examples of valid post filenames: | |||
| <div class="note"> | ||||
|   <h5>ProTip™: Link to other posts</h5> | ||||
|   <p> | ||||
|     Use the <a href="../templates#post_url"><code>post_url</code></a> | ||||
|     Use the <a href="../templates#post-url"><code>post_url</code></a> | ||||
|     tag to link to other posts without having to worry about the URL's | ||||
|     breaking when the site permalink style changes. | ||||
|   </p> | ||||
|  | @ -56,7 +56,7 @@ All blog post files must begin with [YAML front-matter](../frontmatter/). After | |||
| that, it's simply a matter of deciding which format you prefer. Jekyll supports | ||||
| two popular content markup formats: | ||||
| [Markdown](http://daringfireball.net/projects/markdown/) and | ||||
| [Textile](http://textile.sitemonks.com/). These formats each have their own way | ||||
| [Textile](http://redcloth.org/textile). These formats each have their own way | ||||
| of marking up different types of content within a post, so you should | ||||
| familiarize yourself with these formats and decide which one best suits your | ||||
| needs. | ||||
|  |  | |||
|  | @ -22,7 +22,7 @@ overview: true | |||
|     </div> | ||||
|     <div class="unit one-third"> | ||||
|       <h2>Static</h2> | ||||
|       <p><a href="http://daringfireball.net/projects/markdown/">Markdown</a> (or <a href="http://textile.sitemonks.com/">Textile</a>), <a href="http://wiki.shopify.com/Liquid">Liquid</a>, HTML <span class="amp">&</span> CSS go in. Static sites come out ready for deployment.</p> | ||||
|       <p><a href="http://daringfireball.net/projects/markdown/">Markdown</a> (or <a href="http://redcloth.org/textile">Textile</a>), <a href="http://wiki.shopify.com/Liquid">Liquid</a>, HTML <span class="amp">&</span> CSS go in. Static sites come out ready for deployment.</p> | ||||
|       <a href="/docs/templates/">Jekyll template guide →</a> | ||||
|     </div> | ||||
|     <div class="unit one-third"> | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue