summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-25 23:00:44 -0500
committerChris McDonough <chrism@plope.com>2011-01-25 23:00:44 -0500
commitbd330cfc22555ce0026b92d40091d0745b60e36c (patch)
treea82eec77cb2fff5d65a04ae1335fe7fc33fe0b53
parent63c1e06f6609a619d503db0704c7c1ed1e12939b (diff)
downloadpyramid-bd330cfc22555ce0026b92d40091d0745b60e36c.tar.gz
pyramid-bd330cfc22555ce0026b92d40091d0745b60e36c.tar.bz2
pyramid-bd330cfc22555ce0026b92d40091d0745b60e36c.zip
- Use &copy; instead of copyright symbol in paster templates / tutorial
templates for the benefit of folks who cutnpaste and save to a non-UTF8 format.
-rw-r--r--CHANGES.txt11
-rw-r--r--TODO.txt3
-rw-r--r--docs/narr/MyProject/myproject/templates/mytemplate.pt4
-rw-r--r--docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt2
-rw-r--r--docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt2
-rw-r--r--docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt4
-rw-r--r--docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt2
-rw-r--r--docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt4
-rw-r--r--docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt4
-rw-r--r--docs/tutorials/wiki/src/views/tutorial/templates/edit.pt2
-rw-r--r--docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt4
-rw-r--r--docs/tutorials/wiki/src/views/tutorial/templates/view.pt2
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt2
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt2
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt4
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt2
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt4
-rw-r--r--docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt4
-rw-r--r--docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt2
-rw-r--r--docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt4
-rw-r--r--docs/tutorials/wiki2/src/views/tutorial/templates/view.pt2
-rw-r--r--pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl4
-rw-r--r--pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl4
-rw-r--r--pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl4
-rw-r--r--pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl4
-rw-r--r--pyramid/paster_templates/starter/+package+/tests.py_tmpl2
-rw-r--r--pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl4
27 files changed, 49 insertions, 43 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index a43e19648..e3f4dc02d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,14 @@
+Next release
+============
+
+Bug Fixes
+---------
+
+- Use &copy; instead of copyright symbol in paster templates / tutorial
+ templates for the benefit of folks who cutnpaste and save to a non-UTF8
+ format.
+
+
1.0b2 (2011-01-24)
==================
diff --git a/TODO.txt b/TODO.txt
index 4aabf7b63..258528039 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -6,9 +6,6 @@ Before Release
- Consider per-form_id CSRF instead of per-session global CSRF token.
-- Use &copy; instead of copyright symbol in paster templates / tutorials for
- the benefit of folks who cutnpaste and save to a non-UTF8 format.
-
- https://github.com/Pylons/pyramid/issues#issue/67 (fixing would make it
possible to render a static site from a static dir).
diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt
index 0bfea9d53..03e7d9091 100644
--- a/docs/narr/MyProject/myproject/templates/mytemplate.pt
+++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt
@@ -100,7 +100,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2010, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2010, Agendaless Consulting.</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
index b5fa54dec..30767b28b 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt
@@ -55,7 +55,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
</html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
index 554b4ea87..09bcff65d 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt
@@ -51,7 +51,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
</html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
index e31a342b2..712fd0737 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
@@ -69,7 +69,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
index d77d174c1..113144687 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt
@@ -58,7 +58,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
</html>
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
index 2a2340683..c4dfc0707 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
@@ -69,7 +69,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
index e31a342b2..712fd0737 100644
--- a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
@@ -69,7 +69,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
index c6c589c1a..e287e174e 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/edit.pt
@@ -51,7 +51,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
</html>
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
index e31a342b2..712fd0737 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
@@ -69,7 +69,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
index 97b87c44f..992c5aa43 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/view.pt
@@ -54,7 +54,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
</html>
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt
index cea9b4932..27ab544b5 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt
@@ -55,7 +55,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
</html>
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt b/docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt
index 554b4ea87..09bcff65d 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt
@@ -51,7 +51,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
</html>
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt
index e31a342b2..712fd0737 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt
@@ -69,7 +69,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt b/docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt
index 7d01aefb9..6f015c5dd 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt
@@ -58,7 +58,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
</html>
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt
index e31a342b2..712fd0737 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt
@@ -69,7 +69,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt
index e31a342b2..712fd0737 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt
@@ -69,7 +69,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt b/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt
index f8f63af3b..3a7e26732 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt
+++ b/docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt
@@ -51,7 +51,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
</html>
diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt
index e31a342b2..712fd0737 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt
@@ -69,7 +69,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt b/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt
index 7c8a39f53..ba74b4352 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt
+++ b/docs/tutorials/wiki2/src/views/tutorial/templates/view.pt
@@ -54,7 +54,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
</html>
diff --git a/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl b/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl
index 236424cae..234f2279b 100644
--- a/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl
+++ b/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl
@@ -75,7 +75,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl b/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl
index 557183a51..0fa590ef4 100644
--- a/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl
+++ b/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl
@@ -73,7 +73,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl
index e3fa39f28..0f86f805e 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl
@@ -69,7 +69,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl
index e3fa39f28..0f86f805e 100644
--- a/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl
@@ -69,7 +69,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/pyramid/paster_templates/starter/+package+/tests.py_tmpl b/pyramid/paster_templates/starter/+package+/tests.py_tmpl
index 33f8c50b4..1627bf015 100644
--- a/pyramid/paster_templates/starter/+package+/tests.py_tmpl
+++ b/pyramid/paster_templates/starter/+package+/tests.py_tmpl
@@ -14,5 +14,3 @@ class ViewTests(unittest.TestCase):
request = testing.DummyRequest()
info = my_view(request)
self.assertEqual(info['project'], '{{project}}')
-
-
diff --git a/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl
index e3fa39f28..0f86f805e 100644
--- a/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl
@@ -69,7 +69,7 @@
</div>
</div>
<div id="footer">
- <div class="footer">© Copyright 2008-2011, Agendaless Consulting.</div>
+ <div class="footer">&copy; Copyright 2008-2011, Agendaless Consulting.</div>
</div>
</body>
-</html> \ No newline at end of file
+</html>