diff --git a/admin_manual/configuration/configuring_documents.rst b/admin_manual/configuration/configuring_documents.rst
index 731c93ed2..b28dbe4c4 100644
--- a/admin_manual/configuration/configuring_documents.rst
+++ b/admin_manual/configuration/configuring_documents.rst
@@ -8,11 +8,12 @@ features:
 * Cooperative edit, with multiple users editing files simultaneously. 
 * Document creation within ownCloud.
 * Document upload.
-* Secure sharing and editing: Share and edit files securely in the 
-  browser, and then share them inside ownCloud or through a public link
+* Share and edit files in the browser, and then share them inside ownCloud or 
+  through a public link.
 
-Supported file formats are `.odt`, `.doc`, and `.docx`. You must have 
-LibreOffice or OpenOffice installed on the ownCloud server.
+Supported file formats are `.odt`, `.doc`, and `.docx`. `.odt` is supported 
+natively in ownCloud, and you must have LibreOffice or OpenOffice installed on 
+the ownCloud server to convert `.doc`, and `.docx` documents.
   
 Enabling the Documents App
 ==========================
@@ -21,4 +22,7 @@ Go to your Apps page and click the ``Enable`` button. You also have the option
 to grant access to the Documents apps to selected user groups. By default it is 
 available to all groups.
 
-.. image:: ../images/documents_app_enable.png
\ No newline at end of file
+.. 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.
\ No newline at end of file
diff --git a/user_manual/documents.rst b/user_manual/documents.rst
index 4717bb0d1..918e5d002 100644
--- a/user_manual/documents.rst
+++ b/user_manual/documents.rst
@@ -8,8 +8,8 @@ features:
 * Cooperative edit, with multiple users editing files simultaneously. 
 * Document creation within ownCloud.
 * Document upload.
-* Secure sharing and editing: Share and edit files securely in the. 
-  browser, and then share them inside ownCloud or through a public link.
+* Share and edit files in the browser, and then share them inside ownCloud or 
+  through a public link.
 
 Supported file formats are `.odt`, `.doc`, and `.docx`.
 
@@ -54,8 +54,8 @@ border color of their user picture.
 .. figure:: images/oc_documents_col_edit.png
 
 If a user is not a local user (e.g accessing the file using public link), they
-will be shown as guest in the user list, and they will have to type a nickname 
-before editing.
+will be shown as guest in the user list, automatically named Guest 1, Guest 2, 
+and so on. Guests can change their nicknames at any time.
 
 Delete a Document
 ~~~~~~~~~~~~~~~~~