From 44a20139152b6855bfaa6138214d745939ca82f9 Mon Sep 17 00:00:00 2001
From: Fenton Travers <fenton.travers@oracle.com>
Date: Thu, 24 Apr 2014 13:05:52 -0700
Subject: The copyright symbol causes this error:

UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 2559: ordinal not in range(128)
---
 pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
index 976011ecb..a1b07a1ca 100644
--- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
@@ -50,7 +50,7 @@
         </div>
         <div class="row">
           <div class="copyright">
-            Copyright © Pylons Project
+            Copyright Pylons Project
           </div>
         </div>
       </div>
-- 
cgit v1.2.3


From 6541717478e958143b73256f113cf709ebaa40d6 Mon Sep 17 00:00:00 2001
From: Fenton Travers <fenton.travers@oracle.com>
Date: Thu, 24 Apr 2014 14:03:49 -0700
Subject: Replaced non-ascii copyright character with HTML equivalent.

---
 docs/narr/MyProject/myproject/templates/mytemplate.pt            | 2 +-
 pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl | 2 +-
 pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl | 2 +-
 pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt
index d1af4f42c..e6b00a145 100644
--- a/docs/narr/MyProject/myproject/templates/mytemplate.pt
+++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt
@@ -50,7 +50,7 @@
         </div>
         <div class="row">
           <div class="copyright">
-            Copyright © Pylons Project
+            Copyright &copy; Pylons Project
           </div>
         </div>
       </div>
diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
index a1b07a1ca..73d0976b9 100644
--- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
@@ -50,7 +50,7 @@
         </div>
         <div class="row">
           <div class="copyright">
-            Copyright Pylons Project
+            Copyright &copy; Pylons Project
           </div>
         </div>
       </div>
diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
index 3c27906a0..738a16817 100644
--- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
@@ -50,7 +50,7 @@
         </div>
         <div class="row">
           <div class="copyright">
-            Copyright © Pylons Project
+            Copyright &copy; Pylons Project
           </div>
         </div>
       </div>
diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
index 56efda8b4..855944899 100644
--- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
@@ -50,7 +50,7 @@
         </div>
         <div class="row">
           <div class="copyright">
-            Copyright © Pylons Project
+            Copyright &copy; Pylons Project
           </div>
         </div>
       </div>
-- 
cgit v1.2.3


From 93bc46364b13723194dba62fe78dee8b358d6401 Mon Sep 17 00:00:00 2001
From: Fenton Travers <fenton.travers@oracle.com>
Date: Tue, 6 May 2014 23:28:23 -0700
Subject: Added required notes to changes/contributors file.

---
 CHANGES.txt      | 3 +++
 CONTRIBUTORS.txt | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index c14939d81..1e2e42413 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,9 @@ Next release
 - ``pyramid.wsgi.wsgiapp`` and ``pyramid.wsgi.wsgiapp2`` now raise
   ``ValueError`` when accidentally passed ``None``.
 
+- Removed non-ascii copyright symbol from templates, as this was
+  causing the scaffolds to fail for project generation.
+
 1.5 (2014-04-08)
 ================
 
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index d1ac72df5..c77d3e92c 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -230,3 +230,5 @@ Contributors
 - Antti Haapala, 2013/11/15
 
 - Amit Mane, 2014/01/23
+
+- Fenton Travers, 2014/05/06
-- 
cgit v1.2.3