[Pkg-owncloud-commits] [owncloud-doc] 224/227: Merge remote-tracking branch 'upstream/master' into upstream
David Prévot
taffit at moszumanska.debian.org
Sat Oct 11 17:20:52 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud-doc.
commit d61fba4690f41605615e3c81435b30f8b4619861
Merge: f091922 588901c
Author: David Prévot <taffit at debian.org>
Date: Fri Oct 10 12:22:48 2014 -0400
Merge remote-tracking branch 'upstream/master' into upstream
README.rst | 34 +-
.../themes/owncloud_org/static/styles.css | 8 +
admin_manual/conf.py | 4 +-
admin_manual/configuration/auth_ldap.rst | 468 +++++++------
.../configuration/configuration-antivirus.rst | 148 ++++
admin_manual/configuration/configuration_apps.rst | 2 +-
.../configuration/configuration_assets.rst | 2 -
.../configuration/configuration_encryption.rst | 59 +-
.../configuration/configuration_file_sharing.rst | 78 +++
admin_manual/configuration/configuration_mail.rst | 289 +++++---
.../configuration/configuration_preview.rst | 107 +--
admin_manual/configuration/configuration_users.rst | 289 +++-----
.../configuration/configuring_big_file_upload.rst | 60 +-
.../configuration/configuring_documents.rst | 28 +
admin_manual/configuration/configuring_search.rst | 32 +
admin_manual/configuration/custom_mount_config.rst | 4 +-
.../configuration/custom_mount_config_gui.rst | 751 ++++++---------------
admin_manual/configuration/index.rst | 4 +
.../configuration/server_to_server_managing.rst | 21 +-
admin_manual/contents.rst | 1 +
admin_manual/images/antivirus-app.png | Bin 0 -> 12111 bytes
admin_manual/images/antivirus-config.png | Bin 0 -> 14462 bytes
admin_manual/images/antivirus-daemon-socket.png | Bin 0 -> 16412 bytes
admin_manual/images/antivirus-daemon.png | Bin 0 -> 14001 bytes
admin_manual/images/antivirus-executable.png | Bin 0 -> 14705 bytes
admin_manual/images/antivirus-logging.png | Bin 0 -> 5047 bytes
admin_manual/images/documents_app_enable.png | Bin 0 -> 25556 bytes
.../images/encryption_enabling.png | Bin
admin_manual/images/external-storage-amazons3.png | Bin 0 -> 24367 bytes
admin_manual/images/external-storage-app-add.png | Bin 0 -> 22350 bytes
.../images/external-storage-app-enable.png | Bin 0 -> 10625 bytes
admin_manual/images/external-storage-app-local.png | Bin 0 -> 10964 bytes
.../images/external-storage-app-usermounts.png | Bin 0 -> 17775 bytes
.../images/external-storage-dropbox-allowshare.png | Bin 0 -> 18812 bytes
.../images/external-storage-dropbox-app.png | Bin 0 -> 66394 bytes
.../images/external-storage-dropbox-configapp.png | Bin 0 -> 33217 bytes
.../images/external-storage-dropbox-oc.png | Bin 0 -> 7964 bytes
...73F49785A6.png => external-storage-dropbox.png} | Bin
admin_manual/images/external-storage-ftp.png | Bin 0 -> 10805 bytes
.../images/external-storage-google-drive-0auth.png | Bin 0 -> 65496 bytes
.../images/external-storage-google-drive-9.png | Bin 0 -> 34285 bytes
.../images/external-storage-google-drive-sdk.png | Bin 0 -> 45813 bytes
.../images/external-storage-google-drive.png | Bin 0 -> 9414 bytes
.../images/external-storage-google-drive1.png | Bin 0 -> 20527 bytes
.../images/external-storage-google-drive2.png | Bin 0 -> 5359 bytes
.../images/external-storage-google-drive3.png | Bin 0 -> 59817 bytes
.../images/external-storage-google-drive4.png | Bin 0 -> 62393 bytes
.../images/external-storage-google-drive5.png | Bin 0 -> 75172 bytes
.../images/external-storage-google-drive7.png | Bin 0 -> 29240 bytes
.../images/external-storage-google-drive8.png | Bin 0 -> 11987 bytes
admin_manual/images/external-storage-smb.png | Bin 0 -> 6000 bytes
admin_manual/images/external-storage-webdav.png | Bin 0 -> 10686 bytes
admin_manual/images/lucene-search-enable.png | Bin 0 -> 17268 bytes
admin_manual/images/lucene-search-user.png | Bin 0 -> 11849 bytes
admin_manual/images/preview_images.png | Bin 0 -> 37722 bytes
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/smtp-config-php-sendmail.png | Bin 0 -> 13106 bytes
admin_manual/images/smtp-config-smtp.png | Bin 0 -> 23999 bytes
admin_manual/images/smtp-config-wizard.png | Bin 0 -> 23571 bytes
admin_manual/images/updater-1.png | Bin 0 -> 3626 bytes
admin_manual/images/updater-2.png | Bin 0 -> 3209 bytes
admin_manual/images/updater-3.png | Bin 0 -> 17361 bytes
admin_manual/images/updater-4.png | Bin 0 -> 32469 bytes
admin_manual/images/updater-5.png | Bin 0 -> 20751 bytes
admin_manual/images/updater-6.png | Bin 0 -> 34638 bytes
admin_manual/images/updater-7.png | Bin 0 -> 29303 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/index.rst | 12 +-
.../installation/configuration_hiawatha.rst | 12 +
.../installation/configuration_lighttpd.rst | 57 ++
admin_manual/installation/configuration_nginx.rst | 99 +++
admin_manual/installation/configuration_yaws.rst | 30 +
admin_manual/installation/index.rst | 4 +
.../installation/installation_appliance.rst | 5 +
admin_manual/installation/installation_others.rst | 15 -
admin_manual/installation/installation_source.rst | 542 +++++----------
admin_manual/installation/installation_ucs.rst | 10 +-
admin_manual/installation/installation_windows.rst | 217 ++++--
admin_manual/maintenance/convert_db.rst | 64 ++
admin_manual/maintenance/index.rst | 2 +
admin_manual/maintenance/restore.rst | 2 +-
admin_manual/maintenance/update.rst | 249 +++----
admin_manual/maintenance/upgrade.rst | 194 ++++++
admin_manual/whats_new_admin.rst | 104 +++
developer_manual/app/configuration.rst | 8 +-
developer_manual/app/css.rst | 73 +-
developer_manual/app/database.rst | 64 +-
developer_manual/app/js.rst | 8 +-
developer_manual/app/startapp.rst | 2 +-
developer_manual/core/configfile.rst | 6 -
developer_manual/general/devenv.rst | 2 +-
developer_manual/testing/index.rst | 4 +-
go.php | 6 +
index/index.rst | 2 +-
user_manual/documents.rst | 77 ++-
user_manual/external_storage/google_drive.rst | 109 +--
user_manual/files/encryption.rst | 37 +-
user_manual/files/files.rst | 2 +-
user_manual/files/filesweb.rst | 200 ++++--
user_manual/files/server_to_server_using.rst | 79 +--
user_manual/files/sync.rst | 2 +-
user_manual/files/versioncontrol.rst | 4 +-
user_manual/images/calendar_create_event_share.png | Bin 11036 -> 19996 bytes
user_manual/images/calendar_edit_event.png | Bin 8846 -> 13363 bytes
user_manual/images/calendar_settings.png | Bin 15142 -> 18985 bytes
user_manual/images/chain-link-on-public-share.png | Bin 0 -> 5195 bytes
user_manual/images/contact_address_book_add.png | Bin 11245 -> 8591 bytes
user_manual/images/event_export.png | Bin 0 -> 17683 bytes
user_manual/images/s2s-add-remote-share.png | Bin 0 -> 9000 bytes
user_manual/images/s2s-connect-to-remote-share.png | Bin 0 -> 30521 bytes
user_manual/images/s2s-create_public_share.png | Bin 0 -> 23164 bytes
user_manual/images/s2s-remote-share-labeled.png | Bin 0 -> 9772 bytes
user_manual/images/users-files.png | Bin 0 -> 24404 bytes
user_manual/images/users-overlays-sharepoint.png | Bin 0 -> 3707 bytes
.../images/users-overlays-win-net-drive.png | Bin 0 -> 2195 bytes
user_manual/images/users-overlays.png | Bin 0 -> 2632 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/index.rst | 8 +-
user_manual/pim/calendar.rst | 43 +-
user_manual/pim/contacts.rst | 27 +-
user_manual/pim/sync_ios.rst | 6 +-
user_manual/pim/sync_thunderbird.rst | 14 +-
user_manual/pim/troubleshooting.rst | 4 +-
user_manual/userpreferences.rst | 58 +-
user_manual/webinterface.rst | 42 +-
user_manual/whats_new.rst | 60 +-
132 files changed, 2741 insertions(+), 2213 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git
More information about the Pkg-owncloud-commits
mailing list