Merge branch 'master' of github.com:Pylons/pyramid

10 files changed, 18 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index 31b04f664..e36d9f7cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,7 @@ jyenv/
 pypyenv/
 build/
 dist/
+bin/
+lib/
+include/
+distribute-*.tar.gz
diff --git a/pyramid/paster_templates/alchemy/+package+/static/pylons.css b/pyramid/paster_templates/alchemy/+package+/static/pylons.css
index fd1914d8d..d952fb42e 100644
--- a/pyramid/paster_templates/alchemy/+package+/static/pylons.css
+++ b/pyramid/paster_templates/alchemy/+package+/static/pylons.css
@@ -31,7 +31,7 @@ body h2,
 body h3,
 body h4,
 body h5,
-body h6{font-family:"Neuton","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#373839;font-style:normal;}
+body h6{font-family:"NeutonRegular","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#373839;font-style:normal;}
 #wrap{min-height:100%;}
 #header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;vertical-align:middle;}
 #header{background:#000000;top:0;font-size:14px;}
diff --git a/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl b/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl
index fa0068d63..9302326f5 100644
--- a/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl
+++ b/pyramid/paster_templates/alchemy/+package+/templates/model.pt_tmpl
@@ -7,7 +7,8 @@
   <meta name="description" content="pyramid web application" />
   <link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
   <link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-  <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/nobile/stylesheet.css" media="screen">
+  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/neuton/stylesheet.css" media="screen">
   <!--[if lte IE 6]>
   <link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
   <![endif]-->
diff --git a/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl b/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl
index d61fd1300..b0ed476cc 100644
--- a/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl
+++ b/pyramid/paster_templates/alchemy/+package+/templates/root.pt_tmpl
@@ -7,7 +7,8 @@
   <meta name="description" content="pyramid web application" />
   <link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
   <link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-  <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/nobile/stylesheet.css" media="screen">
+  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/neuton/stylesheet.css" media="screen">
   <!--[if lte IE 6]>
   <link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
   <![endif]-->
diff --git a/pyramid/paster_templates/routesalchemy/+package+/static/pylons.css b/pyramid/paster_templates/routesalchemy/+package+/static/pylons.css
index fd1914d8d..d952fb42e 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/static/pylons.css
+++ b/pyramid/paster_templates/routesalchemy/+package+/static/pylons.css
@@ -31,7 +31,7 @@ body h2,
 body h3,
 body h4,
 body h5,
-body h6{font-family:"Neuton","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#373839;font-style:normal;}
+body h6{font-family:"NeutonRegular","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#373839;font-style:normal;}
 #wrap{min-height:100%;}
 #header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;vertical-align:middle;}
 #header{background:#000000;top:0;font-size:14px;}
diff --git a/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl
index f55c1ee0c..4fbc554e9 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt_tmpl
@@ -7,7 +7,8 @@
   <meta name="description" content="pyramid web application" />
   <link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
   <link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-  <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/nobile/stylesheet.css" media="screen">
+  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/neuton/stylesheet.css" media="screen">
   <!--[if lte IE 6]>
   <link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
   <![endif]-->
diff --git a/pyramid/paster_templates/starter/+package+/static/pylons.css b/pyramid/paster_templates/starter/+package+/static/pylons.css
index fd1914d8d..d952fb42e 100644
--- a/pyramid/paster_templates/starter/+package+/static/pylons.css
+++ b/pyramid/paster_templates/starter/+package+/static/pylons.css
@@ -31,7 +31,7 @@ body h2,
 body h3,
 body h4,
 body h5,
-body h6{font-family:"Neuton","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#373839;font-style:normal;}
+body h6{font-family:"NeutonRegular","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#373839;font-style:normal;}
 #wrap{min-height:100%;}
 #header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;vertical-align:middle;}
 #header{background:#000000;top:0;font-size:14px;}
diff --git a/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl
index f55c1ee0c..4fbc554e9 100644
--- a/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt_tmpl
@@ -7,7 +7,8 @@
   <meta name="description" content="pyramid web application" />
   <link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
   <link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-  <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/nobile/stylesheet.css" media="screen">
+  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/neuton/stylesheet.css" media="screen">
   <!--[if lte IE 6]>
   <link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
   <![endif]-->
diff --git a/pyramid/paster_templates/zodb/+package+/static/pylons.css b/pyramid/paster_templates/zodb/+package+/static/pylons.css
index fd1914d8d..d952fb42e 100644
--- a/pyramid/paster_templates/zodb/+package+/static/pylons.css
+++ b/pyramid/paster_templates/zodb/+package+/static/pylons.css
@@ -31,7 +31,7 @@ body h2,
 body h3,
 body h4,
 body h5,
-body h6{font-family:"Neuton","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#373839;font-style:normal;}
+body h6{font-family:"NeutonRegular","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#373839;font-style:normal;}
 #wrap{min-height:100%;}
 #header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;vertical-align:middle;}
 #header{background:#000000;top:0;font-size:14px;}
diff --git a/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl
index f55c1ee0c..4fbc554e9 100644
--- a/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt_tmpl
@@ -7,7 +7,8 @@
   <meta name="description" content="pyramid web application" />
   <link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
   <link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
-  <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Neuton|Nobile:regular,i,b,bi&amp;subset=latin" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/nobile/stylesheet.css" media="screen">
+  <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/neuton/stylesheet.css" media="screen">
   <!--[if lte IE 6]>
   <link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
   <![endif]-->