[Pkg-owncloud-commits] [owncloud-doc] 06/44: Merge branch 'stable6' into fixing-stable6

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch dfsg_clean
in repository owncloud-doc.

commit 6d4764d6c44762af99f8f9427504bee25a79423e
Merge: 9fcd774 5fe2c70
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon Nov 25 10:13:55 2013 +0100

    Merge branch 'stable6' into fixing-stable6
    
    Conflicts:
    	admin_manual/configuration/custom_mount_config_gui.rst
    	admin_manual/maintenance/backup.rst
    	admin_manual/maintenance/restore.rst

 .../configuration/custom_mount_config_gui.rst      |  12 +---
 .../custom_mount_config_gui_google_drive.rst       |  73 ---------------------
 .../custom_mount_config_gui_add_google_drive-1.png | Bin 26480 -> 0 bytes
 .../custom_mount_config_gui_add_google_drive-2.png | Bin 15526 -> 0 bytes
 .../custom_mount_config_gui_add_google_drive-3.png | Bin 8244 -> 0 bytes
 .../custom_mount_config_gui_add_google_drive-4.png | Bin 9818 -> 0 bytes
 .../custom_mount_config_gui_add_google_drive-5.png | Bin 2820 -> 0 bytes
 .../custom_mount_config_gui_add_google_drive-6.png | Bin 12736 -> 0 bytes
 admin_manual/maintenance/backup.rst                |   7 +-
 admin_manual/maintenance/restore.rst               |   9 ++-
 user_manual/contents.rst                           |   1 -
 user_manual/external_storage/google_drive.rst      |  49 +++++++-------
 12 files changed, 37 insertions(+), 114 deletions(-)

diff --cc admin_manual/maintenance/backup.rst
index 8a89376,2091f76..674e243
--- a/admin_manual/maintenance/backup.rst
+++ b/admin_manual/maintenance/backup.rst
@@@ -10,8 -10,7 +10,8 @@@ To backup an ownCloud installation ther
  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:
++your ownCloud environment. You could use this command::
  
      rsync -Aax owncloud/ owncloud-dirbkp_`date +"%Y%m%d"`/
  
@@@ -32,5 -32,6 +33,7 @@@ SQLit
  
  PostgreSQL
  ^^^^^^^^^^
+ ::
  
      PGPASSWORD="password" pg_dump owncloud -h [server] -U [username] -f owncloud-sqlbkp_`date +"%Y%m%d"`.bak
++
diff --cc admin_manual/maintenance/restore.rst
index a4ab7d9,fb6b24e..1b586aa
--- a/admin_manual/maintenance/restore.rst
+++ b/admin_manual/maintenance/restore.rst
@@@ -12,8 -12,7 +12,8 @@@ Restore Folder
  
  .. 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:
++your ownCloud environment. You could use this command::
  
      rsync -Aax owncloud-dirbkp/ owncloud/
  
@@@ -36,5 -36,6 +37,7 @@@ SQLit
  
  PostgreSQL
  ^^^^^^^^^^
+ ::
  
      PGPASSWORD="password" pg_restore -c -d owncloud -h [server] -U [username] owncloud-sqlbkp.bak
++

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git