[Pkg-owncloud-commits] [owncloud-doc] 13/49: Merge pull request #218 from wakeup/stable6updated

[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 97f89e16128d19689b748db10244729e4fc9e396
Merge: 01c8a26 b2f0f67
Author: Frank Karlitschek <frank at owncloud.org>
Date:   Fri Jan 3 07:27:38 2014 -0800

    Merge pull request #218 from wakeup/stable6updated
    
    User manual updated to version 6

 user_manual/bookmarks.rst                         |  17 ++--
 user_manual/contents.rst                          |   2 +
 user_manual/documents.rst                         |  71 +++++++++++++
 user_manual/files/configuring_big_file_upload.rst |   2 +-
 user_manual/files/deletedfiles.rst                |   3 +
 user_manual/files/files.rst                       |  16 +--
 user_manual/files/filesweb.rst                    |  50 ++++++++++
 user_manual/files/index.rst                       |   1 +
 user_manual/files/sync.rst                        |   4 +-
 user_manual/files/versioncontrol.rst              |  22 ++--
 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_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                             |   5 +
 user_manual/pim/calendar.rst                      |  14 +--
 user_manual/pim/contacts.rst                      |  59 ++++++-----
 user_manual/pim/sync_osx.rst                      |  16 +--
 user_manual/pim/sync_thunderbird.rst              |  14 +--
 user_manual/userpreferences.rst                   |  31 ++++++
 user_manual/webinterface.rst                      |  21 ++--
 47 files changed, 265 insertions(+), 199 deletions(-)

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