From 0a01ef40ba6825742f606e4eacfa30fa47276f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Pr=C3=A9vot?= Date: Fri, 10 Jan 2014 19:33:55 -0400 Subject: [PATCH] Use a IANA-managed reserved domain for examples Using another domain that may be already owned or squatted is not recommended. --- user_manual/files/files.rst | 32 ++++++++++++++++---------------- user_manual/pim/contacts.rst | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/user_manual/files/files.rst b/user_manual/files/files.rst index 5fe2b7f50..77d840bc0 100644 --- a/user_manual/files/files.rst +++ b/user_manual/files/files.rst @@ -3,7 +3,7 @@ Accessing your Files (WebDAV) 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 **youraddress.com/** to the URL of your ownCloud server installation +.. note:: You will have to adjust **example.org/** to the URL of your ownCloud server installation Linux @@ -14,7 +14,7 @@ Gnome 3/Nautilus The URL that you have to use to connect to the ownCloud installation in nautilus is:: - davs://youraddress.com/owncloud/remote.php/webdav + davs://example.org/owncloud/remote.php/webdav .. image:: ../images/gnome3_nautilus_webdav.png @@ -25,7 +25,7 @@ KDE/Dolphin ~~~~~~~~~~~ Click in the address area and enter:: - webdav://youraddress.com/owncloud/remote.php/webdav + webdav://example.org/owncloud/remote.php/webdav .. image:: ../images/dolphin_webdav.png @@ -38,7 +38,7 @@ or: * 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 **youraddress.com** (without **http://** before or directories afterwards). +* Server: Your ownCloud domain name, for example **example.org** (without **http://** before or directories afterwards). * Folder: Enter:: owncloud/remote.php/webdav @@ -62,14 +62,14 @@ Mounting from command line 4. Edit :file:`/etc/fstab` and add the following line for each user who wants to mount the folder (with your details where appropriate):: - youraddress.com/owncloud/remote.php/webdav /home//owncloud davfs user,rw,noauto 0 0 + example.org/owncloud/remote.php/webdav /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):: - youraddress.com/owncloud/remote.php/webdav + example.org/owncloud/remote.php/webdav 3. Ensure the file is only writable by you either through the file manager, or via:: @@ -107,7 +107,7 @@ In the Finder, choose **Go > Connect to Server,** type the address of the server The URL that you have to use to connect to the ownCloud installation in finder is:: - http://youraddress.com/owncloud/remote.php/webdav + http://example.org/owncloud/remote.php/webdav .. image:: ../images/osx_webdav2.png @@ -133,24 +133,24 @@ ownCloud to one or more directories of your local hard drive. Mapping via the command line ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Suppose your ownCloud is installed at **https://youraddress.com/owncloud**, +Suppose your ownCloud is installed at **https://example.org/owncloud**, that is, entering this URL in your web browser will bring up the login screen. Running:: - net use Z: https://youraddress.com/owncloud/remote.php/webdav /user:youruser yourpassword + net use Z: https://example.org/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: \\youraddress.com@ssl\owncloud\remote.php\webdav /user:youruser yourpassword + net use Z: \\example.org@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://youraddress.com/owncloud/remote.php/webdav /user:youruser yourpassword - net use Z: \\youraddress.com\owncloud\remote.php\webdav /user:youruser yourpassword + net use Z: http://example.org/owncloud/remote.php/webdav /user:youruser yourpassword + net use Z: \\example.org\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. @@ -159,7 +159,7 @@ 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://youraddress.com/owncloud/remote.php/webdav + https://example.org/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**. @@ -176,7 +176,7 @@ Using Cyberduck (4.2.1) Specify a server without any leading protocol information. e.g.: Server - youraddress.com + example.org 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)'): @@ -227,7 +227,7 @@ Mobile ------- To connect to your ownCloud server with the **ownCloud** mobile apps, use the base URL and folder only:: - youraddress.com/owncloud + example.org/owncloud No need to add remote.php/webdav as you do for any other WebDAV client. @@ -238,7 +238,7 @@ good (proprietary) app for `Android App`_ , `iPhone`_ & `BlackBerry`_. The URL for these is:: - youraddress.com/owncloud/remote.php/webdav + example.org/owncloud/remote.php/webdav .. _in your file manager: http://en.wikipedia.org/wiki/Webdav#WebDAV_client_applications .. _ownCloud sync clients: http://owncloud.org/documentation/sync-clients/ diff --git a/user_manual/pim/contacts.rst b/user_manual/pim/contacts.rst index 17419a4f5..b30aa24ab 100755 --- a/user_manual/pim/contacts.rst +++ b/user_manual/pim/contacts.rst @@ -107,7 +107,7 @@ Syncing with Android ~~~~~~~~~~~~~~~~~~~~ 1) Install CardDAV- Sync free from Google play store by visiting `this link `_. -2) This app supports auto- configuration which is a Boon- after installing visit this link - carddavs://youraddress.com/remote.php/carddav/ to auto-configure the app. +2) This app supports auto- configuration which is a Boon- after installing visit this link - carddavs://example.org/remote.php/carddav/ to auto-configure the app. 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 :) @@ -124,7 +124,7 @@ Synchronizing the Address book 3. Select Add Account. 4. Select other as account type. 5. Select Add CardDAV account. -6. For server, type http://youraddress.com/remote.php/carddav/principals/username +6. For server, type http://example.org/remote.php/carddav/principals/username 7. Enter your user name and password. 8. Select Next. 9. If your server does not support SSL, a warning will be displayed. Select Continue.