[Pkg-owncloud-commits] [owncloud-doc] 160/270: Clarified server vs client's domain names. Added the missing screenshot.

[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 5d0c8ced75aef68b58d102042f01bcb3ed4058c2
Author: Jürgen Weigert <juewei at fabfolk.com>
Date:   Thu Jun 5 20:59:20 2014 +0200

    Clarified server vs client's domain names.
    Added the missing screenshot.
---
 admin_manual/installation/images/untrusted-domain.png | Bin 0 -> 26983 bytes
 admin_manual/installation/installation_wizard.rst     |  12 ++++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/admin_manual/installation/images/untrusted-domain.png b/admin_manual/installation/images/untrusted-domain.png
new file mode 100644
index 0000000..825ca2d
Binary files /dev/null and b/admin_manual/installation/images/untrusted-domain.png differ
diff --git a/admin_manual/installation/installation_wizard.rst b/admin_manual/installation/installation_wizard.rst
index 20d0e68..01d6a0b 100644
--- a/admin_manual/installation/installation_wizard.rst
+++ b/admin_manual/installation/installation_wizard.rst
@@ -97,16 +97,20 @@ Note
 ~~~~
 ownCloud will take the URL used to access the Installation Wizard and insert
 that into the config.php file for the ‘trusted_domains’ setting.
+All needed domain names of the owncloud server go into the 
+'trusted_domains' setting. No domain names of clients go there. 
 
-Users will only be able to log into ownCloud when they are using a domain name
-listed in the ‘trusted_domans’ setting.
+Users will only be able to log into ownCloud when they point their browsers to a
+domain name listed in the ‘trusted_domains’ setting. An IPv4 address can be
+specified instead of a domain name.
 
 In the event that a load balancer is in place, there will be no issues, as long
 as it sends the correct X-Forwarded-Host header.
 
-It should be noted that the loopback address, 127.0.0.1, is whitelisted and
+It should be noted that the loopback address, '127.0.0.1', is whitelisted and
 therefore users on the ownCloud server who access ownCloud with the loopback
-will successfully login. In the event that an improper URL is used, the
+interface will be able to successfully login. 
+In the event that an improper URL is used, the
 following error will appear:
 
 .. image:: images/untrusted-domain.png

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