From e65a78a5f5927c1722f4bd92ea4614d5c1340402 Mon Sep 17 00:00:00 2001
From: Marcus P S <marcus.ps+github@gmail.com>
Date: Wed, 23 Jul 2014 11:46:22 -0400
Subject: [PATCH 1/4] Fix MathJax CDN URL

According to the [MathJax Blog](http://www.mathjax.org/changes-to-the-mathjax-cdn/), MathJax will retire the `rackcdn` CDN address at the end of this month. Updated the script to used the new CDN URL, and also made it so that the URL is HTTP/HTTPS agnostic, following the [MathJax docs](http://docs.mathjax.org/en/latest/start.html#secure-access-to-the-cdn).
---
 lib/gollum/templates/layout.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gollum/templates/layout.mustache b/lib/gollum/templates/layout.mustache
index 075b5c62..7c58bdd4 100644
--- a/lib/gollum/templates/layout.mustache
+++ b/lib/gollum/templates/layout.mustache
@@ -42,7 +42,7 @@
   </script>
   <script>(function(d,j){
   j = d.createElement('script');
-  j.src = 'https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
+  j.src = '//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML';
   (d.head || d.getElementsByTagName('head')[0]).appendChild(j);
   }(document));
   </script>{{/mathjax}}

From 0be5d1c65789a32b42d1deb9f58f6fdffb0de817 Mon Sep 17 00:00:00 2001
From: Jonas Oscarsson <jonas.osc@rsson.nu>
Date: Tue, 9 Sep 2014 16:57:33 +0200
Subject: [PATCH 2/4] Update --allow-uploads help text in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 43208fd4..edb5396c 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ Options:
         --ref [REF]                  Specify the repository ref to use (default: master).
         --no-live-preview            Disables livepreview.
         --live-preview               Enables livepreview.
-        --allow-uploads              Allows file uploads.
+        --allow-uploads [MODE]       Allows file uploads. Modes: dir (default, store all uploads in the same directory), page (store each upload at the same location as the page).
         --mathjax                    Enables mathjax.
         --user-icons [SOURCE]        Set the history user icons. Valid values: gravatar, identicon, none. Default: none.
         --show-all                   Shows all files in file view. By default only valid pages are shown.

From 30f673c63cd0e870f003587d4b420bd113f73aa6 Mon Sep 17 00:00:00 2001
From: Dawa Ometto <dawa.ometto@phil.uu.nl>
Date: Sat, 13 Sep 2014 12:29:39 +0200
Subject: [PATCH 3/4] Update README.md with installation instructions

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index edb5396c..558551a4 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,7 @@ The best way to install Gollum is with RubyGems:
 ```bash
 $ [sudo] gem install gollum
 ```
+You may first need to install some additional [development packages](https://github.com/gollum/gollum/wiki/Installation) for your OS.
 
 If you're installing from source, you can use [Bundler][bundler] to pick up all the
 gems:

From 7e2e0e926b707a73db6f889fc74fef9fdc32eb94 Mon Sep 17 00:00:00 2001
From: Guillaume Grossetie <g.grossetie@gmail.com>
Date: Wed, 17 Sep 2014 19:09:28 +0200
Subject: [PATCH 4/4] Update README.md

GitHub Markup is now using asciidoctor
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 558551a4..86a89943 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ In order to use the various formats that Gollum supports, you will need to
 separately install the necessary dependencies for each format. You only need
 to install the dependencies for the formats that you plan to use.
 
-* [ASCIIDoc](http://www.methods.co.nz/asciidoc/) -- `brew install asciidoc` on mac or `apt-get install -y asciidoc` on Ubuntu
+* [AsciiDoc](http://asciidoctor.org) -- `gem install asciidoctor`
 * [Creole](http://wikicreole.org/) -- `gem install creole`
 * [Markdown](http://daringfireball.net/projects/markdown/) -- `gem install redcarpet`
 * [GitHub Flavored Markdown](https://help.github.com/articles/github-flavored-markdown) -- `gem install github-markdown`