From ef06f19a9e27c43cfcce19370509f3594494179c Mon Sep 17 00:00:00 2001 From: "maul.esel" Date: Sat, 11 May 2013 16:52:39 +0200 Subject: [PATCH 1/4] remove docs on installing pygments This is no longer needed as stated by @parkr in #1021, as jekyll now comes bundled with pygments.rb. Fixes #1021. --- site/docs/extras.md | 80 --------------------------------------------- 1 file changed, 80 deletions(-) diff --git a/site/docs/extras.md b/site/docs/extras.md index 4e820228..7e72ab8a 100644 --- a/site/docs/extras.md +++ b/site/docs/extras.md @@ -9,86 +9,6 @@ permalink: /docs/extras/ There are a number of (optional) extra features that Jekyll supports that you may want to install, depending on how you plan to use Jekyll. -## Pygments - -If you want syntax highlighting via the `{% raw %}{% highlight %}{% endraw %}` -tag in your posts, you’ll need to install [Pygments](http://pygments.org/). - -### Installing Pygments on OSX - -Mac OS X (Leopard onwards) comes preinstalled with Python, so on just about any -OS X machine you can install Pygments simply by running: - -{% highlight bash %} -$ sudo easy_install Pygments -{% endhighlight %} - -#### Installing Pygments using Homebrew - -Alternatively, you can install Pygments with -[Homebrew](http://mxcl.github.com/homebrew/), an excellent package manager for -OS X: - -{% highlight bash %} -$ brew install python -# export PATH="/usr/local/share/python:${PATH}" -$ pip install pygments -{% endhighlight %} - -
-
Homebrew's executable paths
-

- Homebrew doesn’t symlink the executables for you. For the Homebrew default - Cellar location and Python 2.7, be sure to add `/usr/local/share/python` to - your `PATH`. For more information, check out - the - Homebrew wiki. -

-
- -#### Installing Pygments using MacPorts - -If you use MacPorts, you can install Pygments by running: - -{% highlight bash %} -$ sudo port install python25 py25-pygments -{% endhighlight %} - -Seriously though, you should check out -[Homebrew](http://mxcl.github.com/homebrew/)—it’s awesome. - -### Installing Pygments on Arch Linux - -You can install Pygments using the pacman package manager as follows: - -{% highlight bash %} -$ sudo pacman -S python-pygments -{% endhighlight %} - -Or to use python2 for Pygments: - -{% highlight bash %} -$ sudo pacman -S python2-pygments -{% endhighlight %} - -### Installing Pygments on Ubuntu and Debian - -{% highlight bash %} -$ sudo apt-get install python-pygments -{% endhighlight %} - -### Installing Pygments on RedHat, Fedora, and CentOS - -{% highlight bash %} -$ sudo yum install python-pygments -{% endhighlight %} - -### Installing Pygments on Gentoo - -{% highlight bash %} -$ sudo emerge -av dev-python/pygments -{% endhighlight %} - ## LaTeX Support Maruku comes with optional support for LaTeX to PNG rendering via blahtex From d869f9934548250c029231eddbe6dbdf0cba32ce Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 11 May 2013 17:08:46 +0200 Subject: [PATCH 2/4] Update gemspec for new page-based docs. --- jekyll.gemspec | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index 1c979018..dbfa6d7c 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -125,34 +125,33 @@ Gem::Specification.new do |s| site/_includes/top.html site/_layouts/default.html site/_layouts/docs.html - site/_posts/2012-07-01-configuration.md - site/_posts/2012-07-01-contributing.md - site/_posts/2012-07-01-deployment-methods.md - site/_posts/2012-07-01-extras.md - site/_posts/2012-07-01-frontmatter.md - site/_posts/2012-07-01-github-pages.md - site/_posts/2012-07-01-heroku.md - site/_posts/2012-07-01-home.md - site/_posts/2012-07-01-installation.md - site/_posts/2012-07-01-migrations.md - site/_posts/2012-07-01-pages.md - site/_posts/2012-07-01-pagination.md - site/_posts/2012-07-01-permalinks.md - site/_posts/2012-07-01-plugins.md - site/_posts/2012-07-01-posts.md - site/_posts/2012-07-01-resources.md - site/_posts/2012-07-01-sites.md - site/_posts/2012-07-01-structure.md - site/_posts/2012-07-01-templates.md - site/_posts/2012-07-01-troubleshooting.md - site/_posts/2012-07-01-upgrading.md - site/_posts/2012-07-01-usage.md - site/_posts/2012-07-01-variables.md site/css/gridism.css site/css/normalize.css site/css/pygments.css site/css/style.css - site/docs/index.html + site/docs/configuration.md + site/docs/contributing.md + site/docs/deployment-methods.md + site/docs/extras.md + site/docs/frontmatter.md + site/docs/github-pages.md + site/docs/heroku.md + site/docs/index.md + site/docs/installation.md + site/docs/migrations.md + site/docs/pages.md + site/docs/pagination.md + site/docs/permalinks.md + site/docs/plugins.md + site/docs/posts.md + site/docs/resources.md + site/docs/sites.md + site/docs/structure.md + site/docs/templates.md + site/docs/troubleshooting.md + site/docs/upgrading.md + site/docs/usage.md + site/docs/variables.md site/favicon.png site/img/article-footer.png site/img/footer-arrow.png From 470a187395c7eaf2c948d94ed719d0a33d3d198c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 11 May 2013 17:10:50 +0200 Subject: [PATCH 3/4] Update history to reflect merge of #1079 --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index dd9e4bd6..10fb8678 100644 --- a/History.markdown +++ b/History.markdown @@ -8,6 +8,7 @@ * Catching that Redcarpet gem isn't installed (#1059) ### Site Enhancements + * Remove pygments-installation instructions, as pygments.rb is bundled with it (#1079) * Move pages to be Pages for realz (#985) * Updated links to Liquid documentation (#1073) From 665e8d15f70a0d8a9a550f55a38370578be17923 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 12 May 2013 01:43:36 +0200 Subject: [PATCH 4/4] Turn off relative permalinks on Jekyll docs. --- site/_config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_config.yml b/site/_config.yml index a80e7c40..8b8c6fda 100644 --- a/site/_config.yml +++ b/site/_config.yml @@ -1,2 +1,3 @@ pygments: true +relative_permalinks: false gauges_id: 503c5af6613f5d0f19000027