khanh.pndc/nextcloud-docs
1
0
Fork 0
mirror of https://github.com/nextcloud/documentation.git synced 2026-01-04 02:36:49 +07:00
Code Issues Packages Projects Releases Wiki Activity

Set line wrap to 80, added missing markup

Browse Source 
Merge branch 'carla' of https://github.com/owncloud/documentation into carla

Conflicts:
	admin_manual/configuration/server_to_server_managing.rst
This commit is contained in:
Carla Schroder
2014-08-12 15:51:43 -07:00
parent 33d463ca6a d8d985742f
commit 632c2743a3
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_manual/configuration/server_to_server_managing.rst
View File

@@ -1,6 +1,7 @@
Configuring Server-to-Server Sharing
========================================
<<<<<<< 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
@@ -58,3 +59,4 @@ 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