[Pkg-owncloud-commits] [owncloud-doc] 70/71: Merge tag 'upstream/0_20150528'

[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 990ed37d9688b906dcfd2106cd4c2600c1f0dc9a
Merge: 79015b6 38b5f27
Author: David Prévot <david at tilapin.org>
Date:   Sat May 30 18:21:37 2015 -0400

    Merge tag 'upstream/0_20150528'
    
    Upstream version 0~20150528

 README.rst                                         |  43 ++++-
 _shared_assets/themes/owncloud_com/layout.html     |   2 +-
 _shared_assets/themes/owncloud_org/layout.html     |   2 +-
 _shared_assets/themes/owncloud_release/layout.html |   2 +-
 .../configuration/activity_configuration.rst       |  32 ++++
 .../background_jobs_configuration.rst              |   4 +
 .../big_file_upload_configuration.rst              |   4 +
 .../configuration/config_sample_php_parameters.rst |  19 +++
 admin_manual/configuration/external_sites.rst      |  57 +++++++
 .../external_storage_configuration.rst             |  26 ++-
 .../external_storage_configuration_gui.rst         |  26 ++-
 admin_manual/configuration/harden_server.rst       | 155 ++++++++++++++++++
 admin_manual/configuration/index.rst               |   3 +
 .../js_css_asset_management_configuration.rst      |   2 +
 admin_manual/configuration/user_auth_ldap.rst      |   1 +
 admin_manual/images/external-sites-1.png           | Bin 0 -> 80744 bytes
 admin_manual/images/external-sites-2.png           | Bin 0 -> 20024 bytes
 admin_manual/images/external-sites-3.png           | Bin 0 -> 20519 bytes
 admin_manual/images/external-sites-4.png           | Bin 0 -> 99518 bytes
 admin_manual/images/external-sites-5.png           | Bin 0 -> 107928 bytes
 admin_manual/images/external-storage-ftp.png       | Bin 10805 -> 20913 bytes
 admin_manual/installation/installation_wizard.rst  |   2 +
 admin_manual/installation/linux_installation.rst   |   8 +-
 admin_manual/installation/nginx_configuration.rst  |  11 ++
 admin_manual/issues/index.rst                      | 179 +++++++++++++++++++--
 admin_manual/maintenance/enable_maintenance.rst    |  12 +-
 admin_manual/maintenance/update.rst                |  35 ++--
 admin_manual/maintenance/upgrade.rst               | 175 +++++++++++++++-----
 developer_manual/app/startapp.rst                  |   4 +-
 developer_manual/core/externalapi.rst              |   2 +-
 index/howto_contribute.rst                         |  63 ++++++++
 index/index.rst                                    | 168 ++++++++++++++++---
 user_manual/external_storage/google_drive.rst      |   2 +-
 user_manual/files/deletedfiles.rst                 | 116 +++++++------
 user_manual/files/files.rst                        |   8 +
 user_manual/images/calendar_caldav_icon.png        | Bin 0 -> 314 bytes
 user_manual/images/calendar_caldav_ios.png         | Bin 0 -> 18510 bytes
 user_manual/images/calendar_caldav_link.png        | Bin 0 -> 9789 bytes
 user_manual/images/gear.png                        | Bin 0 -> 452 bytes
 user_manual/pim/calendar.rst                       |  44 +++--
 user_manual/pim/troubleshooting.rst                |  76 +--------
 user_manual/webinterface.rst                       |   3 +
 42 files changed, 1004 insertions(+), 282 deletions(-)

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