[Pkg-owncloud-commits] [owncloud-doc] 01/02: Merge tag 'upstream/0_20131212'

[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 f3bb5c565b3586e9284a782741ee94029fd46c56
Merge: b6cb91e 5cb42f7
Author: David Prévot <taffit at debian.org>
Date:   Sat Dec 14 18:44:12 2013 -0400

    Merge tag 'upstream/0_20131212'
    
    Upstream version 0~20131212

 admin_manual/configuration/auth_ldap.rst           | 349 +++++++++++++++------
 .../configuration/configuration_3rdparty.rst       |   4 +-
 admin_manual/configuration/configuration_apps.rst  |  10 +-
 .../configuration/configuration_automation.rst     |  17 +-
 .../configuration/configuration_database.rst       |  38 ++-
 .../configuration/configuration_encryption.rst     |   2 +-
 .../configuration/configuration_knowledgebase.rst  |   9 +-
 .../configuration/configuration_logging.rst        |   2 +-
 admin_manual/configuration/configuration_mail.rst  |   7 +-
 .../configuration/configuring_big_file_upload.rst  |  13 +-
 .../configuration/custom_mount_config_gui.rst      |   4 +-
 admin_manual/configuration/xsendfile.rst           |  16 +-
 admin_manual/images/ldap-advanced-1-connection.png | Bin 0 -> 24086 bytes
 admin_manual/images/ldap-advanced-2-directory.png  | Bin 0 -> 30870 bytes
 admin_manual/images/ldap-advanced-3-attributes.png | Bin 0 -> 17336 bytes
 ...p-advanced-settings-connection-settings-oc5.png | Bin 28795 -> 0 bytes
 ...ap-advanced-settings-directory-settings-oc5.png | Bin 31710 -> 0 bytes
 admin_manual/images/ldap-advanced-settings-oc5.png | Bin 28234 -> 0 bytes
 ...ap-advanced-settings-special-attributes-oc5.png | Bin 11241 -> 0 bytes
 admin_manual/images/ldap-basic-settings-oc5.png    | Bin 25805 -> 0 bytes
 admin_manual/images/ldap-expert-settings-oc5.png   | Bin 148150 -> 0 bytes
 admin_manual/images/ldap-expert.png                | Bin 0 -> 101261 bytes
 admin_manual/images/ldap-fetched-avatar.png        | Bin 0 -> 33049 bytes
 admin_manual/images/ldap-wizard-1-server.png       | Bin 0 -> 21101 bytes
 admin_manual/images/ldap-wizard-2-user.png         | Bin 0 -> 30654 bytes
 admin_manual/images/ldap-wizard-3-login.png        | Bin 0 -> 27824 bytes
 admin_manual/images/ldap-wizard-4-group.png        | Bin 0 -> 30865 bytes
 admin_manual/index.rst                             |  46 ++-
 .../installation/installation_appliance.rst        |  13 +-
 admin_manual/installation/installation_linux.rst   | 121 +------
 admin_manual/installation/installation_macos.rst   |   2 +-
 admin_manual/installation/installation_others.rst  | 172 +---------
 admin_manual/installation/installation_source.rst  | 300 +++++++++++++++---
 admin_manual/installation/installation_ucs.rst     |   4 +-
 admin_manual/installation/installation_windows.rst |  20 +-
 admin_manual/maintenance/backup.rst                |   4 +-
 admin_manual/maintenance/restore.rst               |   4 +-
 admin_manual/maintenance/update.rst                |  16 +-
 developer_manual/app/app/static.rst                |   2 +-
 developer_manual/app/index.rst                     |   8 +-
 developer_manual/app/intro/gettingstarted.rst      |  73 -----
 developer_manual/app/intro/index.rst               |   1 -
 developer_manual/contents.rst                      |   1 +
 developer_manual/devenv/index.rst                  | 105 +++++++
 go.php                                             |   8 +-
 45 files changed, 767 insertions(+), 604 deletions(-)

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