From 6d120e5f740f3b9a3f9ffd52da5c748b2f06cbca Mon Sep 17 00:00:00 2001
From: Aleph Melo <alephmelo@icloud.com>
Date: Sun, 16 Apr 2017 16:50:45 -0300
Subject: Fix #2927 - Change to listen = localhost:6543.

---
 docs/quick_tutorial/cookiecutters/development.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/quick_tutorial/cookiecutters')

diff --git a/docs/quick_tutorial/cookiecutters/development.ini b/docs/quick_tutorial/cookiecutters/development.ini
index 86b54b51d..a5093fb52 100644
--- a/docs/quick_tutorial/cookiecutters/development.ini
+++ b/docs/quick_tutorial/cookiecutters/development.ini
@@ -24,7 +24,7 @@ pyramid.includes =
 
 [server:main]
 use = egg:waitress#main
-listen = 127.0.0.1:6543 [::1]:6543
+listen = localhost:6543
 
 ###
 # logging configuration
-- 
cgit v1.2.3


From c5538ea907990a19994c9d9acda92e602a8769c4 Mon Sep 17 00:00:00 2001
From: Fang-Pen Lin <bornstub@gmail.com>
Date: Mon, 22 May 2017 16:54:17 -0700
Subject: Also replace script tags appear everywhere

---
 .../cookiecutters/cc_starter/templates/layout.jinja2              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'docs/quick_tutorial/cookiecutters')

diff --git a/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2 b/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2
index 20da74879..3aed0a123 100644
--- a/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2
+++ b/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2
@@ -18,8 +18,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-      <script src="//oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+      <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js" integrity="sha384-0s5Pv64cNZJieYFkXYOTId2HMA2Lfb6q2nAcx2n0RTLUnCAoTTsS0nKEO27XyKcY" crossorigin="anonymous"></script>
+      <script src="//oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js" integrity="sha384-f1r2UzjsxZ9T4V1f2zBO/evUqSEOpeaUUZcMTz1Up63bl4ruYnFYeM+BxI4NhyI0" crossorigin="anonymous"></script>
     <![endif]-->
   </head>
 
@@ -58,7 +58,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="//oss.maxcdn.com/libs/jquery/1.10.2/jquery.min.js"></script>
-    <script src="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/js/bootstrap.min.js"></script>
+    <script src="//oss.maxcdn.com/libs/jquery/1.10.2/jquery.min.js" integrity="sha384-aBL3Lzi6c9LNDGvpHkZrrm3ZVsIwohDD7CDozL0pk8FwCrfmV7H9w8j3L7ikEv6h" crossorigin="anonymous"></script>
+    <script src="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/js/bootstrap.min.js" integrity="sha384-s1ITto93iSMDxlp/79qhWHi+LsIi9Gx6yL+cOKDuymvihkfol83TYbLbOw+W/wv4" crossorigin="anonymous"></script>
   </body>
 </html>
-- 
cgit v1.2.3


From 2cd6a6dbcdb517788ef3275af63feca703e73658 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Thu, 15 Jun 2017 21:59:18 -0700
Subject: Use HTTPS for pylonsproject.org

---
 docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/quick_tutorial/cookiecutters')

diff --git a/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2 b/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2
index 3aed0a123..175a7b30b 100644
--- a/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2
+++ b/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2
@@ -42,7 +42,7 @@
             <ul>
               <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
               <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="https://webchat.freenode.net/?channels=pyramid">IRC Channel</a></li>
-              <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li>
+              <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="https://pylonsproject.org/">Pylons Project</a></li>
             </ul>
           </div>
         </div>
-- 
cgit v1.2.3


From 80ce00e7a408fc295d9eb1ffef3cdc6073a01b5e Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Thu, 15 Jun 2017 22:04:05 -0700
Subject: remove trailing slash

---
 docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/quick_tutorial/cookiecutters')

diff --git a/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2 b/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2
index 175a7b30b..2d8a341d9 100644
--- a/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2
+++ b/docs/quick_tutorial/cookiecutters/cc_starter/templates/layout.jinja2
@@ -42,7 +42,7 @@
             <ul>
               <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
               <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="https://webchat.freenode.net/?channels=pyramid">IRC Channel</a></li>
-              <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="https://pylonsproject.org/">Pylons Project</a></li>
+              <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="https://pylonsproject.org">Pylons Project</a></li>
             </ul>
           </div>
         </div>
-- 
cgit v1.2.3