[Pkg-owncloud-commits] [owncloud-doc] 13/36: Set line wrap to 80, added missing markup Merge branch 'carla' of https://github.com/owncloud/documentation into carla

[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 632c2743a3950b10382704f3a0ce6c2a16badfea
Merge: 33d463c d8d9857
Author: Carla Schroder <carla at owncloud.com>
Date:   Tue Aug 12 15:51:43 2014 -0700

    Set line wrap to 80, added missing markup
    Merge branch 'carla' of https://github.com/owncloud/documentation into carla
    
    Conflicts:
    	admin_manual/configuration/server_to_server_managing.rst

 admin_manual/configuration/server_to_server_managing.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --cc admin_manual/configuration/server_to_server_managing.rst
index 403b537,c242676..20be768
--- a/admin_manual/configuration/server_to_server_managing.rst
+++ b/admin_manual/configuration/server_to_server_managing.rst
@@@ -1,11 -1,7 +1,12 @@@
  Configuring Server-to-Server Sharing
  ========================================
  
 -ownCloud 7 introduces a powerful new feature, server-to-server sharing. With just a few clicks you can easily and securely create public shares for sharing files and directories with other ownCloud 7 servers. You can automatically send an email notification when you create the share, add password protection, allow users to upload files, and set an expiration date.
++<<<<<<< HEAD
 +ownCloud 7 introduces a powerful new feature, server-to-server sharing. With 
 +just a few clicks you can easily and securely create public shares for sharing 
 +files and directories with other ownCloud 7 servers. You can automatically send 
 +an email notification when you create the share, add password protection, allow 
 +users to upload files, and set an expiration date.
  
  Follow these steps to create a new public share:
  
@@@ -41,20 -26,7 +42,21 @@@ connect to a remote public share
  Notes
  --------
  
 -Your Apache Web server must have ``mod_rewrite`` enabled, and you must have ``trusted_domains`` configured in ``config.php``. Consider also enabling SSL to encrypt all traffic between your servers. (See "Manual Installation" in the Administrators Manual to learn more about mod_rewrite, SSL, and alternative HTTP servers. See "Installation Wizard" in the Administrators Manual to learn more about configuring trusted domains.)
 -
 -Your ownCloud server creates the share link from the URL that you used to log into the server, so make sure that you log into your server using a URL that is accessible to your users. For example, if you log in via its LAN IP address, such as http://192.168.10.50, then your share URL will be something like http://192.168.10.50/owncloud/public.php?service=files&t=6b6fa9a714a32ef0af8a83dde358deec, which is not accessible outside of your LAN. This also applies to using the server name; for [...]
 -
 +Your Apache Web server must have ``mod_rewrite`` enabled, and you must have 
 +``trusted_domains`` configured in ``config.php``. Consider also enabling SSL to 
 +encrypt all traffic between your servers. (See "Manual Installation" in the 
 +Administrators Manual to learn more about mod_rewrite, SSL, and alternative 
 +HTTP servers. See "Installation Wizard" in the Administrators Manual to learn 
 +more about configuring trusted domains.)
 +
 +Your ownCloud server creates the share link from the URL that you used to log 
 +into the server, so make sure that you log into your server using a URL that is 
 +accessible to your users. For example, if you log in via its LAN IP address, 
 +such as ``http://192.168.10.50``, then your share URL will be something like 
 +``http://192.168.10.50/owncloud/public.php?service=files&t=
 +6b6fa9a714a32ef0af8a83dde358deec``, which is not accessible outside of your 
 +LAN. This also applies to using the server name; for access outside of your LAN 
 +you need to use a fully-qualified domain name such as 
 +``http://myserver.example.com``, rather than ``http://myserver``.
 +
++>>>>>>> d8d985742fbb0bbaeb7fec43457f0a77816c973e

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