diff options
| author | Amos Latteier <amos@latteier.com> | 2016-06-30 10:17:43 -0700 |
|---|---|---|
| committer | Amos Latteier <amos@latteier.com> | 2016-06-30 10:17:43 -0700 |
| commit | 35209e4ac53520e1159bd8a6b47128f38a75db18 (patch) | |
| tree | 85b0f7e8e3794d8980dd10c10b7e57a862e694aa /docs/quick_tour | |
| parent | 3fd41dcb5a94a73f43862f6d5c063af7b54e6ff3 (diff) | |
| parent | bcba92d1b23745d736bdcbc9b799929de382db7b (diff) | |
| download | pyramid-35209e4ac53520e1159bd8a6b47128f38a75db18.tar.gz pyramid-35209e4ac53520e1159bd8a6b47128f38a75db18.tar.bz2 pyramid-35209e4ac53520e1159bd8a6b47128f38a75db18.zip | |
Merge branch 'master' into exception_only
Diffstat (limited to 'docs/quick_tour')
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/quick_tour/json/hello_world.jinja2 b/docs/quick_tour/json/hello_world.jinja2 index 4fb9be074..a55865231 100644 --- a/docs/quick_tour/json/hello_world.jinja2 +++ b/docs/quick_tour/json/hello_world.jinja2 @@ -2,7 +2,7 @@ <html lang="en"> <head> <title>Hello World</title> - <link rel="stylesheet" href="{{ request.static_url('static/app.css') }}"/> + <link rel="stylesheet" href="{{ request.static_url('__main__:static/app.css') }}"/> </head> <body> <h1>Hello {{ name }}!</h1> diff --git a/docs/quick_tour/sqla_demo/sqla_demo/models/__init__.py b/docs/quick_tour/sqla_demo/sqla_demo/models/__init__.py index 6ffc10a78..76e0fd26b 100644 --- a/docs/quick_tour/sqla_demo/sqla_demo/models/__init__.py +++ b/docs/quick_tour/sqla_demo/sqla_demo/models/__init__.py @@ -1,7 +1,7 @@ from sqlalchemy.orm import configure_mappers # import all models classes here for sqlalchemy mappers # to pick up -from .mymodel import MyModel # flake8: noqa +from .mymodel import MyModel # noqa # run configure mappers to ensure we avoid any race conditions configure_mappers() diff --git a/docs/quick_tour/static_assets/hello_world.jinja2 b/docs/quick_tour/static_assets/hello_world.jinja2 index 0fb2ce296..a55865231 100644 --- a/docs/quick_tour/static_assets/hello_world.jinja2 +++ b/docs/quick_tour/static_assets/hello_world.jinja2 @@ -2,7 +2,7 @@ <html lang="en"> <head> <title>Hello World</title> - <link rel="stylesheet" href="/static/app.css"/> + <link rel="stylesheet" href="{{ request.static_url('__main__:static/app.css') }}"/> </head> <body> <h1>Hello {{ name }}!</h1> diff --git a/docs/quick_tour/static_assets/hello_world_static.jinja2 b/docs/quick_tour/static_assets/hello_world_static.jinja2 index 4fb9be074..0fb2ce296 100644 --- a/docs/quick_tour/static_assets/hello_world_static.jinja2 +++ b/docs/quick_tour/static_assets/hello_world_static.jinja2 @@ -2,7 +2,7 @@ <html lang="en"> <head> <title>Hello World</title> - <link rel="stylesheet" href="{{ request.static_url('static/app.css') }}"/> + <link rel="stylesheet" href="/static/app.css"/> </head> <body> <h1>Hello {{ name }}!</h1> |