[Pkg-owncloud-commits] [owncloud-doc] 36/38: Merge remote-tracking branch 'upstream/master' into upstream

[David Prévot]

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

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

commit 3631805863648ebfb65b991bfe54727bc2e9a254
Merge: a6c13a2 d1b853f
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 23 14:01:24 2014 -0400

    Merge remote-tracking branch 'upstream/master' into upstream

 README.rst                                         |  14 +-
 admin_manual/configuration/background_jobs.rst     |   2 +-
 .../configuration_config_sample_php.rst            | 937 +++++++++++++++++++++
 .../configuration/configuration_encryption.rst     | 197 +++--
 .../configuration/configuration_file_sharing.rst   |   6 +
 .../configuration/configuration_files_locking.rst  |  18 +
 admin_manual/configuration/index.rst               |   1 +
 admin_manual/images/encryption1.png                | Bin 0 -> 15491 bytes
 admin_manual/images/encryption2.png                | Bin 0 -> 4095 bytes
 admin_manual/images/encryption3.png                | Bin 0 -> 9018 bytes
 admin_manual/images/encryption4.png                | Bin 0 -> 4498 bytes
 admin_manual/images/encryption5.png                | Bin 0 -> 18907 bytes
 admin_manual/images/encryption6.png                | Bin 0 -> 14219 bytes
 admin_manual/images/encryption7.png                | Bin 0 -> 12526 bytes
 admin_manual/images/encryption8.png                | Bin 0 -> 15038 bytes
 admin_manual/images/encryption9.png                | Bin 0 -> 12567 bytes
 admin_manual/images/encryption_enabling.png        | Bin 30317 -> 0 bytes
 admin_manual/index.rst                             |   1 +
 admin_manual/installation/configuration_nginx.rst  |   2 +-
 admin_manual/maintenance/update.rst                |   9 +-
 admin_manual/maintenance/upgrade.rst               |  10 +-
 admin_manual/whats_new_admin.rst                   |   4 +
 developer_manual/app/index.rst                     |   1 -
 user_manual/files/encryption.rst                   | 134 ++-
 user_manual/files/files.rst                        |   7 +-
 user_manual/files/filesweb.rst                     |  13 +-
 user_manual/files/quota.rst                        | 140 +--
 user_manual/html.txt                               |   0
 user_manual/images/encryption1.png                 | Bin 0 -> 4095 bytes
 user_manual/images/encryption2.png                 | Bin 0 -> 8914 bytes
 user_manual/images/encryption3.png                 | Bin 0 -> 14219 bytes
 user_manual/images/encryption4.png                 | Bin 0 -> 18907 bytes
 user_manual/images/quota1.png                      | Bin 0 -> 3730 bytes
 user_manual/whats_new.rst                          |   7 +
 34 files changed, 1267 insertions(+), 236 deletions(-)

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