update Google Drive/external storage

Conflicts:
	admin_manual/maintenance/upgrade.rst

admin_manual/configuration_files/external_storage_configuration_gui.rst

@@ -2,9 +2,9 @@
 Configuring External Storage (GUI)
 ==================================
 
-The External Storage Support application enables you to mount external storage services 
-and devices as secondary ownCloud storage devices. You may also allow users to 
-mount their own external storage services.
+The External Storage Support application enables you to mount external storage 
+services and devices as secondary ownCloud storage devices. You may also allow 
+users to mount their own external storage services.
 
 All of these connect to a LAN ownCloud server that is not publicly accessible, 
 with one exception: Google Drive requires an ownCloud server with a registered 
@@ -233,7 +233,7 @@ Google Drive
 
 All applications that access a Google API must be registered through the 
 `Google Cloud Console <https://console.developers.google.com/>`_. Follow along carefully 
-because the Google is a bit of a maze and it's easy to get lost. 
+because the Google interface is a bit of a maze and it's easy to get lost. 
 
 .. note:: Your ownCloud server must have a registered domain name and be 
    accessible over the Internet; Google Drive will not connect to a LAN-only 
@@ -241,64 +241,77 @@ because the Google is a bit of a maze and it's easy to get lost.
 
 If you already have a Google account, such as Groups, Drive, or Mail, you can 
 use your existing login to log into the Google Cloud Console. After logging in 
-click ``Go to my console``, and then click the ``Create Project`` button. It 
-takes a minute or two to create your new project.
+click  the ``Create Project`` button.
 
 .. figure:: ../images/external-storage-google-drive.png
 
-In the next screen give your project a name, accept the default ``Project ID`` 
-or create your own, click the Terms of Service box, and click the ``Create`` 
-button.
+Give your project a name, and either accept the default ``Project ID`` or create 
+your own, then click the ``Create`` button.
 
 .. figure:: ../images/external-storage-google-drive1.png
 
-The next screen is your ``Project Dashboard``. In the left sidebar click ``APIs 
-& Auth > APIs``, and then enable the ``Drive API`` and ``Drive SDK`` by 
-toggling the boxes in the far-right ``Status`` column to the green On buttons.
+The next screen is your ``Project Dashboard``. The Activities screen on the 
+bottom left shows your current status. In the left sidebar click ``APIs 
+& Auth > APIs``, and then click ``Google Apps APIs > Drive API``.
 
 .. figure:: ../images/external-storage-google-drive2.png
 
-This brings you to the ``Google Drive SDK`` screen. Click ``API Access``.
+Before you click ``Enable API`` you might want to click on ``Learn more`` or 
+``Explore this API``. Then click ``Enable API``.
 
-.. figure:: ../images/external-storage-google-drive-sdk.png
+.. figure:: ../images/external-storage-google-drive3.png
 
-This opens the ``API Access`` screen. Click the ``Create a 0Auth 2.0 Client 
-ID`` button. 
+``Enable API`` takes you to the Drive API dashboard, with tabs for 
+``Overview, Usage, Quota``, and ``Drive UI Integration``. Feel free to 
+explore, and then go to ``APIs & Auth > Credentials``. This screen has two 
+sections: ``0Auth`` and ``Public API Access``.
 
-.. figure:: ../images/external-storage-google-drive-0auth.png
+.. figure:: ../images/external-storage-google-drive4.png
 
-The next screen that opens is ``Create Client ID: Branding Information``. Google 
-requires to you to fill this out. When you're finished move on to the ``Create 
-Client ID: Client ID Settings`` screen.
+
+Click ``0Auth > Create New Client ID``. The next screen that opens is ``Create 
+Client ID``. Check ``Web Application`` and click the ``Configure Consent 
+Screen`` button. You'll see the consent screen the first time you create a 
+mountpoint for your Google Drive in owncloud.
 
 .. figure:: ../images/external-storage-google-drive5.png
 
-The ``Application Type`` is Web application.
+There are just a few required fields on the Consent Screen form: the email 
+address of your Google account and your app name. The optional fields include 
+your site URL, a link to your logo, and links to your privacy and terms of 
+service policies. Your logo must be a hosted file because there is no upload 
+dialogue. Click ``Save`` when you're finished.
 
-Click ``Your site or hostname (more options)`` to expose  ``Authorized 
-Redirect URIs``. Enter two Redirect URIs like these examples, replacing 
-``https://example.com/owncloud/`` with your own ownCloud server 
-URL. You must use a registered domain name, and you cannot use the server's 
-IP address.
+.. figure:: ../images/external-storage-google-drive6.png
+
+Now you should be on the ``Edit Client Settings`` screen. The ``Authorized 
+JavaScript Origins`` is your root domain, for example 
+``https://www.example.com``. You need two ``Authorized Redirect URIs``, which 
+must be in the following form:: 
 
   https://example.com/owncloud/index.php/settings/personal
   https://example.com/owncloud/index.php/settings/admin
   
-Click ``Create client ID`` and you'll see a screen like this:
+Replace ``https://example.com/owncloud/`` with your own ownCloud server URL, 
+then click ``Save``.
 
-.. figure:: ../images/external-storage-google-drive-9.png
+.. figure:: ../images/external-storage-google-drive10.png
 
-This contains your ``Client ID`` and ``Client Secret``, which you need to set up 
-your ownCloud connection. Go to your ``Admin`` page in ownCloud, create your new 
-folder name, enter the Client ID and Client Secret, select your users and 
-groups, and click ``Grant Access``.
+This should take you back to the 0Auth screen, with a summary of your settings 
+and editing buttons. This contains your ``Client ID`` and ``Client Secret``, 
+which you need to set up your ownCloud connection.
+
+.. figure:: ../images/external-storage-google-drive11.png
+
+Go to your ``Admin`` page in ownCloud, create your new folder name, enter the 
+Client ID and Client Secret, select your users and groups, and click ``Grant 
+Access``.
 
 .. figure:: ../images/external-storage-google-drive8.png
 
 Google will open a dialogue asking for permission to connect to ownCloud. Click 
-``Accept`` and you're finished.
-
-.. figure:: ../images/external-storage-google-drive7.png
+``Accept``. When you see the green light confirming a successful connection
+you're finished.
 
 SMB/CIFS
 --------
@@ -385,4 +398,4 @@ Although configuration may be done by making modifications to the
 ``mount.json`` file, it is recommended to use the Web-GUI in the administrator 
 panel (as described in the above section) to add, remove, or modify mount 
 options to prevent any problems. See :doc:`external_storage_configuration` for 
-configuration examples.
+configuration examples.