[Pkg-owncloud-commits] [owncloud-doc] 10/56: Backport #1825 to stable8.2

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud-doc.

commit d4823f79b8f4f98531260db36855a9efa3c47f87
Author: RealRancor <Fisch.666 at gmx.de>
Date:   Tue Oct 27 20:05:07 2015 +0100

    Backport #1825 to stable8.2
---
 admin_manual/installation/linux_installation.rst  |  6 +++++-
 admin_manual/installation/source_installation.rst | 15 +++++++++------
 admin_manual/issues/index.rst                     |  9 +++------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/admin_manual/installation/linux_installation.rst b/admin_manual/installation/linux_installation.rst
index 86961bc..ac3bb04 100644
--- a/admin_manual/installation/linux_installation.rst
+++ b/admin_manual/installation/linux_installation.rst
@@ -69,4 +69,8 @@ Mageia software repository.
 **Debian/Ubuntu:** The package installs an additional Apache config file to 
 ``/etc/apache2/conf.d/owncloud.conf`` which contains an ``Alias`` to the 
 owncloud installation directory as well as some more needed configuration 
-options.
\ No newline at end of file
+options.
+
+**Running ownCloud in a subdir**: If you're running ownCloud in a subdir and
+want to use CalDAV or CardDAV clients make sure you have configured the correct 
+:ref:`service-discovery-label` URLs.
diff --git a/admin_manual/installation/source_installation.rst b/admin_manual/installation/source_installation.rst
index 547a679..7aeae09 100644
--- a/admin_manual/installation/source_installation.rst
+++ b/admin_manual/installation/source_installation.rst
@@ -208,20 +208,23 @@ Additional Apache Configurations
   the  server configuration, as well as in the CommonName field of the 
   certificate. If you want your ownCloud to be reachable via the internet, then 
   set both of these to the domain you want to reach your ownCloud server.
-  
+
 * Now restart Apache::
-  
+
      service apache2 restart
-     
-.. note:: You can use ownCloud over plain HTTP, but we strongly encourage you to
-          use SSL/TLS to encrypt all of your server traffic, and to protect 
-          user's logins and data in transit.
+
+* If you're running ownCloud in a subdir and want to use CalDAV or CardDAV clients
+  make sure you have configured the correct :ref:`service-discovery-label` URLs.
 
 .. _enabling-ssl-label:
 
 Enabling SSL
 ------------
 
+.. note:: You can use ownCloud over plain HTTP, but we strongly encourage you to
+          use SSL/TLS to encrypt all of your server traffic, and to protect 
+          user's logins and data in transit.
+
 Apache installed under Ubuntu comes already set-up with a simple
 self-signed certificate. All you have to do is to enable the ssl module and
 the default site. Open a terminal and run::
diff --git a/admin_manual/issues/index.rst b/admin_manual/issues/index.rst
index 157ccaf..cf5eaf7 100644
--- a/admin_manual/issues/index.rst
+++ b/admin_manual/issues/index.rst
@@ -239,6 +239,8 @@ which contains various additional information about WebDAV problems.
 Troubleshooting Contacts & Calendar
 -----------------------------------
 
+.. _service-discovery-label:
+
 Service discovery
 ^^^^^^^^^^^^^^^^^
 
@@ -248,11 +250,6 @@ when explicitly configured to use it.
 There are several techniques to remedy this, which are described extensively at 
 the `Sabre DAV website <http://sabre.io/dav/service-discovery/>`_.
 
-Apple iOS
-^^^^^^^^^
-
-Below is what has been proven to work with iOS including iOS 7.
-
 If your ownCloud instance is installed in a subfolder under the web server's 
 document root and the client has difficulties finding the Cal- or CardDAV 
 end-points, configure your web server to redirect from a "well-known" URL to 
@@ -291,4 +288,4 @@ Other issues
 Some services like *Cloudflare* can cause issues by minimizing JavaScript
 and loading it only when needed. When having issues like a not working
 login button or creating new users make sure to disable such services
-first.
\ No newline at end of file
+first.

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