[Pkg-owncloud-commits] [owncloud-doc] 264/270: Add S2S docs
David Prévot
taffit at moszumanska.debian.org
Thu Jul 31 03:53:38 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud-doc.
commit 6507552cc0e99231261bd8a556787c28dd8328ff
Author: Daniel Molkentin <daniel at molkentin.de>
Date: Wed Jul 30 17:52:46 2014 +0200
Add S2S docs
---
admin_manual/configuration/index.rst | 1 +
.../configuration/server_to_server_managing.rst | 29 ++++++++++
admin_manual/images/remote_shares.png | Bin 0 -> 6872 bytes
admin_manual/index.rst | 57 ++++++++++---------
user_manual/files/index.rst | 1 +
user_manual/files/server_to_server_using.rst | 62 +++++++++++++++++++++
user_manual/images/share_link.png | Bin 0 -> 14435 bytes
user_manual/images/share_link_adding.png | Bin 0 -> 32097 bytes
user_manual/index.rst | 7 +--
9 files changed, 125 insertions(+), 32 deletions(-)
diff --git a/admin_manual/configuration/index.rst b/admin_manual/configuration/index.rst
index 5e2c6b8..b85248b 100644
--- a/admin_manual/configuration/index.rst
+++ b/admin_manual/configuration/index.rst
@@ -8,6 +8,7 @@ Configuration
configuration_apps
configuration_users
auth_ldap
+ server_to_server_managing
background_jobs
configuration_assets
configuration_3rdparty
diff --git a/admin_manual/configuration/server_to_server_managing.rst b/admin_manual/configuration/server_to_server_managing.rst
new file mode 100644
index 0000000..5ebe9d3
--- /dev/null
+++ b/admin_manual/configuration/server_to_server_managing.rst
@@ -0,0 +1,29 @@
+Managing Server-to-Server Sharing Access
+========================================
+
+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.
+
+To manage server-to-server sharing access:
+
+1. Access the ownCloud Admin page.
+
+2. In the Application View, scroll to the Remote Shares section of the page.
+
+ .. figure:: ../images/remote_shares.png
+
+3. Enable or disable the remote shares options as desired:
+
+ * ``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.
+
+ * ``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.
+
+For information about how to use server-to-server sharing, "Using Server-to-Server Sharing"
+in the Users Manual.
diff --git a/admin_manual/images/remote_shares.png b/admin_manual/images/remote_shares.png
new file mode 100644
index 0000000..1b48ef5
Binary files /dev/null and b/admin_manual/images/remote_shares.png differ
diff --git a/admin_manual/index.rst b/admin_manual/index.rst
index 1afe07d..62536a5 100644
--- a/admin_manual/index.rst
+++ b/admin_manual/index.rst
@@ -1,42 +1,39 @@
-===================
-Admin Documentation
-===================
-
+============
Introduction
============
-This is the administrators manual for ownCloud, a flexible, open source file
-sync and share solution. It comprises of the ownCloud server, as well as client
-applications for Microsoft Windows, Mac OS X and Linux (Desktop Client) and
-mobile clients for the Android and Apple iOS operating system.
+Welcome to the ownCloud Administrator Guide. This guide describes
+administrator tasks for ownCloud; a flexible, open source, file synchronization
+and sharing solution. ownCloud is comprised of a server running on either a
+Linux or Microsoft Word platform as well as client applications for Microsoft
+Windows, Mac OS X and Linux (Desktop Client) and mobile clients for both the
+Android and Apple iOS operating system.
-Target audience
+Target Audience
---------------
-This guide is targeted towards people who want to install, administer and
-optimize ownCloud Server. If you want to learn how to use the Web UI, or how to
-install clients on the server, please refer to the `User Manual`_ or the `Desktop
-Client Manual`_ respectively.
+This guide is targeted towards people who want to install, administer, and
+optimize the ownCloud server. If you want to learn more about the ownCloud Web
+user interface or how to install clients on the server, refer to the following:
+
+* `User Manual`_
+* `Desktop Client Manual`_
.. _`User Manual`: http://doc.owncloud.com/
.. _`Desktop Client Manual`: http://doc.owncloud.com/
-Structure of this document
---------------------------
+Document Structure
+------------------
-The next chapters describes how to set up ownCloud Server on different platforms
-and operating systems, as well as how to update existing installations.
-
-Further chapters will then detail on integrating ownCloud into your existing
-environment, e.g. how to setup LDAP or how to mount your storage.
+This document is broken out into three major sections -- Installation,
+Configuration, and Maintenance. The following sections provide detailed
+information about various tasks associated with each of these sections.
Installation
============
-This chapter will introduce you to the installation of ownCloud in different scenarios.
-
-If you want to just try ownCloud in a virtual machine without any configuration, check the section
-:doc:`installation/installation_appliance`, where you will find ready-to-use images.
+This section provides detailed instructions on how to install ownCloud in
+different scenarios. It contains the following topics:
* :doc:`installation/installation_linux` (recommended)
* :doc:`installation/installation_windows`
@@ -46,14 +43,20 @@ If you want to just try ownCloud in a virtual machine without any configuration,
* :doc:`installation/installation_macos` (not supported)
* :doc:`installation/installation_appliance`
+.. note:: If you just want to try out ownCloud in a virtual machine, without
+ any configuration, refer to :doc:`installation/installation_appliance`. For
+ your convenience, this topic contains ready-to-use images.
+
Configuration
=============
-This chapter covers ownCloud and web server configuration.
+This section describes how to configure ownCloud and your web server. It
+contains the following topics:
* :doc:`configuration/configuration_apps`
* :doc:`configuration/configuration_users`
* :doc:`configuration/configuration_database`
* :doc:`configuration/auth_ldap`
+* :doc:`configuration/server_to_server_managing`
* :doc:`configuration/custom_mount_config_gui`
* :doc:`configuration/custom_mount_config`
* :doc:`configuration/background_jobs`
@@ -72,8 +75,10 @@ This chapter covers ownCloud and web server configuration.
Maintenance
===========
-This chapter covers maintenance tasks such as updating or migrating to a new version.
+This sections describes the maintenance tasks associated with the ownCloud
+server (for example, updating or migrating to a new version of ownCloud). It
+contains the following topics:
* :doc:`maintenance/enable_maintenance`
* :doc:`maintenance/migrating`
diff --git a/user_manual/files/index.rst b/user_manual/files/index.rst
index b102d71..a0ee221 100644
--- a/user_manual/files/index.rst
+++ b/user_manual/files/index.rst
@@ -8,6 +8,7 @@ Files & Synchronization
filesweb
files
versioncontrol
+ server_to_server_using
deletedfiles
sync
encryption
diff --git a/user_manual/files/server_to_server_using.rst b/user_manual/files/server_to_server_using.rst
new file mode 100644
index 0000000..f3a0a37
--- /dev/null
+++ b/user_manual/files/server_to_server_using.rst
@@ -0,0 +1,62 @@
+Using Server-to-Server Sharing
+==============================
+
+ownCloud supports server-to-server sharing. By mounting a share from another
+ownCloud instance, this feature enables you to:
+
+* Seamlessly collaborate and share files from within two ownCloud instances.
+* Combine two private clouds into a single public cloud.
+* Locally synchronize the folder through the client.
+* Eliminate the need to create user accounts on multiple instances.
+
+.. note:: Server-to-server sharing requires that both servers are running
+ versions of ownCloud that support this feature.
+
+For information about managing server-to-server sharing functions for internal
+and external users and groups see `Managing Server-to-Server Sharing Access`_.
+
+Sharing Files and Folders Across Servers
+----------------------------------------
+
+Server-to-server sharing is enabled on new or upgraded ownCloud installations
+by default. However, you need to share folders in a particular way for
+server-to-server sharing to function. When sharing files and folders across
+servers, two primary steps are required. These steps include:
+
+1. The originator sharing a file or folder from their server using a link.
+
+2. The receiver(s) of the shared file or folder adding the file or folder to their ownCloud instance.
+
+Sharing From a Server
+~~~~~~~~~~~~~~~~~~~~~
+
+To share a file or folder across servers as an originator:
+
+1. Access the Files app on your server.
+
+2. Select and share a file or folder by link.
+
+ .. figure:: ../images/share_link.png
+
+ **Sharing a link**
+
+3. (Optional) Specify an alphanumeric password that you want others to use in order to accessing this share.
+
+4. (Optional) Specify an expiration date for the share.
+
+ If set, the ability to access the link expires on the date specified.
+
+3. Send an email to the user or group to indicate the shared link.
+
+Adding a Shared File or Folder to Your ownCloud Instance
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To add a file or folder to your ownCloud:
+
+1. Access the shared link using a browser.
+
+ The links opens the shared folder or file.
+
+ .. figure:: ../images/share_link_adding.png
+
+2. Click "Add to your owncloud" and specify the URL to your ownCloud instance.
diff --git a/user_manual/images/share_link.png b/user_manual/images/share_link.png
new file mode 100644
index 0000000..3db88df
Binary files /dev/null and b/user_manual/images/share_link.png differ
diff --git a/user_manual/images/share_link_adding.png b/user_manual/images/share_link_adding.png
new file mode 100644
index 0000000..5937798
Binary files /dev/null and b/user_manual/images/share_link_adding.png differ
diff --git a/user_manual/index.rst b/user_manual/index.rst
index 6703b45..c7af8b4 100644
--- a/user_manual/index.rst
+++ b/user_manual/index.rst
@@ -27,12 +27,6 @@ provides the ability to put the right files in the right hands at the right
time on any device with one simple-to-use, secure, private and controlled
solution. After all, with ownCloud, it’s Your Cloud, Your Data, Your Way.
-What's new
-==========
-The following topic contains information about important changes in the current release:
-
-* :doc:`whats_new`
-
Web Interface
=============
The following topic contains a general overview how to access ownCloud from a
@@ -50,6 +44,7 @@ interface or through the use of WebDAV shares (Linux or Mac OSX) or web folders
* :doc:`files/filesweb`
* :doc:`files/files`
* :doc:`files/sync`
+* :doc:`files/server_to_server_using`
* :doc:`files/versioncontrol`
* :doc:`files/deletedfiles`
* :doc:`files/encryption`
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git
More information about the Pkg-owncloud-commits
mailing list