summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt3
-rw-r--r--CONTRIBUTORS.txt2
-rw-r--r--docs/narr/MyProject/myproject/templates/mytemplate.pt2
-rw-r--r--pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl2
-rw-r--r--pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl2
-rw-r--r--pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl2
6 files changed, 9 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index de0a4324b..0c461e550 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -35,6 +35,9 @@ Scaffolds
templates to have links to correctly versioned documentation and reflect
which pyramid was used to generate the scaffold.
+- 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
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 976011ecb..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>