[Pkg-owncloud-commits] [owncloud-doc] branch dfsg_clean updated (e23f2ed -> 7918cc9)

[David Prévot]

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

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

      from  e23f2ed   Merge branch 'upstream' into dfsg_clean
       new  f172b3a   add doc for previews
       new  05578b0   add preview doc to index
       new  9932a30   wrap after 80 chars
       new  31518c4   explain how to disable maximum scaling factor
       new  51823e8   Merge pull request #192 from owncloud/previews
       new  132e9c8   fixing typos and spelling
       new  ecb35e6   fixing typos and spelling
       new  aaec699   fixing typos and spelling
       new  d20a0bd   Merge pull request #193 from owncloud/fixing-stable6
       new  714e25b   merge @j-ed's version and fix layout
       new  5fe2c70   Merge pull request #190 from owncloud/fix-all
       new  472dc20   Fix markup
       new  7918cc9   Merge branch 'upstream' into dfsg_clean

The 13 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 admin_manual/configuration/auth_ldap.rst           |  14 +--
 admin_manual/configuration/background_jobs.rst     |   5 +-
 .../configuration/configuration_preview.rst        | 124 +++++++++++++++++++++
 .../configuration/custom_mount_config_gui.rst      |  13 +--
 .../custom_mount_config_gui_google_drive.rst       |  73 ------------
 admin_manual/configuration/index.rst               |   1 +
 .../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                |  16 +--
 admin_manual/maintenance/restore.rst               |  16 +--
 user_manual/contents.rst                           |   1 -
 user_manual/external_storage/google_drive.rst      |  49 ++++----
 16 files changed, 181 insertions(+), 131 deletions(-)
 create mode 100644 admin_manual/configuration/configuration_preview.rst
 delete mode 100644 admin_manual/configuration/custom_mount_config_gui_google_drive.rst
 delete mode 100644 admin_manual/images/custom_mount_config_gui_add_google_drive-1.png
 delete mode 100644 admin_manual/images/custom_mount_config_gui_add_google_drive-2.png
 delete mode 100644 admin_manual/images/custom_mount_config_gui_add_google_drive-3.png
 delete mode 100644 admin_manual/images/custom_mount_config_gui_add_google_drive-4.png
 delete mode 100644 admin_manual/images/custom_mount_config_gui_add_google_drive-5.png
 delete mode 100644 admin_manual/images/custom_mount_config_gui_add_google_drive-6.png

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