merge @j-ed's version and fix layout

admin_manual/configuration/custom_mount_config_gui.rst

@@ -53,19 +53,12 @@ to be entered:
 .. _OpenStack Swift: http://openstack.org/projects/storage/
 
 Dropbox
-~~~~~~
+~~~~~~~
 Mounting a Dropbox account requires that you create an app with Dropbox and then provide the app key and secret to the external storage configuration user interface. Go to My apps at Dropbox and create an app. Select *Full Dropbox* access level. Copy the app key and app secret and paste them into the corresponding fields for the Dropbox storage.
 
 Click the *Grant access* button and you will be redirected to a Dropbox website to give ownCloud permission to access your account.
 
 
 Google Drive
-~~~~~~~~~~~
-Mounting a Google Drive account requires that you create an API project in the Google APIs Console. Select `Services` and enable both `Drive API` and `Drive SDK`. Next select `API Access` and click `Create an OAuth 2.0 client ID`. Fill out the Branding Information as you see fit and click Next. In Client Id Settings select `Web application` for the  Application type. Next to `Your site or hostname` click  more options) and add the following to the Authorized Redirect URIs:
-
-- http://yourowncloud/index.php/settings/personal
-- http://yourowncloud/index.php/settings/admin
-
-Copy the client id and client secret and paste them into the corresponding fields for the Google Drive Storage.
-
-Click the *Grant access* button and you will be redirected to a Google website to give ownCloud permission to access your account.
+~~~~~~~~~~~~
+For a detailed step-by-step guide read `User Manual <../../user_manual/external_storage/google_drive.html>`_

admin_manual/configuration/custom_mount_config_gui_google_drive.rst

@@ -1,73 +0,0 @@
-Mounting a Google Drive
-=======================
-
-Follow these steps to mount a Google Drive.
-
-1. All applications that access a Google API must be registered through the
-   "Google Cloud Console" which can be accessed using the following URL: 
-   https://cloud.google.com/console
-
-2. Enter your Google login credentials and press the ``Sign in`` button.
-
-   .. figure:: ../images/custom_mount_config_gui_add_google_drive-1.png
-
-3. Enter your verification code which has been sent to you by SMS and press
-   the ``Verify`` button.
-
-   .. figure:: ../images/custom_mount_config_gui_add_google_drive-2.png
-
-4. Create a project, e.g. "ownCloud Project".
-
-   .. figure:: ../images/custom_mount_config_gui_add_google_drive-3.png
-
-5. Select the project and choose the "APIs & auth" menu entry.
-
-6. Make sure that the "Drive API" and "Drive SDK" status is set to "ON" in
-   the APIs menu.
-
-   .. figure:: ../images/custom_mount_config_gui_add_google_drive-4.png
-
-7. Click on the ``gear-wheel`` button behind "Drive API" or "Drive SDK"
-   and choose the "API access" menu entry.
-
-8. Click on the ``Create another client ID...`` button and fill in the
-   branding information.
-
-9. Click on the ``Next`` button and create a new client ID by selecting
-   "Web application" as application type.
-
-10. Next to your site or hostname click on the ``Edit settings ...`` button.
-
-11. Enter the following URLs to the "Authorized Redirect URIs" list and
-    press the ``Update`` button.
-    
-    http://your-internet-domain/owncloud/index.php/settings/personal
-    
-    http://your-internet-domain/owncloud/index.php/settings/admin
-
-
-    **Attention:** Make sure that the URLs contain a valid Internet domain
-    name and that this domain name is also used to access ownCloud,
-    otherwise these URLs will not be accepted. This does not mean that
-    ownCloud need to be accessible from the Internet, but that the domain
-    name is send to Google to verify if the redirect URIs are valid.
-
-12. Login into ownCloud using the previously entered Internet domain.
-
-12. Click on the ``Add storage`` button in the ownCloud Admin settings
-    dialog to add a Google Drive.
-
-13. Enter the **Folder name** which should be used to access the share,
-    e.g. "GDrive", enter the Google OAuth 2.0 **Client ID** and **Client secret**
-    and choose the **user and/or group** who/which should be allowed to
-    access the Google Drive (Applicable).
-
-    .. figure:: ../images/custom_mount_config_gui_add_google_drive-5.png
-
-14. Now press the ``Grant Access`` button and you will finally be redirected
-    to a Google website.
-
-15. Click on the ``Accept`` button to confirm that you accept the Google data
-    usage and data security policy.
-
-    .. figure:: ../images/custom_mount_config_gui_add_google_drive-6.png

admin_manual/maintenance/backup.rst

@@ -1,5 +1,5 @@
 Backing Up ownCloud
-================================
+===================
 
 To backup an ownCloud installation there are three main things you need to retain:
 
@@ -8,28 +8,30 @@ To backup an ownCloud installation there are three main things you need to retai
 #. The database
 
 Backup Folders
-------
+--------------
 
-Simply copy your config and data folder (or even your whole ownCloud install and data folder) to a place outside of your ownCloud environment. You could use this command:
+Simply copy your config and data folder (or even your whole ownCloud install and data folder) to a place outside of your ownCloud environment. You could use this command::
 
     rsync -Aax owncloud/ owncloud-dirbkp_`date +"%Y%m%d"`/
 
 Backup Database
-------
+---------------
 
 MySQL
 ^^^^^
 
-MySQL is the recommended database engine. To backup MySQL:
+MySQL is the recommended database engine. To backup MySQL::
 
     mysqldump --lock-tables -h [server] -u [username] -p[password] > owncloud-sqlbkp_`date +"%Y%m%d"`.bak
 
 SQLite
-^^^^^
+^^^^^^
+::
 
     sqlite3 data/owncloud.db .dump > owncloud-sqlbkp_`date +"%Y%m%d"`.bak
 
 PostgreSQL
-^^^^^
+^^^^^^^^^^
+::
 
     PGPASSWORD="password" pg_dump owncloud -h [server] -U [username] -f owncloud-sqlbkp_`date +"%Y%m%d"`.bak

admin_manual/maintenance/restore.rst

@@ -1,5 +1,5 @@
 Restoring ownCloud
-================================
+==================
 
 To restore an ownCloud installation there are three main things you need to restore:
 
@@ -8,32 +8,34 @@ To restore an ownCloud installation there are three main things you need to rest
 #. The database
 
 Restore Folders
-------
+---------------
 
 .. note:: This guide assumes that your previous backup is called "owncloud-dirbkp"
 
-Simply copy your config and data folder (or even your whole ownCloud install and data folder) to a place outside of your ownCloud environment. You could use this command:
+Simply copy your config and data folder (or even your whole ownCloud install and data folder) to a place outside of your ownCloud environment. You could use this command::
 
     rsync -Aax owncloud-dirbkp/ owncloud/
 
 Restore Database
-------
+----------------
 
 .. note:: This guide assumes that your previous backup is called "owncloud-sqlbkp.bak"
 
 MySQL
 ^^^^^
 
-MySQL is the recommended database engine. To backup MySQL:
+MySQL is the recommended database engine. To backup MySQL::
 
     mysql -h [server] -u [username] -p[password] < owncloud-sqlbkp.bak
 
 SQLite
-^^^^^
+^^^^^^
+::
 
     sqlite3 data/owncloud.db .dump < owncloud-sqlbkp.bak
 
 PostgreSQL
-^^^^^
+^^^^^^^^^^
+::
 
     PGPASSWORD="password" pg_restore -c -d owncloud -h [server] -U [username] owncloud-sqlbkp.bak

user_manual/contents.rst

@@ -16,7 +16,6 @@ ownCloud documentation contents
     files/index
     pim/index
     bookmarks
-    mediaplayer
     migration
     external_storage/google_drive
 

user_manual/external_storage/google_drive.rst

@@ -4,58 +4,59 @@ External storage
 Google Drive
 ------------
 
-1. All applications that access a Google API must be registered through the "Google Cloud Console" which can be accessed using the following URL:
+#. All applications that access a Google API must be registered through the "Google Cloud Console" which can be accessed using the following URL:
 
-::
+   ::
 
-  https://cloud.google.com/console
+     https://cloud.google.com/console
 
-2. Enter your Google login credentials and press the "Sign in" button.
+#. Enter your Google login credentials and press the ``Sign in`` button.
 
-.. image:: ../images/external_google_drive_1_sign_in.png
+   .. image:: ../images/external_google_drive_1_sign_in.png
 
-3. Enter your verification code which has been sent to you by SMS or the Authenticator App and press the "Verify" button.
+#. Enter your verification code which has been sent to you by SMS or the Authenticator App and press the ``Verify`` button.
 
-.. image:: ../images/external_google_drive_2_verify.png
+   .. image:: ../images/external_google_drive_2_verify.png
 
-4. Create a project, e.g. "ownCloud-Project"
+#. Create a project, e.g. "ownCloud-Project"
 
-.. image:: ../images/external_google_drive_3_create_project.png
+   .. image:: ../images/external_google_drive_3_create_project.png
 
-5. Select the project and choose the APIs & auth menu entry.
+#. Select the project and choose the "APIs & auth" menu entry.
 
-6. Make sure that the "Drive API" / "Drive SDK" status is set to "ON" in the APIs menu.
+#. Make sure that the "Drive API" and "Drive SDK" status is set to "ON" in the APIs menu.
 
-.. image:: ../images/external_google_drive_4_enable_api.png
+   .. image:: ../images/external_google_drive_4_enable_api.png
 
-7. Click on the gear-wheel-button behind "Drive API" or "Drive SDK" and choose the "API access" menu entry.
+#. Click on the ``gear-wheel`` button behind "Drive API" or "Drive SDK" and choose the "API access" menu entry.
 
-8. Click on the Create another "client ID..." button and fill in the branding information.
+#. Click on the ``Create another client ID...`` button and fill in the branding information.
 
-9. Click on the "Next" button and create a new client ID by selecting "Web application" as application type.
+#. Click on the ``Next`` button and create a new client ID by selecting "Web application" as application type.
 
-10. Next to your site or hostname click on the "Edit settings ..." button.
+#. Next to your site or hostname click on the ``Edit settings ...`` button.
 
-11. Enter the following URLs to the "Authorized Redirect URIs" list and press the Update-button.
+#. Enter the following URLs to the "Authorized Redirect URIs" list and press the Update-button.
 
 ::
 
   https://your-internet-domain/owncloud/index.php/settings/personal
   https://your-internet-domain/owncloud/index.php/settings/admin
 
-**Attention:** Make sure that the URLs contain a valid Internet domain name and that this domain name is also used to access ownCloud, otherwise these URLs will not be accepted. This does not mean that ownCloud need to be accessible from the Internet, but that the domain name is send to Google to verify if the redirect URIs are valid.
+
+.. note:: **Attention:** Make sure that the URLs contain a valid internet domain name and that this domain name is also used to access ownCloud, otherwise these URLs will not be accepted. This does not mean that ownCloud need to be accessible from the Internet, but that the domain name is send to Google to verify if the redirect URIs are valid.
 
 12. Login into ownCloud using the previously entered Internet domain.
 
-13. Click on the "Add storage" button in the ownCloud Admin settings dialog to add a Google Drive.
+#. Click on the ``Add storage`` button in the ownCloud Admin or Personal settings dialog to add a Google Drive.
 
-14. Enter the folder name which should be used to access the share, e.g. "GDrive", enter the Google OAuth 2.0 client id and client secret and choose the user or group who should be allowed to access the Google Drive (Applicable).
+#. Enter the folder name which should be used to access the share, e.g. "GDrive", enter the Google OAuth 2.0 **Client ID** and **Client secret**. Additional for the admin settings you have to choose the **user and/or group** who/which should be allowed to access the Google Drive (Applicable).
 
-.. image:: ../images/external_google_drive_5_setup_ownCloud.png
+   .. image:: ../images/external_google_drive_5_setup_ownCloud.png
 
-15. Now press the "Grant Access" button and you will finally be redirected to a Google website.
+#. Now press the ``Grant Access`` button and you will finally be redirected to a Google website.
 
 
-16. Click on the "Accept" button to confirm that you accept the Google data usage and data security policy.
+#. Click on the ``Accept`` button to confirm that you accept the Google data usage and data security policy.
 
-.. image:: ../images/external_google_drive_6_accept.png
+   .. image:: ../images/external_google_drive_6_accept.png