[Pkg-owncloud-commits] [owncloud-doc] 69/227: Merge branch 'master' of https://github.com/owncloud/documentation into alrac2

[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 4b81ddadf5b08b28643f6e2fa880426b032570d4
Merge: e7d4dbf e3fe0c1
Author: Carla Schroder <carla at owncloud.com>
Date:   Fri Sep 5 09:15:01 2014 -0700

    Merge branch 'master' of https://github.com/owncloud/documentation into alrac2

 .../configuration/configuration-file-sharing.rst   |  78 ++++++
 .../configuration/configuration_encryption.rst     |  44 ++-
 admin_manual/configuration/configuration_users.rst | 296 ++++++++-------------
 .../images/encryption_enabling.png                 | Bin
 admin_manual/images/sharing-admin.png              | Bin 0 -> 35361 bytes
 admin_manual/images/sharing-user-local.png         | Bin 0 -> 7988 bytes
 admin_manual/images/sharing-user.png               | Bin 0 -> 29462 bytes
 admin_manual/images/users-config.png               | Bin 0 -> 30020 bytes
 admin_manual/images/users-create.png               | Bin 0 -> 28189 bytes
 admin_manual/images/users-groups.png               | Bin 0 -> 14484 bytes
 admin_manual/installation/installation_windows.rst |   3 +-
 admin_manual/maintenance/restore.rst               |   2 +-
 admin_manual/whats_new_admin.rst                   |  20 +-
 user_manual/files/encryption.rst                   |  37 +--
 user_manual/files/filesweb.rst                     | 141 +++++-----
 user_manual/images/users-files.png                 | Bin 0 -> 38974 bytes
 user_manual/images/users-share-local.png           | Bin 0 -> 21272 bytes
 user_manual/images/users-share-local2.png          | Bin 0 -> 6737 bytes
 user_manual/images/users-share-public.png          | Bin 0 -> 18914 bytes
 user_manual/webinterface.rst                       |   2 -
 user_manual/whats_new.rst                          |  24 +-
 21 files changed, 327 insertions(+), 320 deletions(-)

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