[Pkg-owncloud-commits] [owncloud-doc] 24/27: Merge remote-tracking branch 'upstream/stable7' 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 f979be3637791daedab818e40375546de15b6620
Merge: 72f8690 939fb88
Author: David Prévot <david at tilapin.org>
Date:   Tue Aug 11 17:18:57 2015 +0200

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

 README.rst                                         | 10 ++--
 .../external_storage_configuration.rst             | 14 +++--
 .../external_storage_configuration_gui.rst         | 10 ++--
 .../server_to_server_configuration.rst             | 25 +++++----
 .../configuration/user_auth_ftp_smb_imap.rst       |  6 +++
 admin_manual/configuration/user_auth_ldap.rst      |  5 +-
 admin_manual/index.rst                             | 14 +++--
 admin_manual/installation/installation_wizard.rst  | 23 +++++++--
 .../installation/selinux_configuration.rst         | 27 +++++++++-
 admin_manual/installation/source_installation.rst  |  5 +-
 admin_manual/issues/index.rst                      |  3 ++
 admin_manual/maintenance/restore.rst               |  5 +-
 index/conf.py                                      |  2 +-
 index/index.rst                                    | 59 ++++++++++++++++------
 14 files changed, 159 insertions(+), 49 deletions(-)

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