Merge branch 'oc-document' of https://github.com/owncloud/documentation into oc-document

Conflicts:
	admin_manual/configuration/configuring_documents.rst
This commit is contained in:
Carla Schroder
2014-10-02 12:16:59 -07:00

View File

@@ -1,7 +1,7 @@
Configuring the Collaborative Documents App
===========================================
The Documents application supports editing document within ownCloud, without the
The Documents application supports editing documents within ownCloud, without the
need to launch an external application. The Documents app supports these
features:
@@ -25,4 +25,4 @@ available to all groups.
.. image:: ../images/documents_app_enable.png
See 'Collaborative Document Editing" in the User manual to learn how to create
and share documents in the Documents application.
and share documents in the Documents application.