Merge pull request #475 from owncloud/carla

Expanded server_to_server_managing.rst, and added screenshot create_publ...

admin_manual/configuration/server_to_server_managing.rst

@@ -1,29 +1,59 @@
-Managing Server-to-Server Sharing Access
+Configuring Server-to-Server Sharing
 ========================================
 
-You can manage how server-to-server sharing functions for internal and external
-users and groups from the Admin page. The settings on the Admin page provide a
-level of security for whether or not local or remote ownCloud users or groups
-can access server-to-server shares.
+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.
 
-To manage server-to-server sharing access:
+Follow these steps to create a new public share:
 
-1. Access the ownCloud Admin page.
-
-2. In the Application View, scroll to the Remote Shares section of the page.
+1. Go to ``admin > Admin`` in your ownCloud Web control panel, and scroll to 
+the Remote Shares section.
 
    .. figure:: ../images/remote_shares.png
+   
+2. To enable server-to-server sharing, and to allow remote users to mount your 
+shares in their ownCloud 7 accounts, check ``Allow other instances to mount 
+public links shared from this server.`` Leaving the checkbox blank disables 
+server-to-server sharing.
 
-3. Enable or disable the remote shares options as desired:
+3. You can enable the users on your local ownCloud server to create their own 
+public shares by checking ``Allow users to mount public link shares.`` Leaving 
+this unchecked disables user-created public shares.
+  
+4. Now go to your Files page and hover your cursor over the file or directory 
+you want to share to expose the administration options. Check the ``Share 
+Link`` checkbox to create the share, and to expose all of your sharing options.
 
-   * ``Allow other instances to mount public links shared from this server`` --
-     This option enables (checked) or disables (unchecked) the ability for
-     remote ownCloud users to access public links that you share from the
-     server.
+   .. figure:: ../images/create_public_share.png
+   
+Your new public share is labeled with a chain link. If you do not protect it 
+with a password, it is visible to anyone who has the URL. Users on other 
+ownCloud 7 servers can mount it and use it just like any ownCloud share. 
 
-   * ``Allow users to mount public link shares`` -- This option enables
-     (checked) or disables (unchecked) users on the local server to add shares
-     (folders or files) to the current ownCloud instance.
+Un-check the ``Share Link`` checkbox to disable the share.
 
-For information about how to use server-to-server sharing, "Using Server-to-Server Sharing"
-in the Users Manual.
+See "Using Server-to-Server Sharing" in the Users Manual to learn how to 
+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 access outside of your LAN 
+you need to use a fully-qualified domain name such as 
+``http://myserver.example.com``, rather than ``http://myserver``.