summaryrefslogtreecommitdiff
path: root/docs/narr/MyProject
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-08-06 11:59:45 -0500
committerMichael Merickel <michael@merickel.org>2014-08-06 11:59:45 -0500
commit9279468d0e4d411652a735e28839bd8a5504ced6 (patch)
tree580c1efc1044325a20a242a212d647b81cde6088 /docs/narr/MyProject
parent407b335ed9954c042377fd2e060c36edcd07cf60 (diff)
parent3587a53dc28b8f6411816ccd7fd8fdee0d88acb4 (diff)
downloadpyramid-9279468d0e4d411652a735e28839bd8a5504ced6.tar.gz
pyramid-9279468d0e4d411652a735e28839bd8a5504ced6.tar.bz2
pyramid-9279468d0e4d411652a735e28839bd8a5504ced6.zip
Merge branch 'master' into feature.override-asset-with-absolute-path
Diffstat (limited to 'docs/narr/MyProject')
-rw-r--r--docs/narr/MyProject/myproject/templates/mytemplate.pt2
-rw-r--r--docs/narr/MyProject/setup.cfg27
2 files changed, 1 insertions, 28 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/docs/narr/MyProject/setup.cfg b/docs/narr/MyProject/setup.cfg
deleted file mode 100644
index 332e80a60..000000000
--- a/docs/narr/MyProject/setup.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-[nosetests]
-match = ^test
-nocapture = 1
-cover-package = myproject
-with-coverage = 1
-cover-erase = 1
-
-[compile_catalog]
-directory = myproject/locale
-domain = MyProject
-statistics = true
-
-[extract_messages]
-add_comments = TRANSLATORS:
-output_file = myproject/locale/MyProject.pot
-width = 80
-
-[init_catalog]
-domain = MyProject
-input_file = myproject/locale/MyProject.pot
-output_dir = myproject/locale
-
-[update_catalog]
-domain = MyProject
-input_file = myproject/locale/MyProject.pot
-output_dir = myproject/locale
-previous = true