[Pkg-owncloud-commits] [owncloud-doc] 196/227: Create Admin page for documents app, update user page
David Prévot
taffit at moszumanska.debian.org
Sat Oct 11 17:20:49 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 d67f48f6be6acac51355c7c00ecd43220bc04070
Author: Carla Schroder <carla at owncloud.com>
Date: Wed Oct 1 20:17:59 2014 -0700
Create Admin page for documents app, update user page
---
.../configuration/configuring_documents.rst | 24 +++++++
admin_manual/configuration/index.rst | 1 +
admin_manual/images/documents_app_enable.png | Bin 0 -> 25556 bytes
user_manual/documents.rst | 77 ++++++++++++---------
4 files changed, 71 insertions(+), 31 deletions(-)
diff --git a/admin_manual/configuration/configuring_documents.rst b/admin_manual/configuration/configuring_documents.rst
new file mode 100644
index 0000000..731c93e
--- /dev/null
+++ b/admin_manual/configuration/configuring_documents.rst
@@ -0,0 +1,24 @@
+Configuring the Collaborative Documents App
+===========================================
+
+The Documents application supports editing document within ownCloud, without the
+need to launch an external application. The Documents app supports these
+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
+
+Supported file formats are `.odt`, `.doc`, and `.docx`. You must have
+LibreOffice or OpenOffice installed on the ownCloud server.
+
+Enabling the Documents App
+==========================
+
+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
diff --git a/admin_manual/configuration/index.rst b/admin_manual/configuration/index.rst
index f954bed..7069b44 100644
--- a/admin_manual/configuration/index.rst
+++ b/admin_manual/configuration/index.rst
@@ -10,6 +10,7 @@ Configuration
auth_ldap
server_to_server_managing
background_jobs
+ configuring_documents
configuration_assets
configuration_3rdparty
configuration-antivirus
diff --git a/admin_manual/images/documents_app_enable.png b/admin_manual/images/documents_app_enable.png
new file mode 100644
index 0000000..96dabf1
Binary files /dev/null and b/admin_manual/images/documents_app_enable.png differ
diff --git a/user_manual/documents.rst b/user_manual/documents.rst
index 58879d9..4717bb0 100644
--- a/user_manual/documents.rst
+++ b/user_manual/documents.rst
@@ -1,68 +1,83 @@
-Documents
-=========
+Collaborative Document Editing
+==============================
-Document editing is an ownCloud app introduced in version 6. With this app, multiple users
-can edit rich-text simultaneously. The documents can be created from within the
-web-interface or existing documents can be uploaded. Sharing and editing can be done
-securely in the browser and be shared inside ownCloud or via a public link. User that
-have an account on the same server can be invited or public invitations can also be
-sent be email. The editing works on top of normal ODF files that are stored in ownCloud.
+The Documents application supports editing documents within ownCloud, without
+the need to launch an external application. The Documents app supports these
+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.
+
+Supported file formats are `.odt`, `.doc`, and `.docx`.
The main interface
------------------
.. image:: images/oc_documents.png
-Create/Upload a Document
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-In the documents application, click on the respective buttons to create or upload a document into your ownCloud. The *New document* button will create a document named "New document.odt". The extension ODT is an OpenDocument format, which many major office applications let you create/edit/view.
+Create or Upload a Document
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The *Upload* button allows you to upload any kind of document, but currently you can only edit ODT files within ownCloud.
+In the Documents application, you can upload an existing document or create a
+new one. The *New document* button creates a document named "New
+document.odt". The extension ODT is an OpenDocument format, which is supported
+by most word processors including Microsoft Word, LibreOffice Writer, and
+OpenOffice Writer.
Edit a Document
~~~~~~~~~~~~~~~
-If ownCloud contains at least one ODT file, you can immediately start editing by clicking on
-the file within the documents app. Clicking on documents in files app will only display it. Below, you
-can see editing a newly created document file:
+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
-Here is the explanation of each field in the image shown above:
-
-#. Clicking on the file name allows you to change filename.
-#. Allows you to share the document to public, specific users or groups. Will be explained in detail in :ref:`Share a document <share-a-document>` section.
-#. Formatting toolbar lets you change text styles.
+#. Click on the file name to change it.
+#. Share your document (See the :ref:`Share a document
+ <share-a-document>` section.)
+#. Formatting toolbar.
#. Zoom in/out
-#. Close document by saving changes
-#. Users currently editing this document
+#. Close and save.
+#. Users currently editing this document.
Collaboratively Editing a Document
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-To edit a file collaboratively, it needs to be shared with at least one user by using the *Share* button. When multiple uses have permission to edit a document, they will be able to edit it at the same time. The cursor of all editing users will be the same color as the border color of their user picture.
+To edit a file collaboratively, it must be shared with everyone who needs
+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
-If a user is not a local user (e.g accessing the file using public link), he/she will be shown as guest in user list and they will type a nickname before editing.
-
+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.
Delete a Document
~~~~~~~~~~~~~~~~~
-A document can be deleted using the files app and following the same procedure as for other file types. Clicking on the cross icon deletes the selected 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, as configured on your Personal page.
.. _share-a-document:
Share a Document
~~~~~~~~~~~~~~~~
-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:
+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
-By default, you can enter local users or groups to share with. Checking *Share link* will enable sharing via a public link, for which you can set a password to prevent editing by unwanted users. Shares can also have an expiration date that will expire the link after a given date. ownCloud will send the public link to users by email by typing each email address into the email field. Separate multiple email addresses with a space.
+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
+expiration date and password. ownCloud will send the public link to users by
+email by typing each email address into the email field. Separate multiple
+email addresses with a space.
-To see all of the features of the ownCloud document app, watch the
-`video on YouTube <https://www.youtube.com/watch?v=70pCBnNPdew>`_.
--
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