Merge lp:~bradputzier/ubuntu-za/bug into lp:ubuntu-za

[Bradley Putzier]

Fix the URL "Http" to correct the poll display site.

Note, testing is tricky as no https seems possible with "nikola serve". Link works fine on http.

[Raoul Snyman (raoul-snyman)]

In future, when you commit a fix for a bug, use the "--fixes" command line option, like so:

  bzr commit -m "Fix for bug #1426130" --fixes=lp:1426130

This links your branch and this merge to the bug.

review: Approve

[Raoul Snyman (raoul-snyman)]

Additionally, name your branch "bug-1426130" to make it easier for Launchpad to associate your branch with the bug.

=== modified file 'pages/poll.rst'
--- pages/poll.rst	2015-02-21 13:05:23 +0000
+++ pages/poll.rst	2015-03-07 03:32:33 +0000
@@ -12,7 +12,7 @@
         <div class="col-md-3">&nbsp;</div>
         <div class="col-md-6 well">
             <p><strong>Share your choice with us </strong></p>
-				<iframe src="http://strawpoll.me/embed_1/3695197" style="width: 550px; height: 610px; border: 0;">Loading poll...</iframe>
+				<iframe src="//strawpoll.me/embed_1/3695197" style="width: 550px; height: 610px; border: 0;">Loading poll...</iframe>
         </div>
         <div class="col-md-3">&nbsp;</div>
     </div>
@@ -22,7 +22,7 @@
         <div class="col-md-3">&nbsp;</div>
         <div class="col-md-6 well">
             <p><strong>What others are using </strong></p>
-				<iframe src="http://strawpoll.me/embed_1/3695197/r" style="width: 550px; height: 610px; border: 0;">Loading poll...</iframe>
+				<iframe src="//strawpoll.me/embed_1/3695197/r" style="width: 550px; height: 610px; border: 0;">Loading poll...</iframe>
          </div>
         <div class="col-md-3">&nbsp;</div>
     </div>