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

Merge pull request #225 from owncloud/en_clarity

Browse Source 
Some native English wording and general clarity
This commit is contained in:
Morris Jobke
2014-01-06 06:51:05 -08:00
parent 805b4656a9 946fb0d810
commit 13b6b4e6f8
3 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
user_manual/bookmarks.rst
View File

@@ -9,26 +9,27 @@ The main interface
Add a bookmark
~~~~~~~~~~~~~~
In bookmark application, enter a URL into the top-left area of the content section. After adding an address, you can click on pencil button to edit fields for the given address.
In the bookmark application, enter a URL into the top-left area of the content section. After adding an address, click on the pencil button to edit fields for the given address.
The main ownCloud bookmark interface contains 3 fields at the top where
you can enter the website address (or URL), the title of your bookmark and
you can enter the website address (or URL), the title of your bookmark, and
a set of tags separated from each other by a space.
.. figure:: images/bookmark_addurl.png
Adding a bookmark manually
In this example, we have added the page: `http://wikipedia.org` with the title "Wikipedia"
and some tags describing what Wikipedia is (for an easier search later on).
In this example, we have added the page `http://wikipedia.org` with the title "Wikipedia"
and some tags describing what Wikipedia is for an easier search later on.
Edit/Delete a bookmark
~~~~~~~~~~~~~~~~~~~~~~
You also have the possibility to edit or delete your bookmark.
For that, just hover on the bookmark and click on the little pencil if you wish to edit the bookmark
or on the cross if you want to the delete it.
You also have the possibility to edit or delete a bookmark.
The bookmark will then be filled into the 3 fields at the top of the screen.
Modify your bookmark to your need then hit the save button to persist the change.
To edit a bookmark, hover over the bookmark and click on the pencil icon.
The bookmark details will then be filled into the 3 fields at the top of the screen.
Modify your bookmark to your needs then click the save button to persist the change.
To delete a bookmark, hover over the bookmark and click the cross icon.
Search
~~~~~~
@@ -42,20 +43,20 @@ Simply click on the "Bookmarks" menu in the sidebar to come back to
the default view.
The bookmarklet
The Bookmarklet
---------------
.. figure:: images/bookmark_setting.png
Bookmarklet link
The creator of this app understand that people won't come,
open the ownCloud page to add the bookmark when the see a cool site.
The creator of this app understands that people won't want to
open the ownCloud boorkmarks page to add a bookmark every time they see a cool site.
This is why they have made this cool "bookmarklet".
A bookmarklet is small button that you can drag and drop in your bookmarks.
The next time you see a cool new site, press on this special bookmark,
it will add the site to your ownCloud bookmarks.
The next time you see a cool new site, click on this special bookmark
to add the site to your ownCloud bookmarks.
To find this bookmark click on gear button on the bottom area of bookmarks app.
To find this bookmark, click on the gear button at the bottom of the bookmarks app.

32
user_manual/documents.rst
View File

@@ -2,7 +2,7 @@ Documents
=========
Document editing is one of the new features in ownCloud 6. With this app, multiple users
can edit a rich-text simultaneously. The documents can be created from within the
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
@@ -13,18 +13,18 @@ The main interface
.. figure:: images/oc_documents.png
Create/Upload a document
Create/Upload a Document
~~~~~~~~~~~~~~~~~~~~~~~~
In documents application, click on appropriate buttons to create or upload a document into your ownCloud. *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.
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.
Upload button allows you to upload any kind of documents, but currently you can only edit ODT files using ownCloud.
The *Upload* button allows you to upload any kind of document, but currently you can only edit ODT files within ownCloud.
Edit a document
Edit a Document
~~~~~~~~~~~~~~~
If you have at least one ODT file in your ownCloud, you can immediately start editing by clicking on
the file in documents app. Clicking on documents in files app will only display it. Below, you
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:
.. figure:: images/oc_documents_edit.png
@@ -36,35 +36,35 @@ Here is the explanation of each field in the image shown above:
#. Formatting toolbar lets you change text styles.
#. Zoom in/out
#. Close document by saving changes
#. Users who currently editing this document
#. Users currently editing this document
Collaboratively editing a document
Collaboratively Editing a Document
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
To edit a file collaboratively, it needs to be shared with at least one user by using *Share* button. When a user had the permission to edit the document, he/she will be able to edit it at the same time with you. The cursor of the users will be the same color as the border color of their user picture.
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.
.. 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.
Delete a document
Delete a Document
~~~~~~~~~~~~~~~~~
A document can be deleted by using files app and following the same procedure as the other files. Using the cross icon deletes the selected 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.
.. _share-a-document:
Share a document
Share a Document
~~~~~~~~~~~~~~~~
Document sharing has the same options as sharing other files with other users. While editing the document, you can use *Share* button to enable editing the document by another users. 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. Clicking on *Share link* will enable public share then which you can set a password to protect editing from unwanted users. Shares can also have an expiration date which will expire the link after given date. The public link can be sent to multiple users by email by typing email addresses seperated with space into email field.
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.
To see all features of ownCloud document app, you can watch the video below:
To see all of the features of the ownCloud document app, watch the video below:
.. raw:: html

16
user_manual/files/deletedfiles.rst
View File

@@ -2,20 +2,20 @@ Deleted Files
=============
ownCloud keeps a copy of your deleted files in case you need them again. To
make sure that the user doesn't run out of memory the deleted files app
make sure that the user doesn't run out of memory, the deleted files app
manages the size of the deleted files for the user. The app takes care to never
use more that 50% of your currently available free space. If your deleted files
exceed this limit ownCloud deletes the oldest versions until it meets the memory
exceed this limit, ownCloud deletes the oldest versions until it meets the memory
usage limit again.
Deleted files can be found by clicking on *Deleted files* button on files app of web interface.
Deleted files can be found by clicking on the *Deleted files* button on files app of web interface.
You can either restore or permanently delete using appropriate buttons.
Beside that ownCloud checks the age of the files every time a new files gets moved
to the deleted files. By default deleted files stay in the trash bin for 180 days.
ownCloud also checks the age of deleted files every time new files are added
to the deleted files. By default, deleted files stay in the trash bin for 180 days.
The Administrator can adjust this value in the config.php by setting the
***"trashbin_retention_obligation"*** value. Files older than the
***"trashbin_retention_obligation"*** will be deleted permanently.
Additionally ownCloud calculates the maximum available space every time
a new file was added. If the deleted files exceed the new maximum available space
ownCloud will expire old deleted files until we meet the limit again.
Additionally, ownCloud calculates the maximum available space every time
a new file is added. If the deleted files exceed the new maximum allowed space
ownCloud will expire old deleted files until the limit is met once again.