[Pkg-owncloud-commits] [owncloud-doc] 44/49: Merge tag 'upstream/0_20140111'

[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 67f770dd9e636e33534bb3b49cfdcd2d14aca670
Merge: 42a174f 44c5254
Author: David Prévot <taffit at debian.org>
Date:   Wed Jan 15 13:50:03 2014 -0400

    Merge tag 'upstream/0_20140111'
    
    Upstream version 0~20140111

 README.rst                                         |  19 +-
 admin_manual/Makefile                              |   8 +-
 admin_manual/conf.py                               |   6 +-
 admin_manual/configuration/configuration_apps.rst  |  20 +-
 admin_manual/configuration/configuration_users.rst | 224 +++++++++++++++++++++
 admin_manual/configuration/index.rst               |   3 +-
 admin_manual/images/oc_admin_app_page.png          | Bin 0 -> 28370 bytes
 admin_manual/images/oc_admin_user_manage.png       | Bin 0 -> 21025 bytes
 admin_manual/index.rst                             |   3 +-
 admin_manual/installation/installation_source.rst  |  38 ++--
 admin_manual/maintenance/backup.rst                |   2 +-
 admin_manual/maintenance/update.rst                |   8 +-
 admin_manual/make.bat                              |   9 +
 developer_manual/Makefile                          |   8 +-
 developer_manual/app/app/info.rst                  |   4 +-
 developer_manual/conf.py                           |  16 +-
 developer_manual/core/index.rst                    |  15 +-
 developer_manual/core/unit-testing.rst             |  26 ++-
 developer_manual/devenv/index.rst                  |   4 +-
 developer_manual/make.bat                          |   9 +
 go.php                                             |   2 +-
 setup.cmd                                          |  50 +++++
 user_manual/Makefile                               |   8 +-
 user_manual/bookmarks.rst                          |  44 ++--
 user_manual/conf.py                                |  13 +-
 user_manual/contents.rst                           |   2 +
 user_manual/documents.rst                          |  68 +++++++
 user_manual/files/configuring_big_file_upload.rst  |   2 +-
 user_manual/files/deletedfiles.rst                 |  17 +-
 user_manual/files/encryption.rst                   |   2 +-
 user_manual/files/files.rst                        |  64 +++---
 user_manual/files/filesweb.rst                     |  85 ++++++++
 user_manual/files/index.rst                        |   1 +
 user_manual/files/sync.rst                         |   4 +-
 user_manual/files/versioncontrol.rst               |  22 +-
 user_manual/html.txt                               |   0
 user_manual/images/bookmark_addurl.jpg             | Bin 11368 -> 0 bytes
 user_manual/images/bookmark_addurl.png             | Bin 0 -> 9464 bytes
 user_manual/images/bookmark_setting.jpg            | Bin 6410 -> 0 bytes
 user_manual/images/bookmark_setting.png            | Bin 0 -> 8861 bytes
 user_manual/images/calendar_createevent.png        | Bin 21501 -> 17972 bytes
 user_manual/images/calendar_export.png             | Bin 25552 -> 18885 bytes
 user_manual/images/calendar_import.png             | Bin 8445 -> 8250 bytes
 user_manual/images/calendar_manage-calendars.png   | Bin 32895 -> 39313 bytes
 user_manual/images/contact_bottombar.jpg           | Bin 2233 -> 0 bytes
 user_manual/images/contact_bottombar.png           | Bin 0 -> 890 bytes
 user_manual/images/contact_del_ab.jpg              | Bin 28610 -> 0 bytes
 user_manual/images/contact_del_ab.png              | Bin 0 -> 10105 bytes
 user_manual/images/contact_emptycontact.jpg        | Bin 10690 -> 0 bytes
 user_manual/images/contact_emptycontact.png        | Bin 0 -> 19910 bytes
 user_manual/images/contact_uploadbutton.png        | Bin 0 -> 4305 bytes
 user_manual/images/files_versioning.png            | Bin 0 -> 9333 bytes
 user_manual/images/oc_connect.png                  | Bin 50629 -> 107250 bytes
 user_manual/images/oc_documents.png                | Bin 0 -> 33956 bytes
 user_manual/images/oc_documents_col_edit.png       | Bin 0 -> 15944 bytes
 user_manual/images/oc_documents_edit.odg           | Bin 0 -> 23801 bytes
 user_manual/images/oc_documents_edit.png           | Bin 0 -> 24685 bytes
 user_manual/images/oc_documents_share.png          | Bin 0 -> 15529 bytes
 user_manual/images/oc_edit.png                     | Bin 0 -> 27248 bytes
 user_manual/images/oc_files_share.png              | Bin 0 -> 11553 bytes
 user_manual/images/oc_filesweb.png                 | Bin 0 -> 28666 bytes
 user_manual/images/oc_filesweb_navigate.png        | Bin 0 -> 5159 bytes
 user_manual/images/oc_filesweb_new.png             | Bin 0 -> 5434 bytes
 user_manual/images/oc_ui.png                       | Bin 134914 -> 138786 bytes
 user_manual/images/oc_ui.svg                       | 116 -----------
 user_manual/images/oc_user_preferences.png         | Bin 0 -> 24304 bytes
 user_manual/images/owncloud_webinterface.kra       | Bin 0 -> 387738 bytes
 user_manual/images/owncloud_webinterface_map.png   | Bin 0 -> 14230 bytes
 user_manual/index.rst                              |  15 +-
 user_manual/make.bat                               |   9 +
 user_manual/migration.rst                          |   4 +-
 user_manual/pim/calendar.rst                       |  20 +-
 user_manual/pim/contacts.rst                       |  65 +++---
 user_manual/pim/sync_osx.rst                       |  16 +-
 user_manual/pim/sync_thunderbird.rst               |  18 +-
 user_manual/userpreferences.rst                    |  31 +++
 user_manual/webinterface.rst                       |  24 +--
 77 files changed, 810 insertions(+), 314 deletions(-)

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