From caa833877dc11362090c97552135668240b0b588 Mon Sep 17 00:00:00 2001
From: Adrien Oliva <github@yapbreak.fr>
Date: Fri, 11 Oct 2013 15:52:47 +0200
Subject: [PATCH 1/8] Change StandardError to RuntimeError

Since built-in exception "StandardError" does not exist in the latest python version (at least in version 3.3), use RuntimeError instead (which exists from python2.6 to python3.4)
---
 pelican/writers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pelican/writers.py b/pelican/writers.py
index da105929..6cf5232d 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -60,7 +60,7 @@ class Writer(object):
         """
         if filename in self._overridden_files:
             if override:
-                raise StandardError('File %s is set to be overridden twice'
+                raise RuntimeError('File %s is set to be overridden twice'
                                     % filename)
             else:
                 logger.info('skipping %s' % filename)
@@ -69,7 +69,7 @@ class Writer(object):
             if override:
                 logger.info('overwriting %s' % filename)
             else:
-                raise StandardError('File %s is to be overwritten' % filename)
+                raise RuntimeError('File %s is to be overwritten' % filename)
         if override:
             self._overridden_files.add(filename)
         self._written_files.add(filename)

From 2b5db0321b021e54f8a966c1aa01a1f8f34d9ddd Mon Sep 17 00:00:00 2001
From: Jed Brown <jedbrown@mcs.anl.gov>
Date: Fri, 11 Oct 2013 22:28:43 -0500
Subject: [PATCH 2/8] docs/plugins.rst: fix signal name
 "page_generator_context"

The old "pages_generate_context" dates from before pelican-3.2
standardization, but AFAIK, "page_generate_context" was never correct.
---
 docs/plugins.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/plugins.rst b/docs/plugins.rst
index 6de01d05..5e311fb6 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -80,7 +80,7 @@ article_generator_finalized     article_generator               invoked at the e
 get_generators                  generators                      invoked in Pelican.get_generator_classes,
                                                                 can return a Generator, or several
                                                                 generator in a tuple or in a list.
-page_generate_context           page_generator, metadata
+page_generator_context          page_generator, metadata
 page_generator_init             page_generator                  invoked in the PagesGenerator.__init__
 page_generator_finalized        page_generator                  invoked at the end of PagesGenerator.generate_context
 content_object_init             content_object                  invoked at the end of Content.__init__ (see note below)

From 04dba17b800b7c67e43706a8a164ebf697bba10f Mon Sep 17 00:00:00 2001
From: zhouji <calf.zhou@gmail.com>
Date: Wed, 16 Oct 2013 17:06:56 +0800
Subject: [PATCH 3/8] Fix #1117 Make intra-link support all url-value HTML
 attributes.

---
 pelican/contents.py | 58 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index dbc33716..39322e99 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -125,6 +125,52 @@ class Content(object):
         if 'summary' in metadata:
             self._summary = metadata['summary']
 
+        # prepare the list of HTML tag attributes which have a URL value.
+        # refer: http://stackoverflow.com/questions/2725156/complete-list-of-html-tag-attributes-which-have-a-url-value
+        self._url_attributes = {  # each item in this set is a tuple composed by tag_name, attr_name
+            # HTML4 tags
+            ('a', 'href'),
+            ('applet', 'codebase'),
+            ('area', 'href'),
+            ('base', 'href'),
+            ('blockquote', 'cite'),
+            ('body', 'background'),
+            ('del', 'cite'),
+            ('form', 'action'),
+            ('frame', 'longdesc'),
+            ('frame', 'src'),
+            ('head', 'profile'),
+            ('iframe', 'longdesc'),
+            ('iframe', 'src'),
+            ('img', 'longdesc'),
+            ('img', 'src'),
+            ('img', 'usemap'),
+            ('input', 'src'),
+            ('input', 'usemap'),
+            ('ins', 'cite'),
+            ('link', 'href'),
+            ('object', 'classid'),
+            ('object', 'codebase'),
+            ('object', 'data'),
+            ('object', 'usemap'),
+            ('q', 'cite'),
+            ('script', 'src'),
+
+            # HTML5 tags
+            ('audio', 'src'),
+            ('button', 'formaction'),
+            ('command', 'icon'),
+            ('embed', 'src'),
+            ('html', 'manifest'),
+            ('input', 'formaction'),
+            ('source', 'src'),
+            ('video', 'poster'),
+            ('video', 'src'),
+        }
+        """:type: set of (tuple of (string, string)"""
+        attribute_names = set(pair[1] for pair in self._url_attributes)
+        self._url_attr_pattern = '|'.join(attribute_names)
+
         signals.content_object_init.send(self)
 
     def __str__(self):
@@ -189,12 +235,12 @@ class Content(object):
 
         instrasite_link_regex = self.settings['INTRASITE_LINK_REGEX']
         regex = r"""
-            (?P<markup><\s*[^\>]*  # match tag with src and href attr
-                (?:href|src)\s*=)
+            (?P<markup><\s*(?P<tag>[^\s\>]+)[^\>]*  # match tag with all url-value attributes
+                (?P<attr>{1})\s*=)
 
             (?P<quote>["\'])      # require value to be quoted
             (?P<path>{0}(?P<value>.*?))  # the url value
-            \2""".format(instrasite_link_regex)
+            \4""".format(instrasite_link_regex, self._url_attr_pattern)
         hrefs = re.compile(regex, re.X)
 
         def replacer(m):
@@ -203,6 +249,12 @@ class Content(object):
             path = value.path
             origin = m.group('path')
 
+            # verify HTML tag and attribute pair to avoid miss-replacing
+            tag = m.group('tag')
+            attr = m.group('attr')
+            if attr != 'href' and attr != 'src' and (tag, attr) not in self._url_attributes:
+                return m.group(0)
+
             # XXX Put this in a different location.
             if what == 'filename':
                 if path.startswith('/'):

From e538aa2cdeb4eed2df40bcf0a414c0930ab05e25 Mon Sep 17 00:00:00 2001
From: zhouji <calf.zhou@gmail.com>
Date: Thu, 17 Oct 2013 11:33:34 +0800
Subject: [PATCH 4/8] Fine-tune url-value HTML attributes list.

---
 pelican/contents.py            | 58 ++--------------------------------
 pelican/tests/test_contents.py | 55 ++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/pelican/contents.py b/pelican/contents.py
index 39322e99..059c54a7 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -125,52 +125,6 @@ class Content(object):
         if 'summary' in metadata:
             self._summary = metadata['summary']
 
-        # prepare the list of HTML tag attributes which have a URL value.
-        # refer: http://stackoverflow.com/questions/2725156/complete-list-of-html-tag-attributes-which-have-a-url-value
-        self._url_attributes = {  # each item in this set is a tuple composed by tag_name, attr_name
-            # HTML4 tags
-            ('a', 'href'),
-            ('applet', 'codebase'),
-            ('area', 'href'),
-            ('base', 'href'),
-            ('blockquote', 'cite'),
-            ('body', 'background'),
-            ('del', 'cite'),
-            ('form', 'action'),
-            ('frame', 'longdesc'),
-            ('frame', 'src'),
-            ('head', 'profile'),
-            ('iframe', 'longdesc'),
-            ('iframe', 'src'),
-            ('img', 'longdesc'),
-            ('img', 'src'),
-            ('img', 'usemap'),
-            ('input', 'src'),
-            ('input', 'usemap'),
-            ('ins', 'cite'),
-            ('link', 'href'),
-            ('object', 'classid'),
-            ('object', 'codebase'),
-            ('object', 'data'),
-            ('object', 'usemap'),
-            ('q', 'cite'),
-            ('script', 'src'),
-
-            # HTML5 tags
-            ('audio', 'src'),
-            ('button', 'formaction'),
-            ('command', 'icon'),
-            ('embed', 'src'),
-            ('html', 'manifest'),
-            ('input', 'formaction'),
-            ('source', 'src'),
-            ('video', 'poster'),
-            ('video', 'src'),
-        }
-        """:type: set of (tuple of (string, string)"""
-        attribute_names = set(pair[1] for pair in self._url_attributes)
-        self._url_attr_pattern = '|'.join(attribute_names)
-
         signals.content_object_init.send(self)
 
     def __str__(self):
@@ -235,12 +189,12 @@ class Content(object):
 
         instrasite_link_regex = self.settings['INTRASITE_LINK_REGEX']
         regex = r"""
-            (?P<markup><\s*(?P<tag>[^\s\>]+)[^\>]*  # match tag with all url-value attributes
-                (?P<attr>{1})\s*=)
+            (?P<markup><\s*[^\>]*  # match tag with all url-value attributes
+                (?:href|src|poster|data|cite|formaction|action)\s*=)
 
             (?P<quote>["\'])      # require value to be quoted
             (?P<path>{0}(?P<value>.*?))  # the url value
-            \4""".format(instrasite_link_regex, self._url_attr_pattern)
+            \2""".format(instrasite_link_regex)
         hrefs = re.compile(regex, re.X)
 
         def replacer(m):
@@ -249,12 +203,6 @@ class Content(object):
             path = value.path
             origin = m.group('path')
 
-            # verify HTML tag and attribute pair to avoid miss-replacing
-            tag = m.group('tag')
-            attr = m.group('attr')
-            if attr != 'href' and attr != 'src' and (tag, attr) not in self._url_attributes:
-                return m.group(0)
-
             # XXX Put this in a different location.
             if what == 'filename':
                 if path.startswith('/'):
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 9c894ffc..92e61355 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -268,6 +268,61 @@ class TestPage(unittest.TestCase):
             '?utm_whatever=234&highlight=word#section-2">link</a>'
         )
 
+    def test_intrasite_link_more(self):
+        # type does not take unicode in PY2 and bytes in PY3, which in
+        # combination with unicode literals leads to following insane line:
+        cls_name = '_DummyAsset' if six.PY3 else b'_DummyAsset'
+
+        args = self.page_kwargs.copy()
+        args['settings'] = get_settings()
+        args['source_path'] = 'content'
+        args['context']['filenames'] = {
+            'images/poster.jpg': type(cls_name, (object,), {'url': 'images/poster.jpg'}),
+            'assets/video.mp4': type(cls_name, (object,), {'url': 'assets/video.mp4'}),
+            'images/graph.svg': type(cls_name, (object,), {'url': 'images/graph.svg'}),
+            'reference.rst': type(cls_name, (object,), {'url': 'reference.html'}),
+        }
+
+        # video.poster
+        args['content'] = (
+            'There is a video with poster '
+            '<video controls poster="{filename}/images/poster.jpg">'
+            '<source src="|filename|/assets/video.mp4" type="video/mp4">'
+            '</video>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEqual(
+            content,
+            'There is a video with poster '
+            '<video controls poster="http://notmyidea.org/images/poster.jpg">'
+            '<source src="http://notmyidea.org/assets/video.mp4" type="video/mp4">'
+            '</video>'
+        )
+
+        # object.data
+        args['content'] = (
+            'There is a svg object '
+            '<object data="{filename}/images/graph.svg" type="image/svg+xml"></object>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEqual(
+            content,
+            'There is a svg object '
+            '<object data="http://notmyidea.org/images/graph.svg" type="image/svg+xml"></object>'
+        )
+
+        # blockquote.cite
+        args['content'] = (
+            'There is a blockquote with cite attribute '
+            '<blockquote cite="{filename}reference.rst">blah blah</blockquote>'
+        )
+        content = Page(**args).get_content('http://notmyidea.org')
+        self.assertEqual(
+            content,
+            'There is a blockquote with cite attribute '
+            '<blockquote cite="http://notmyidea.org/reference.html">blah blah</blockquote>'
+        )
+
 
 class TestArticle(TestPage):
     def test_template(self):

From ae2afa27fc6841a9785f13f14bfd17bebbd1f516 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 19 Oct 2013 17:20:13 +0200
Subject: [PATCH 5/8] Clarify FAQ entry re: need to install Markdown

Folks keep running into this error, which probably signals a need to
change this behavior. After all, it wouldn't be hard for us to detect
what's going on and provide a better error message, such as: "It looks
like you're trying to process Markdown, but the Markdown library is not
currently installed. Please install the Python-Markdown library via 'pip
install markdown'."

Until we implement something akin to the above, this should serve as a
slightly-improved FAQ entry in the interim.
---
 docs/faq.rst | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index da37af04..80e14d21 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -65,12 +65,13 @@ How do I create my own theme?
 
 Please refer to :ref:`theming-pelican`.
 
-I want to use Markdown, but I got an error.
-===========================================
+I'm using Markdown and getting ``No valid files found in content`` errors.
+==========================================================================
 
-Markdown is not a hard dependency for Pelican, so you will need to explicitly
-install it. You can do so by typing the following command, prepending ``sudo``
-if permissions require it::
+Markdown is not a hard dependency for Pelican, so if you have content in
+Markdown format, you will need to explicitly install the Markdown library.
+You can do so by typing the following command, prepending ``sudo`` if
+permissions require it::
 
     pip install markdown
 

From 9331e42ee10c0a3537d93b000c0a41508758d401 Mon Sep 17 00:00:00 2001
From: Jon Chen <bsd@voltaire.sh>
Date: Thu, 24 Oct 2013 14:36:03 -0400
Subject: [PATCH 6/8] use // instead of explicitly defining http

for twitter as well

update sample output
---
 pelican/tests/output/custom/a-markdown-powered-article.html   | 4 ++--
 pelican/tests/output/custom/archives.html                     | 2 +-
 pelican/tests/output/custom/article-1.html                    | 4 ++--
 pelican/tests/output/custom/article-2.html                    | 4 ++--
 pelican/tests/output/custom/article-3.html                    | 4 ++--
 pelican/tests/output/custom/author/alexis-metaireau.html      | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau2.html     | 2 +-
 pelican/tests/output/custom/author/alexis-metaireau3.html     | 2 +-
 pelican/tests/output/custom/authors.html                      | 2 +-
 pelican/tests/output/custom/categories.html                   | 2 +-
 pelican/tests/output/custom/category/bar.html                 | 2 +-
 pelican/tests/output/custom/category/cat1.html                | 2 +-
 pelican/tests/output/custom/category/misc.html                | 2 +-
 pelican/tests/output/custom/category/yeah.html                | 2 +-
 pelican/tests/output/custom/drafts/a-draft-article.html       | 2 +-
 pelican/tests/output/custom/filename_metadata-example.html    | 4 ++--
 pelican/tests/output/custom/index.html                        | 2 +-
 pelican/tests/output/custom/index2.html                       | 2 +-
 pelican/tests/output/custom/index3.html                       | 2 +-
 pelican/tests/output/custom/jinja2_template.html              | 2 +-
 pelican/tests/output/custom/oh-yeah-fr.html                   | 4 ++--
 pelican/tests/output/custom/oh-yeah.html                      | 4 ++--
 pelican/tests/output/custom/override/index.html               | 2 +-
 .../tests/output/custom/pages/this-is-a-test-hidden-page.html | 2 +-
 pelican/tests/output/custom/pages/this-is-a-test-page.html    | 2 +-
 pelican/tests/output/custom/second-article-fr.html            | 4 ++--
 pelican/tests/output/custom/second-article.html               | 4 ++--
 pelican/tests/output/custom/tag/bar.html                      | 2 +-
 pelican/tests/output/custom/tag/baz.html                      | 4 ++--
 pelican/tests/output/custom/tag/foo.html                      | 2 +-
 pelican/tests/output/custom/tag/foobar.html                   | 2 +-
 pelican/tests/output/custom/tag/oh.html                       | 2 +-
 pelican/tests/output/custom/tag/yeah.html                     | 2 +-
 pelican/tests/output/custom/tags.html                         | 2 +-
 pelican/tests/output/custom/this-is-a-super-article.html      | 4 ++--
 pelican/tests/output/custom/unbelievable.html                 | 4 ++--
 pelican/themes/notmyidea/templates/article.html               | 2 +-
 pelican/themes/notmyidea/templates/disqus_script.html         | 2 +-
 pelican/themes/notmyidea/templates/twitter.html               | 4 ++--
 39 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 4d1fe16f..515b0298 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -59,7 +59,7 @@
         var disqus_url = "./a-markdown-powered-article.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -105,7 +105,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index a2ab7430..13c3d980 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -92,7 +92,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 89e12914..6faed3be 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -58,7 +58,7 @@
         var disqus_url = "./article-1.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -104,7 +104,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 1113e5e8..d1e89db8 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -58,7 +58,7 @@
         var disqus_url = "./article-2.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -104,7 +104,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index c7306605..5c287a13 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -58,7 +58,7 @@
         var disqus_url = "./article-3.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -104,7 +104,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index d2350bd5..19c254a0 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -165,7 +165,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 91ef0696..772d2939 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -175,7 +175,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 77c9cdfe..f3d985c3 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -130,7 +130,7 @@ pelican.conf, it ...</p></div>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index adb3d992..eb2becfd 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -71,7 +71,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 5d839648..17d9de76 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -72,7 +72,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 3f1bbc4a..30545518 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -95,7 +95,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 81718322..9a737b76 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -162,7 +162,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 36479803..b70afcdf 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -173,7 +173,7 @@ pelican.conf, it ...</p></div>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 53666b0b..02d07413 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -99,7 +99,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index b8306208..440780a3 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -92,7 +92,7 @@ listed anywhere else.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index fcbda9c2..1252aba8 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -58,7 +58,7 @@
         var disqus_url = "./filename_metadata-example.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -104,7 +104,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 3fa1d5c3..c7174715 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -165,7 +165,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 8769d098..b349b3ca 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -175,7 +175,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index b4d9ffc6..c668dba6 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -130,7 +130,7 @@ pelican.conf, it ...</p></div>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 31beac32..0eafa913 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -69,7 +69,7 @@ Some text
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 410c721f..4450514a 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -60,7 +60,7 @@ Translations:
         var disqus_url = "./oh-yeah-fr.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -106,7 +106,7 @@ Translations:
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index dab28171..95cf0317 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -65,7 +65,7 @@ YEAH !</p>
         var disqus_url = "./oh-yeah.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -111,7 +111,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 9c48d76f..e84d79fe 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -73,7 +73,7 @@ at a custom location.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index a061b7ee..dced8107 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -73,7 +73,7 @@ Anyone can see this page but it's not linked to anywhere!</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index af50adf8..46ea4fef 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -73,7 +73,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index cbeef437..b4a04ee8 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -60,7 +60,7 @@
         var disqus_url = "./second-article-fr.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -106,7 +106,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 57009066..04f038c8 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -60,7 +60,7 @@
         var disqus_url = "./second-article.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -106,7 +106,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 9560b712..7a90eff2 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -148,7 +148,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index c6ebe542..f794b351 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -58,7 +58,7 @@
         var disqus_url = "../tag/baz.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -104,7 +104,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index d5b0d413..d99df63b 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -118,7 +118,7 @@ as well as <strong>inline markup</strong>.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 0b4d2471..ded91f12 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -99,7 +99,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index 3b30a39c..21c8e352 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -72,7 +72,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index a6764575..523358b5 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -95,7 +95,7 @@ YEAH !</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index bc9b9d20..2e70c9e8 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -76,7 +76,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 0a580e25..d251b0ec 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -69,7 +69,7 @@
         var disqus_url = "./this-is-a-super-article.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -115,7 +115,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 03b533bb..0d87bbf6 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -90,7 +90,7 @@ pelican.conf, it will have nothing in default.</p>
         var disqus_url = "./unbelievable.html";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://blog-notmyidea.disqus.com/embed.js';
+        dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
@@ -136,7 +136,7 @@ pelican.conf, it will have nothing in default.</p>
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 516fd3b5..367222b2 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -23,7 +23,7 @@
         var disqus_url = "{{ SITEURL }}/{{ article.url }}";
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+        dsq.src = '//{{ DISQUS_SITENAME }}.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
diff --git a/pelican/themes/notmyidea/templates/disqus_script.html b/pelican/themes/notmyidea/templates/disqus_script.html
index c4f442c8..4ee419bb 100644
--- a/pelican/themes/notmyidea/templates/disqus_script.html
+++ b/pelican/themes/notmyidea/templates/disqus_script.html
@@ -4,7 +4,7 @@
     (function () {
         var s = document.createElement('script'); s.async = true;
         s.type = 'text/javascript';
-        s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
         (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
     }());
 </script>
diff --git a/pelican/themes/notmyidea/templates/twitter.html b/pelican/themes/notmyidea/templates/twitter.html
index c6b159f4..7247a0c6 100644
--- a/pelican/themes/notmyidea/templates/twitter.html
+++ b/pelican/themes/notmyidea/templates/twitter.html
@@ -1,3 +1,3 @@
 {% if TWITTER_USERNAME %}
-<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-{% endif %}
\ No newline at end of file
+<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
+{% endif %}

From 6c808e426fe5287b49fdd6a56067aa90eaaba963 Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@deldycke.com>
Date: Mon, 21 Oct 2013 23:38:25 +0200
Subject: [PATCH 7/8] Document video support in Markdown and reST.

---
 THANKS        | 1 +
 docs/tips.rst | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/THANKS b/THANKS
index e4eed231..1d867471 100644
--- a/THANKS
+++ b/THANKS
@@ -88,6 +88,7 @@ Joseph Reagle
 Joshua Adelman
 Julian Berman
 Justin Mayer
+Kevin Deldycke
 Kyle Fuller
 Laureline Guerin
 Leonard Huang
diff --git a/docs/tips.rst b/docs/tips.rst
index 7629481f..b140ea3c 100644
--- a/docs/tips.rst
+++ b/docs/tips.rst
@@ -94,3 +94,8 @@ directly into your source content.
 
 Alternatively, you can also use Pelican plugins like ``liquid_tags``,
 ``pelican_youtube``, or ``pelican_vimeo`` to embed videos in your content.
+
+Moreover, markup languages like reST and Markdown have plugins that let you
+embed videos in the markup. You can use `reST video directive
+<https://gist.github.com/dbrgn/2922648>`_ for reST or `mdx_video plugin
+<https://github.com/italomaia/mdx-video>`_ for Markdown.

From 5e5510cfcf65b873881d9e08adcb54ac1db9c730 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sun, 27 Oct 2013 09:27:30 -0700
Subject: [PATCH 8/8] Improve Disqus embed code in notmyidea theme

According to Disqus, the disqus_shortname variable is a required field.
Also added a <noscript> notice for those who have JS disabled.
---
 .../tests/output/custom/a-markdown-powered-article.html   | 6 ++++--
 pelican/tests/output/custom/article-1.html                | 6 ++++--
 pelican/tests/output/custom/article-2.html                | 6 ++++--
 pelican/tests/output/custom/article-3.html                | 6 ++++--
 .../tests/output/custom/filename_metadata-example.html    | 6 ++++--
 pelican/tests/output/custom/oh-yeah-fr.html               | 6 ++++--
 pelican/tests/output/custom/oh-yeah.html                  | 6 ++++--
 pelican/tests/output/custom/second-article-fr.html        | 6 ++++--
 pelican/tests/output/custom/second-article.html           | 6 ++++--
 pelican/tests/output/custom/tag/baz.html                  | 6 ++++--
 pelican/tests/output/custom/this-is-a-super-article.html  | 6 ++++--
 pelican/tests/output/custom/unbelievable.html             | 6 ++++--
 pelican/themes/notmyidea/templates/article.html           | 8 +++++---
 13 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 515b0298..a5c1bb35 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -55,14 +55,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "a-markdown-powered-article.html";
-        var disqus_url = "./a-markdown-powered-article.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'a-markdown-powered-article.html';
+        var disqus_url = './a-markdown-powered-article.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 6faed3be..629ba81d 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -54,14 +54,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "article-1.html";
-        var disqus_url = "./article-1.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'article-1.html';
+        var disqus_url = './article-1.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index d1e89db8..56d6360a 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -54,14 +54,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "article-2.html";
-        var disqus_url = "./article-2.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'article-2.html';
+        var disqus_url = './article-2.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index 5c287a13..fac56b98 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -54,14 +54,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "article-3.html";
-        var disqus_url = "./article-3.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'article-3.html';
+        var disqus_url = './article-3.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 1252aba8..9967b4ce 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -54,14 +54,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "filename_metadata-example.html";
-        var disqus_url = "./filename_metadata-example.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'filename_metadata-example.html';
+        var disqus_url = './filename_metadata-example.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index 4450514a..bdafb45f 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -56,14 +56,16 @@ Translations:
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "oh-yeah-fr.html";
-        var disqus_url = "./oh-yeah-fr.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'oh-yeah-fr.html';
+        var disqus_url = './oh-yeah-fr.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 95cf0317..8068a224 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -61,14 +61,16 @@ YEAH !</p>
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "oh-yeah.html";
-        var disqus_url = "./oh-yeah.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'oh-yeah.html';
+        var disqus_url = './oh-yeah.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index b4a04ee8..c1400c7c 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -56,14 +56,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "second-article-fr.html";
-        var disqus_url = "./second-article-fr.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'second-article-fr.html';
+        var disqus_url = './second-article-fr.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index 04f038c8..e37e90f3 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -56,14 +56,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "second-article.html";
-        var disqus_url = "./second-article.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'second-article.html';
+        var disqus_url = './second-article.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index f794b351..81f419be 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -54,14 +54,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "tag/baz.html";
-        var disqus_url = "../tag/baz.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'tag/baz.html';
+        var disqus_url = '../tag/baz.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index d251b0ec..d3a3c038 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -65,14 +65,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "this-is-a-super-article.html";
-        var disqus_url = "./this-is-a-super-article.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'this-is-a-super-article.html';
+        var disqus_url = './this-is-a-super-article.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index 0d87bbf6..8b2d26ce 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -86,14 +86,16 @@ pelican.conf, it will have nothing in default.</p>
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "unbelievable.html";
-        var disqus_url = "./unbelievable.html";
+        var disqus_shortname = 'blog-notmyidea';
+        var disqus_identifier = 'unbelievable.html';
+        var disqus_url = './unbelievable.html';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//blog-notmyidea.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
 
   </article>
diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 367222b2..06110b43 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -6,7 +6,7 @@
     <header>
       <h1 class="entry-title">
         <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
-           title="Permalink to {{ article.title|striptags }}">{{ article.title}}</a></h1>
+           title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
       {% include 'twitter.html' %}
     </header>
 
@@ -19,14 +19,16 @@
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
-        var disqus_identifier = "{{ article.url }}";
-        var disqus_url = "{{ SITEURL }}/{{ article.url }}";
+        var disqus_shortname = '{{ DISQUS_SITENAME }}';
+        var disqus_identifier = '{{ article.url }}';
+        var disqus_url = '{{ SITEURL }}/{{ article.url }}';
         (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
         dsq.src = '//{{ DISQUS_SITENAME }}.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
         })();
       </script>
+      <noscript>Please enable JavaScript to view the comments.</noscript>
     </div>
     {% endif %}