diff --git a/user_manual/contents.rst b/user_manual/contents.rst
index b9cb26642..54182ecf0 100644
--- a/user_manual/contents.rst
+++ b/user_manual/contents.rst
@@ -17,7 +17,6 @@ ownCloud documentation contents
     files/index
     pim/index
     bookmarks
-    documents
     migration
     userpreferences
     external_storage/google_drive
diff --git a/user_manual/documents.rst b/user_manual/files/documents.rst
similarity index 93%
rename from user_manual/documents.rst
rename to user_manual/files/documents.rst
index d5dc8bbef..f1e449680 100644
--- a/user_manual/documents.rst
+++ b/user_manual/files/documents.rst
@@ -16,7 +16,7 @@ Supported file formats are `.odt`, `.doc`, and `.docx`.
 The main interface
 ------------------
 
-.. image:: images/oc_documents.png
+.. image:: ../images/oc_documents.png
 
 Create or Upload a Document
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -33,7 +33,7 @@ Edit a Document
 To edit a document, access the Documents app from your Apps menu at the top 
 left of your ownCloud window. 
 
-.. image:: images/oc_documents_edit.png
+.. image:: ../images/oc_documents_edit.png
 
 #. Click on the file name to change it.
 #. Share your document (See the :ref:`Share a document 
@@ -51,7 +51,7 @@ editing permissions. Multiple users can edit it at the same time, and changes
 appear as they are made. The cursor of each user is the same color as the 
 border color of their user picture.
 
-.. figure:: images/oc_documents_col_edit.png
+.. 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, automatically named Guest 1, Guest 2, 
@@ -63,7 +63,7 @@ Delete a Document
 You can't delete a document from inside the Document app, but must go to your 
 Files page and delete it from there. You'll find it in your default documents 
 directory, which is configured on your ownCloud Personal page (see 
-:doc:`userpreferences`.)
+:doc:`../userpreferences`.)
 
 .. _share-a-document:
 
@@ -74,7 +74,7 @@ Document sharing has the same options as when sharing other files. While editing
 a document, you can use the *Share* button to enable other users to edit the 
 document. This button will display all available options to share:
 
-.. figure:: images/oc_documents_share.png
+.. figure:: ../images/oc_documents_share.png
 
 By default, you can enter local users or groups to share with. Checking *Share 
 link* will enable sharing via a public link. Shares can optionally have an 
diff --git a/user_manual/index.rst b/user_manual/index.rst
index 70656da1d..502bb717c 100644
--- a/user_manual/index.rst
+++ b/user_manual/index.rst
@@ -50,6 +50,7 @@ interface or through the use of WebDAV shares (Linux or Mac OSX) or web folders
 * :doc:`files/encryption`
 * :doc:`files/quota`
 * :doc:`files/configuring_big_file_upload`
+* :doc:`files/documents`
 
 
 Contacts and Calendar