Merge branch 'master' of github.com:mitsuhiko/flask

12 years ago · 38eed272f9
3 changed files with 4 additions and 8 deletions
--- a/1
+++ b/1
@ -28,3 +28,4 @@ Patches and Suggestions
 - Stephane Wirtel
 - Thomas Schranz
 - Zhao Xiaohong
+- Edmond Burnett
--- a/docs/patterns/jquery.rst
+++ b/docs/patterns/jquery.rst
@ -31,11 +31,11 @@ to add a script statement to the bottom of your `<body>` to load jQuery:
     url_for('static', filename='jquery.js') }}"></script>

 Another method is using Google's `AJAX Libraries API
-<http://code.google.com/apis/ajaxlibs/documentation/>`_ to load jQuery:
+<https://developers.google.com/speed/libraries/devguide>`_ to load jQuery:

 .. sourcecode:: html

-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.js"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
    <script>window.jQuery || document.write('<script src="{{
      url_for('static', filename='jquery.js') }}">\x3C/script>')</script>

--- a/examples/flaskr/README
+++ b/examples/flaskr/README
@ -1,4 +1,3 @@
-
                         / Flaskr /

                 a minimal blog application
@ -14,11 +13,7 @@
         export an FLASKR_SETTINGS environment variable
         pointing to a configuration file.

-      2. fire up a python shell and run this:
-
-         >>> from flaskr import init_db; init_db()
-
-      3. now you can run the flaskr.py file with your
+      2. now you can run the flaskr.py file with your
         python interpreter and the application will
         greet you on http://localhost:5000/