Merge branch 'master' into datastore-update-schema

ryanmats · web-flow · commit 4572dae0739a · 2016-09-09T13:04:55.000-07:00
diff --git a/appengine/flexible/endpoints/requirements.txt b/appengine/flexible/endpoints/requirements.txt
@@ -1,5 +1,5 @@
 Flask==0.11.1
-flask-cors==3.0.1
+flask-cors==3.0.2
 gunicorn==19.6.0
 gcloud==0.18.1
 six==1.10.0
diff --git a/appengine/standard/firebase/firenotes/README.md b/appengine/standard/firebase/firenotes/README.md
@@ -4,6 +4,10 @@ A simple note-taking application that stores users' notes in their own personal
 notebooks separated by a unique user ID generated by Firebase. Uses Firebase
 Authentication, Google App Engine, and Google Cloud Datastore.
 
+This sample is used on the following documentation page:
+
+<https://cloud.google.com/appengine/docs/python/authenticating-users-firebase-app-engine/>
+
 You'll need to have [Python 2.7](https://www.python.org/), the
 [App Engine SDK](https://cloud.google.com/appengine/downloads#Google_App_Engine_SDK_for_Python),
 and the [Google Cloud SDK](https://cloud.google.com/sdk/?hl=en)
@@ -14,7 +18,7 @@ this sample.
 
 1. Clone this repo:
 
-        git clone https://github.com/GoogleCloudPlatform/python-docs-samples/tree/master/appengine/standard/firebase/auth/firenotes
+        git clone https://github.com/GoogleCloudPlatform/python-docs-samples/tree/master/appengine/standard/firebase/firenotes
 
 1. Within a virtualenv, install the dependencies to the backend service:
 
@@ -32,10 +36,10 @@ this sample.
 environment variable.
 1. Select which providers you want to enable. Delete the providers from
 `main.js` that you do no want to offer. Enable the providers you chose to keep
-in the Firebase console under **Auth** > **SIGN-IN METHOD** >
+in the Firebase console under **Auth** > **Sign-in Method** >
 **Sign-in providers**.
 1. In the Firebase console, under **OAuth redirect domains**, click
-**ADD DOMAIN** and enter the domain of your app on App Engine:
+**Add Domain** and enter the domain of your app on App Engine:
 [PROJECT_ID].appspot.com. Do not include "http://" before the domain name.
 
 ## Run Locally
@@ -45,7 +49,7 @@ server with the following command:
 
         dev_appserver.py frontend/app.yaml backend/app.yaml
 
-1. Visit [http://locahost:8080/](http://locahost:8080/) in a web browser.
+1. Visit <http://locahost:8080/> in a web browser.
 
 ## Deploy
 1. Change the backend host URL in `main.js` to
diff --git a/appengine/standard/firebase/firenotes/backend/firebase_helper.py b/appengine/standard/firebase/firenotes/backend/firebase_helper.py
@@ -73,7 +73,7 @@ def extract_public_key_from_certificate(x509_certificate):
     subject_public_key_info = tbs_certification[6]
 
     return subject_public_key_info
-# [EMD extract_public_key_from_certificate]
+# [END extract_public_key_from_certificate]
 
 
 # [START verify_auth_token]
diff --git a/appengine/standard/firebase/firenotes/backend/requirements.txt b/appengine/standard/firebase/firenotes/backend/requirements.txt
@@ -1,3 +1,3 @@
 Flask==0.11.1
 pyjwt==1.4.2
-flask-cors==3.0.1
+flask-cors==3.0.2
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -4,7 +4,7 @@ coverage==4.2
 cryptography==1.5
 Django==1.10.1
 flaky==3.3.0
-flask-cors==3.0.1
+flask-cors==3.0.2
 Flask-Sockets==0.2.1
 Flask-SQLAlchemy==2.1
 Flask==0.11.1
