[Pkg-owncloud-commits] [owncloud-doc] 02/09: Merge branch 'stable6' into stable6_fix_win_php_version_hint

[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 d666c1a145f4ac10c05bb0c79c02d2cc8d4cb017
Merge: dd50331 b925820
Author: RandolfCarter <RandolphCarter at fantasymail.de>
Date:   Sun Jun 1 14:08:20 2014 +0200

    Merge branch 'stable6' into stable6_fix_win_php_version_hint

 .gitignore                                         |   3 +
 .../themes/owncloud_com/static/less/reset.less     |   2 +-
 admin_manual/apps/files_external/index.rst         |   3 +
 admin_manual/config/code_locations.rst             |   2 +-
 admin_manual/config/default_parameters.rst         |  10 +--
 admin_manual/config/mail_parameters.rst            |   4 +-
 admin_manual/config/miscellaneous.rst              |  96 ++++++++++-----------
 admin_manual/config/verification.rst               |   2 +-
 admin_manual/configuration/auth_ldap.rst           |  65 +++++++-------
 .../configuration/configuring_big_file_upload.rst  |  26 ++++--
 admin_manual/configuration/xsendfile.rst           |   4 +-
 admin_manual/contents.rst                          |   3 +
 admin_manual/cron/index.rst                        |   2 +-
 admin_manual/index.rst                             |   2 +
 .../images/ucs-app-center-install.png              | Bin
 .../images/ucs-app-center-module.png               | Bin
 admin_manual/{ => installation}/images/ucsint.png  | Bin
 admin_manual/{ => installation}/images/ucsint1.png | Bin
 admin_manual/{ => installation}/images/ucsint2.png | Bin
 admin_manual/installation/installation_linux.rst   |   5 ++
 admin_manual/installation/installation_source.rst  |  36 ++++----
 admin_manual/installation/installation_ucs.rst     |  26 +++---
 admin_manual/maintenance/update.rst                |   2 +-
 developer_manual/app/app/externalapi.rst           |   4 +-
 developer_manual/app/app/index.rst                 |   2 +-
 developer_manual/app/appframework/database.rst     |   6 +-
 developer_manual/app/appframework/index.rst        |   2 +-
 developer_manual/app/index.rst                     |   4 +-
 developer_manual/app/intro/index.rst               |   2 +-
 developer_manual/commun/index.rst                  |   2 +-
 developer_manual/core/index.rst                    |   2 +-
 developer_manual/devenv/index.rst                  |   6 +-
 developer_manual/ios_library/examples.rst          |   4 +-
 user_manual/files/files.rst                        |   2 +-
 user_manual/files/filesweb.rst                     |   2 +-
 user_manual/files/sync.rst                         |   2 +-
 user_manual/files/versioncontrol.rst               |   1 +
 user_manual/pim/troubleshooting.rst                |   2 +-
 38 files changed, 184 insertions(+), 152 deletions(-)

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