diff --git a/user_manual/contents.rst b/user_manual/contents.rst index 03210fdab..9e20c6cb7 100644 --- a/user_manual/contents.rst +++ b/user_manual/contents.rst @@ -14,8 +14,7 @@ ownCloud documentation contents webinterface files/index - calendars - contacts + pim/index bookmarks mediaplayer migration diff --git a/user_manual/files/connecting_webdav.rst b/user_manual/files/connecting_webdav.rst deleted file mode 100644 index efba92b16..000000000 --- a/user_manual/files/connecting_webdav.rst +++ /dev/null @@ -1,192 +0,0 @@ -Mounting ownCloud via WebDAV -============================= - -All major operating systems allow for mounting a users ownCloud via WebDAV, -a HTTP extension as specified in :rfc:`2518`. This chapter describes how to -setup WebDAV on different operating systems. - -Windows -------- - -On Windows, you can assign ownCloud a drive letter. This allows you to -browse files stored on an ownCloudserver the way you would files stored in a -mapped network drive. - -Using this feature requires network connectivity. If you want to store -your files offline, use the ownCloud Client to sync all files on your -ownCloud to one or more directories of your local hard drive. - - -.. note:: Prior to mapping your drive, you will need to permit the use of - Basic Authentication in the Windows Registry. The procedure is - documented in KB841215_ and differs between Windows XP/Server 2003 - and Windows Vista/7. Please follow the Knowledge Base article - before proceeding, and follow the Vista instructions if you run - Windows 7. - -Mapping via the command line -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Suppose your ownCloud is installed at ``https://www.yourserver.com/owncloud``, -that is, entering this URL in your webbrowser will bring up the login screen. -Running - - net use Z: https://www.yourserver.com/owncloud/remote.php/webdav /user:youruser yourpassword - -will map the files of your ownCloud account to the drive letter Z:. An alternative -syntax is: - - net use Z: \\www.yourserver.com@ssl\owncloud\remote.php\webdav /user:youruser yourpassword - -Appending ``/persistent`` makes the connection persistent across reboots. - -You can also mount your ownCloud via HTTP, leaving the connection unencrypted. -Use either of the following syntaxes:: - - net use Z: http://www.yourserver.com/owncloud/remote.php/webdav /user:youruser yourpassword - net use Z: \\www.yourserver.com\owncloud\remote.php\webdav /user:youruser yourpassword - -Please note that this allows anyone to sniff your ownCloud data with ease, especially -on public WiFi hotspots. Plain HTTP should therefore only be used in conjunction -with a VPN tunnel when used on Laptops. - -Using Windows Explorer -~~~~~~~~~~~~~~~~~~~~~~ - -Right-click on ``Computer`` entry and select ``Map network drive...``. Choose a local network -drive to map ownCloud to. Finally, enter the address to your ownCloud instance, followed by -``/remote.php/webdav``, e.g. :: - - https://www.yourserver.com/owncloud/remote.php/webdav - -for an SSL protected server. Check ``Reconnect at logon`` to make this mapping persistent -across reboots. If you want to connect as another user, check ``Connect using different credentials``. - -.. figure:: ../images/explorer_webdav.png - :scale: 80% - - Mapping WebDAV on Windows Explorer. - -After pressing ``Finish``, Windows Explorer will map the network drive and your ownCloud instance -should be available - -Using Cyberduck (4.2.1) -~~~~~~~~~~~~~~~~~~~~~~~ - -Specify a server without any leading protocol information. e.g.: - -Server - owncloudhost.com - -The port depends on whether your ownCloud server supports SSL or not. Cyberduck requires that you select a different connection type depending on whethr SSL is to be used ('WebDAV' or 'WebDAV (HTTPS/SSL)'): - -Port - 80 (for WebDAV) - 443 (for WebDAV (HTTPS/SSL)) - -Use the 'More Options' drop-down menu to add the rest of your webdav URL into the 'Path' field. e.g.: - -Path - remote.php/webdav - -Known Problems -~~~~~~~~~~~~~~ - - -Problem - Windows refuses to connect via HTTPS - -Solution - The Windows WebDAV Client does not support Server Name Indication (SNI) on - encrypted connections. If you encounter an error mounting an SSL-encrypted - ownCloud instance, please contact your provider about assigning a dedicated - IP address for your SSL-based server. - -Problem - I receive the error ``Error 0x800700DF: The file size exceeds the limit allowed and cannot be saved.`` - -Solution - Windows limits the maximum size a file transferred from or to a WebDAV - share may have. You can increase the value ``FileSizeLimitInBytes`` in - ``HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WebClient\Parameters``. - by clicking on ``Modify``. In order to increase the limit to the maximum - value of 4GB, pick ``Decimal`` and enter ``4294967295`` as value. Afterwards, - reboot Windows or restart the ``WebClient`` service. - -.. todo:: - - document registry keys on file size limit and not complaining in no network cases - -Mac OS X --------- - -Assuming your owncloud instance is installed at ``https://www.yourserver.com/owncloud``: - -In the Finder, choose ``Go > Connect to Server,`` type the address of the server in the -``Server Address`` field, and click ``Connect``. The server address should be in a form -similar to this: ``ADDRESS/files/webdav.php``. For our example, it would be:: - - https://www.yourserver.com/owncloud/files/webdav.php - -For details, check the respective `vendor documentation`_ at the Apple website. - -Linux ------- - -KDE/Dolphin -~~~~~~~~~~~ - -Assuming your owncloud instance is installed at ``http://www.yourserver.com/owncloud``: - -1. Open Dolphin and click on where it says Network in the left hand Places column. -2. Click on the icon labeled ``Add a Network Folder``. -3. It should come up with WebDAV already selected. Make sure it is and then click ``Next``. -4. Enter the following settings: - - * Name: The name you’ll see in the ``Places`` bookmark, for example ownCloud - * User: Your ownCloud username you use to log in, for example admin - * Server: Your ownCloud domain name, for example ``www.yourserver.com`` - (without ``http://`` before or directories afterwards). - * Folder: Enter ``owncloud/files/webdav.php``. - -5. Create icon checkbox: Tick to get a bookmark in the Places column -6. Port & Encrypted checkbox: Leave as it is unless you have special settings or an SSL certificate. - -Ubuntu/Gnome (Nautilus) -~~~~~~~~~~~~~~~~~~~~~~~ - -.. figure:: ../images/nautilus_webdav.png - - Nautilus WebDAV mounting dialog - -Mounting from command line -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -1. Install the WebDAV support using the davfs package. On Debian/Ubuntu, you can use: ``sudo apt-get install davfs2``. -2. Reconfigure davfs2 to allow access to normal users: sudo dpkg-reconfigure davfs2 (select Yes when prompted). -3. Add the users you want to be able to mount the share to the davfs2 group: ``sudo usermod -aG davfs2 `` -4. Edit ``/etc/fstab``, and add the following line for each user who wants to mount the folder - (with your details where appropriate): ``ADDRESS/files/webdav.php /home//owncloud davfs user,rw,noauto 0 0``. - -Then, as each user who wants to mount the folder: - -1. Create the folders ``owncloud`` and ``.davfs2`` in your home directory -2. Create the file secrets inside ``.davfs2``, fill it with the following (with your credentials where appropriate) ``ADDRESS/files/webdav.php `` -3. Ensure the file is only writable by you either through the file manager, or via ``chmod 600 ~/.davfs2/secrets`` -4. Run the command: ``mount ~/owncloud`` -5. To automatically mount the folder on login, add the command you used in step 4 to ``~/.bashrc`` - -Known Issues -++++++++++++ - -**Problem:** Resource temporarily unavailable - -**Solution:** If you experience trouble when you create a file in the directory, edit ``/etc/davfs2/davfs2.conf`` and add `use_locks 0`` - -**Problem:** Certificate warnings - -**Solution:** If you use a self-signed certificate, you will get a warning. If you are willing to take the risk of a man in the middle attack, run this command instead: ``echo "y" | mount ~/owncloud > /dev/null 2>&1``. - - -.. _`vendor documentation`: http://docs.info.apple.com/article.html?path=Mac/10.6/en/8160.html -.. _KB841215: http://support.microsoft.com/kb/841215 diff --git a/user_manual/files/files.rst b/user_manual/files/files.rst index c69e909fc..7a63a1e81 100644 --- a/user_manual/files/files.rst +++ b/user_manual/files/files.rst @@ -1,53 +1,219 @@ Accessing your Files ==================== -Desktop (PC) ------------- Your ownCloud instance can be accessed on every platform via the web interface. There are also options to integrate it with your desktop. +.. note:: You will have to adjust **youradress.com/** to the URL of your ownCloud server installation Linux -~~~~~ +----- + +Gnome 3/Nautilus +~~~~~~~~~~~~~~~~ + The URL that you have to use to connect to the owncloud installation in nautilus is:: dav://youraddress.com/files/webdav.php .. image:: ../images/gnome3_nautilus_webdav.png +KDE/Dolphin +~~~~~~~~~~~ +Assuming your owncloud instance is installed at http://www.yourserver.com/owncloud: + +1. Open Dolphin and click on where it says Network in the left hand Places column. +2. Click on the icon labeled **Add a Network Folder**. +3. It should come up with WebDAV already selected. Make sure it is and then click **Next**. +4. Enter the following settings: + +* Name: The name you’ll see in the **Places** bookmark, for example ownCloud +* User: Your ownCloud username you use to log in, for example admin +* Server: Your ownCloud domain name, for example **www.yourserver.com** (without **http://** before or directories afterwards). +* Folder: Enter:: + + owncloud/files/webdav.php + +5. Create icon checkbox: Tick to get a bookmark in the Places column +6. Port & Encrypted checkbox: Leave as it is unless you have special settings or an SSL certificate. + +Mounting from command line +~~~~~~~~~~~~~~~~~~~~~~~~~~ +1. Install the WebDAV support using the davfs package. On Debian/Ubuntu, you can use:: + + sudo apt-get install davfs2 + +2. Reconfigure davfs2 to allow access to normal users (select Yes when prompted):: + + sudo dpkg-reconfigure davfs2 + +3. Add the users you want to be able to mount the share to the davfs2 group:: + + sudo usermod -aG davfs2 + +4. Edit :file:`/etc/fstab` and add the following line for each user who wants to mount the folder (with your details where appropriate):: + + youradress.com/files/webdav.php /home//owncloud davfs user,rw,noauto 0 0**. + +Then, as each user who wants to mount the folder: + +1. Create the folders **owncloud/** and **.davfs2/** in your home directory +2. Create the file secrets inside **.davfs2/**, fill it with the following (with your credentials where appropriate):: + + youradress.com/files/webdav.php + +3. Ensure the file is only writable by you either through the file manager, or via:: + + chmod 600 ~/.davfs2/secrets + +4. Run the command:: + + mount ~/owncloud + +5. To automatically mount the folder on login, add the command you used in step 4 to :file:`./.bashrc` + +Known Issues +^^^^^^^^^^^^ + +**Problem:** Resource temporarily unavailable + +**Solution:** If you experience trouble when you create a file in the directory, edit :file:`/etc/davfs2/davfs2.conf` and add:: + + use_locks 0 + +**Problem:** Certificate warnings + +**Solution:** If you use a self-signed certificate, you will get a warning. If you are willing to take the risk of a man in the middle attack, run this command instead:: + + echo "y" | mount ~/owncloud > /dev/null 2>&1 + MacOS -~~~~~ +----- +In the Finder, choose **Go > Connect to Server,** type the address of the server in the **Server Address** field, and click **Connect**. + The URL that you have to use to connect to the owncloud installation in finder is:: http://youraddress.com/files/webdav.php +For details, check the respective `vendor documentation`_ at the Apple website. + +.. _`vendor documentation`: http://docs.info.apple.com/article.html?path=Mac/10.6/en/8160.html + Windows -~~~~~~~ +------- For Windows a seperate webdav client is recommended to access the files from your server. Choose one from the `WebDav Project page `_ +Should you have to use the native implementation then you can assign ownCloud a drive letter. This allows you to browse files stored on an ownCloudserver the way you would files stored in a mapped network drive. +Using this feature requires network connectivity. If you want to store +your files offline, use the ownCloud Client to sync all files on your +ownCloud to one or more directories of your local hard drive. + + +.. note:: Prior to mapping your drive, you will need to permit the use of Basic Authentication in the Windows Registry. The procedure is documented in KB841215_ and differs between Windows XP/Server 2003 and Windows Vista/7. Please follow the Knowledge Base article before proceeding, and follow the Vista instructions if you run Windows 7. + +.. _KB841215: http://support.microsoft.com/kb/841215 + +Mapping via the command line +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Suppose your ownCloud is installed at **https://www.yourserver.com/owncloud**, +that is, entering this URL in your webbrowser will bring up the login screen. +Running:: + + net use Z: https://www.yourserver.com/owncloud/remote.php/webdav /user:youruser yourpassword + +will map the files of your ownCloud account to the drive letter Z:. An alternative +syntax is:: + + net use Z: \\www.yourserver.com@ssl\owncloud\remote.php\webdav /user:youruser yourpassword + +Appending **/persistent** makes the connection persistent across reboots. + +You can also mount your ownCloud via HTTP, leaving the connection unencrypted. +Use either of the following syntaxes:: + + net use Z: http://www.yourserver.com/owncloud/remote.php/webdav /user:youruser yourpassword + net use Z: \\www.yourserver.com\owncloud\remote.php\webdav /user:youruser yourpassword + +Please note that this allows anyone to sniff your ownCloud data with ease, especially on public WiFi hotspots. Plain HTTP should therefore only be used in conjunction with a VPN tunnel when used on Laptops. + +Using Windows Explorer +~~~~~~~~~~~~~~~~~~~~~~ + +Right-click on **Computer** entry and select **Map network drive...**. Choose a local network drive to map ownCloud to. Finally, enter the address to your ownCloud instance, followed by **/remote.php/webdav**, e.g. :: + + https://www.yourserver.com/owncloud/remote.php/webdav + +for an SSL protected server. Check **Reconnect at logon** to make this mapping persistent across reboots. If you want to connect as another user, check **Connect using different credentials**. + +.. figure:: ../images/explorer_webdav.png + :scale: 80% + + Mapping WebDAV on Windows Explorer. + +After pressing **Finish**, Windows Explorer will map the network drive and your ownCloud instance should be available + +Using Cyberduck (4.2.1) +~~~~~~~~~~~~~~~~~~~~~~~ + +Specify a server without any leading protocol information. e.g.: + +Server + owncloudhost.com + +The port depends on whether your ownCloud server supports SSL or not. Cyberduck requires that you select a different connection type depending on whethr SSL is to be used ('WebDAV' or 'WebDAV (HTTPS/SSL)'): + +Port + 80 (for WebDAV) + 443 (for WebDAV (HTTPS/SSL)) + +Use the 'More Options' drop-down menu to add the rest of your webdav URL into the 'Path' field. e.g.: + +Path + remote.php/webdav + +Known Problems +~~~~~~~~~~~~~~ + + +Problem + Windows refuses to connect via HTTPS + +Solution + The Windows WebDAV Client does not support Server Name Indication (SNI) on + encrypted connections. If you encounter an error mounting an SSL-encrypted + ownCloud instance, please contact your provider about assigning a dedicated + IP address for your SSL-based server. + +Problem + I receive the error **Error 0x800700DF: The file size exceeds the limit allowed and cannot be saved.** + +Solution + Windows limits the maximum size a file transferred from or to a WebDAV + share may have. You can increase the value **FileSizeLimitInBytes** in + **HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WebClient\Parameters**. + by clicking on **Modify**. In order to increase the limit to the maximum + value of 4GB, pick **Decimal** and enter **4294967295** as value. Afterwards, + reboot Windows or restart the **WebClient** service. + +.. todo:: + + document registry keys on file size limit and not complaining in no network cases + + +Sync Client +----------- However, some applications only allow you to save to a local folder. To -get around this issue, you can: - -+ `Sync your ownCloud folders and local folders`_ - -+ `Mount ownCloud to a local folder without sync`_ - -The Desktop Syncing Client called Mirall is now released for Linux and -Windows. You can follow the current changes at the `ownCloud Mirall -repository`_. We work on porting this to Mac OS and packaging for all -major linux distributions. +get around this issue, you can use the :doc:`ownCloud sync clients <../files/index>` Mobile ------- - There are apps in development for both `Android`_ and `webOS`_. Feel free to `contribute, if you can`_! Right now you can use other apps to connect to ownCloud from your phone via WebDAV. `WebDAV Navigator`_ is a good (proprietary) app for `Android App`_ , `iPhone`_ & `BlackBerry`_. - - .. _in your file manager: http://en.wikipedia.org/wiki/Webdav#WebDAV_client_applications .. _Sync your ownCloud folders and local folders: http://owncloud.org/documentation/sync-clients/ .. _Mount ownCloud to a local folder without sync: http://owncloud.org/use/webdav/ diff --git a/user_manual/files/index.rst b/user_manual/files/index.rst index 685b199ad..6a84d1149 100644 --- a/user_manual/files/index.rst +++ b/user_manual/files/index.rst @@ -7,8 +7,4 @@ Files & Synchronization files versioncontrol - connecting_webdav - sync - sync_ios - sync_kde - sync_osx \ No newline at end of file + sync \ No newline at end of file diff --git a/user_manual/index.rst b/user_manual/index.rst index 6c79fa64c..a9e6f26c5 100644 --- a/user_manual/index.rst +++ b/user_manual/index.rst @@ -22,28 +22,18 @@ Files & Synchronization This chapter contains information about accessing your files. * :doc:`files/files` -* :doc:`files/versioncontrol` -* :doc:`files/connecting_webdav` - -Instructions on how to sync your files with your devices - * :doc:`files/sync` -* :doc:`files/sync_ios` -* :doc:`files/sync_kde` -* :doc:`files/sync_osx` +* :doc:`files/versioncontrol` +Calendar & Calendar +=================== +Contacts & Calendar web interface, export, import and synchronization. -Calendar -======== -Calendar web interface, export, import and synchronization. - -* :doc:`calendars` - -Contacts -======== -Contacts web interface, import and synchronization. - -* :doc:`contacts` +* :doc:`pim/calendar` +* :doc:`pim/contacts` +* :doc:`pim/sync_ios` +* :doc:`pim/sync_kde` +* :doc:`pim/sync_osx` Bookmarks ========= diff --git a/user_manual/calendars.rst b/user_manual/pim/calendar.rst similarity index 89% rename from user_manual/calendars.rst rename to user_manual/pim/calendar.rst index 02b770ac9..d2c30fc17 100644 --- a/user_manual/calendars.rst +++ b/user_manual/pim/calendar.rst @@ -1,10 +1,10 @@ -Calendars -========= +Using the Calendar App +====================== Creating a calendar ------------------- -.. figure:: images/calendar_manage-calendars.png +.. figure:: ../images/calendar_manage-calendars.png :scale: 30 If you use the calendar the first time, there will be already a calendar called @@ -28,7 +28,7 @@ Kontact, Evolution, Thunderbird using the following URL:: To use the ownCloud calendar with Apple iCal you will need to use the following URL, including the trailing slash:: - http://ADDRESS/remote.php/caldav/principals/username/ + http://ADDRESS/remote.php/caldav/principals/username/ Mozilla Lightning users need to this URL scheme:: @@ -36,7 +36,7 @@ Mozilla Lightning users need to this URL scheme:: .. note:: The calendar name must alway be specified in URL-encoding_. -.. figure:: images/calendar_caldav.png +.. figure:: ../images/calendar_caldav.png Example for a simple calendar: The default calendar is always called "defaultcalendar", and the users' name here is "test". @@ -54,7 +54,7 @@ To create an event just click on the date in the month view or choose the timeframe in the weekview. In the dialog which will appear you can enter your information like title, category, etc. -.. figure:: images/calendar_createevent.png +.. figure:: ../images/calendar_createevent.png :scale: 50 With the advanced options you can set the @@ -70,7 +70,7 @@ Exporting / Importing events Export ~~~~~~ -.. figure:: images/calendar_export.png +.. figure:: ../images/calendar_export.png :scale: 50 You can export either a single event or a whole calendar. If you want to export @@ -81,7 +81,7 @@ described in the chapter "Creating a calendar". Import ~~~~~~ -.. figure:: images/calendar_import.png +.. figure:: ../images/calendar_import.png :scale: 50 Import your calendar as ical file using the files app. Just click on the @@ -89,12 +89,12 @@ calendar file to open the import dialog. You can import the calendar into a new calendar or into an already existing calendar. .. note:: If the progressbar does not work properly, the folder - ``apps/calendar/import_tmp/`` has probably no write permission. + ``apps/calendar/import_tmp/`` has probably no write permission. Why is the calendar app asking for my current location? ------------------------------------------------------- -.. figure:: images/calendar_newtimezone1.png +.. figure:: ../images/calendar_newtimezone1.png :scale: 50 The calendar needs your current position in order to detect your timezone. diff --git a/user_manual/contacts.rst b/user_manual/pim/contacts.rst similarity index 92% rename from user_manual/contacts.rst rename to user_manual/pim/contacts.rst index cf1f9c676..4103c85fe 100644 --- a/user_manual/contacts.rst +++ b/user_manual/pim/contacts.rst @@ -19,7 +19,7 @@ So first well check out how to import all the VCF files as they are a lot more faster way of creating contacts. Just below the contact list, 3 buttons: The middle one let you upload files. -.. image:: images/contact_bottombar.jpg +.. image:: ../images/contact_bottombar.jpg Once you've clicked it, the upload window let you choose your files. @@ -31,13 +31,13 @@ Keep pressing CTRL and select the files to upload. After you are done just click on the open button After the upload it should look something like this in which all the names and contacts will be sorted alphabetically -.. image:: images/contact_vcfpick.jpg +.. image:: ../images/contact_vcfpick.jpg Then, the interface ask you where to put your imported contacts. You have the ability to choose an existing addressbook or to create a new one. Then click on "OK" and that's all for the import of contacts. -.. image:: images/contact_import.jpg +.. image:: ../images/contact_import.jpg Create contacts manually ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -50,7 +50,7 @@ the name, the address, the e-mail, the telephone nr, ... Just click on a field and start typing the information. You can use the "Add Field" button to add another types of information for this contact. -.. image:: images/contact_emptycontact.jpg +.. image:: ../images/contact_emptycontact.jpg When you want to remove an information of your contact, just click on little delete icon at the right of the field you want to remove. @@ -61,7 +61,7 @@ Adding picture to the contact There are two methods in which you can give a picture id to the specific contact -.. image:: images/contact_picture.jpg +.. image:: ../images/contact_picture.jpg 1) **Direct upload** 2) **Select pics already uploaded in ownCloud files.** @@ -69,7 +69,7 @@ There are two methods in which you can give a picture id to the specific contact After you have selected the picture for the contact you get an option to crop the picture to suit your requirements -.. image:: images/contact_crop.jpg +.. image:: ../images/contact_crop.jpg You can crop the picture however you wish and then press OK. @@ -85,7 +85,7 @@ When you click on the third button of the bottom bar, you will have access to the application's settings. Then, press on the "More button" to access the options of your Addressbooks. -.. image:: images/contact_del_ab.jpg +.. image:: ../images/contact_del_ab.jpg You have there the ability to add, delete, download or share your addressbooks. Hover your cursor on every icon to see what they mean. @@ -101,11 +101,11 @@ Syncing with Android ~~~~~~~~~~~~~~~~~~~~ 1) Install cardDav- Sync free from Google play store by visiting this link- https://play.google.com/store/apps/details?id=org.dmfs.carddav.sync 2) This app supports auto- configuration which is a Boon- after installing visit this link- carddavs://owncloud.example.net/remote.php/carddav/ to auto configure the app. -3) Enter your login details +3) Enter your login details 4) After the app has checked your login details you may just select- Sync server to phone option 5) That's it there is nothing else to do for Android :) -.. image:: images/contact_syncopt.jpg +.. image:: ../images/contact_syncopt.jpg Syncing your IOS device ~~~~~~~~~~~~~~~~~~~~~~~ @@ -137,5 +137,3 @@ Other Syncing options provided by ownCloud 1. For android you may use their official android app- https://owncloud.com/overview/mobileapps 2. And for IOS(Iphone and Ipad) use their app - https://owncloud.com/overview/mobileapps - - diff --git a/user_manual/pim/index.rst b/user_manual/pim/index.rst new file mode 100644 index 000000000..72bea5f43 --- /dev/null +++ b/user_manual/pim/index.rst @@ -0,0 +1,12 @@ +=================== +Contacts & Calendar +=================== + +.. toctree:: + :maxdepth: 1 + + contacts + calendar + sync_ios + sync_osx + sync_kde \ No newline at end of file diff --git a/user_manual/files/sync_ios.rst b/user_manual/pim/sync_ios.rst similarity index 87% rename from user_manual/files/sync_ios.rst rename to user_manual/pim/sync_ios.rst index b488bd899..170cddb49 100644 --- a/user_manual/files/sync_ios.rst +++ b/user_manual/pim/sync_ios.rst @@ -1,11 +1,8 @@ iOS - Synchronize iPhone/iPad ============================= - - - -Synchronizing the Calendar -~~~~~~~~~~~~~~~~~~~~~~~~~~ +Calendar +-------- #. Open the settings application. #. Select Mail, Contacts, Calendars. @@ -28,8 +25,9 @@ Synchronizing the Calendar Your calendar should now be visible in the Calendar application -Synchronizing the Address book -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Address book +------------ #. Open the settings application. #. Select Mail, Contacts, Calendars. @@ -52,8 +50,4 @@ Synchronizing the Address book Now should now find your contacts in the address book of your iPhone.Problems have been reported for iOS 4.X. A possible solution is -at the `forum`_. - - - -.. _forum: http://forum.owncloud.org/viewtopic.php?f=3&t=71&p=2211#p2197 +at the `forum `_. \ No newline at end of file diff --git a/user_manual/files/sync_kde.rst b/user_manual/pim/sync_kde.rst similarity index 69% rename from user_manual/files/sync_kde.rst rename to user_manual/pim/sync_kde.rst index cc8cd3bbd..2a5282781 100644 --- a/user_manual/files/sync_kde.rst +++ b/user_manual/pim/sync_kde.rst @@ -1,57 +1,54 @@ Synchronizing with KDE SC ========================= - - .. image:: /images/kdes1.png -From KDE SC 4.8 and forward setting up ownCloud is very easy.From System +From KDE SC 4.8 and forward setting up ownCloud is very easy. From System Settings Personal Information/Akonadi Resources Configuration select DAV Groupware resource. -.. image:: /images/kdes2.png +.. image:: ../images/kdes2.png Enter your ownCloud username and password and click "Next". -.. image:: /images/kdes3.png +.. image:: ../images/kdes3.png Select ownCloud in the drop down list and click "Next". -.. image:: /images/kdes4.png +.. image:: ../images/kdes4.png Enter the host name and installation path. If you do not use SSL remember to de-select "Use secure connection". -.. image:: /images/kdes5.png +.. image:: ../images/kdes5.png Test the connection. If everything went well you should see a message like the one below. -.. image:: /images/kdes6.png +.. image:: ../images/kdes6.png Click "Finish" and you will be able to change the display name and refresh interval. -.. image:: /images/kdes7.png +.. image:: ../images/kdes7.png Now you should see the Akonadi resource doing the first synchronization. .. missing -.. .. image:: /images/kdes8.png +.. .. image:: ../images/kdes8.png You can find the Contacts and Calendars in Kontact (or KOrganizer/KAddressbook if you run the programs separately.) -.. image:: /images/kdes9.png - -.. image:: /images/kdes.png +.. image:: ../images/kdes9.png +.. image:: ../images/kdes.png diff --git a/user_manual/files/sync_osx.rst b/user_manual/pim/sync_osx.rst similarity index 100% rename from user_manual/files/sync_osx.rst rename to user_manual/pim/sync_osx.rst