fix typos

This commit is contained in:
Carla Schroder 2014-12-10 08:24:12 -08:00
parent f0ce8b8fd4
commit 95a380ae9e

View file

@ -5,7 +5,7 @@ Using the Synchronization Client
The ownCloud Client remains in the background and is visible as an icon in the
system tray (Windows, KDE), status bar (MAC OS X), or notification area
(Ubuntu).
(Linux).
.. image:: images/icon.png
@ -42,7 +42,7 @@ incorrect login or server URL.
Using the Desktop Client Menu
-----------------------------
A right click on the icon (left click on Ubuntu and Mac OS X) provides the
A left-click on the icon (right-click on Windows) opens the
following menu:
.. image:: images/menu.png
@ -59,13 +59,12 @@ The Desktop Client menu provides the following options:
server.
* Operation indicator: Displays the status of the current synchronization
process or indicates ``Up to date`` if the server and client are in sync.
* **Recent Changes**: Displays the last six files modified by the
synchronization operations and provides access to the current
synchronization status listing all changes since the last restart of the
* **Recent Changes**: Displays the last six files modified, and shows the
current synchronization status listing all changes since the last restart of the
ownCloud client.
* ``Settings...``: Provides access to the settings menu.
* ``Settings...``: The settings menu.
* ``Help``: Opens a browser to display ownCloud Desktop Client Guide.
* ``Sign out``: Disables the client from continued synchronizations.
* ``Sign out``: Stops synchronization.
* ``Quit ownCloud``: Quits the ownCloud Client, ending any currently running
synchronizations.
@ -75,8 +74,8 @@ Using the Account Settings Window
.. index:: account settings, user, password, Server URL
The ``Account`` window provides a summary for general settings associated with
the ownCloud account. This window enalbes you to manage any synchronized
folders in the account and enables you to modify them.
the ownCloud account. This window enables you to manage any synchronized
folders in the account, and to modify which folders you want to sync.
To access and modify the account settings:
@ -85,28 +84,25 @@ To access and modify the account settings:
The fields and options in this window include:
* ``Connected to <ownCloud instance> as <user>`` field: Indicates the ownCloud
server to which the client is synchronizing and the user account on that
* ``Connected to <ownCloud instance> as <user>`` field: Your user account on an ownCloud
server.
* ``Add Folder...`` button: Provides the ability to add another folder to the
* ``Add Folder...`` button: Add another folder to the
synchronization process (see ``Adding a Folder``).
* ``Pause/Resume`` button: Pauses the current sync (or prevents the client from
starting a new sync) or resumes the sync process.
starting a new sync), or resumes the sync process.
* ``Remove`` button: Removes the selected folder from the sync process. This
button is used when you want to synchronize only a few folders and not the
root folder. If only the root folder is available, you must first remove the
root from the synchronization and then add individual folders that you want
to synchronize as desired.
root folder.
* ``Storage Usage`` field: Indicates the storage utilization on the ownCloud
server.
* ``Edit Ignored Files`` button: Launches the Ignored Files Editor.
* ``Modify Account`` button: Enables you to change the ownCloud server to which
* ``Modify Account`` button: Use this to change the ownCloud server to which
you are synchronizing. This option launches the ``Setting up an Account``
dialog (see :doc:`accountsetup`).
@ -133,9 +129,9 @@ To add a new folder:
cannot add a folder that is already contained within another synchronized
folder. In addition, you cannot add a higher level (parent) folder that
contains a folder to which you are already synchronizing. By default, the
ownCloud Set Up Wizard syncrhonizes your entire ownCloud account to the root
folder of the ownCloud server. Due to this default setup, you must first
remove the top-level folder prior to specifying new synchronizations.
ownCloud Set Up Wizard synchronizes your entire ownCloud account to the root
folder of the ownCloud server. If you wish to sync certain specific folders and not
the entire root, you must first remove the root folder.
3. Click 'Next' to continue.
@ -147,7 +143,7 @@ To add a new folder:
4. Select a folder on the ownCloud server to which you want to synchronize your
newly added folder.
..note:: A server folder can only be synchronized with a particular client
.. note:: A server folder can only be synchronized with a particular client
once. If you attempt to sync the root directory, you cannot sync with
other folders on the server. Similarly, if you sync with folder ``/a``, you
cannot create another sync with ``/a/b``, since ``b`` is already being
@ -156,15 +152,15 @@ newly added folder.
Editing Ignored Files
^^^^^^^^^^^^^^^^^^^^^
The :guilabel:`Ignored Files Editor` provides a list of preconfigured files
that are ignored (that is, not synchronized) by the client and server during
synchronizations. The Ignored Files Editor enables you to add patterns for
files or directories that you want to exclude from the synchronization process.
In addition to using standard characters, the Ignored Files Editor enables you
to use wild cards (for example, using an asterisk * to indicate multiple
characters or a question mark ? to incidate a single character).
The :guilabel:`Ignored Files Editor` provides a list of preconfigured files that are
ignored (that is, not synchronized) by the client and server during synchronizations. You
may add additional files or directories that you want to exclude from the synchronization
process. In addition to using standard characters, the Ignored Files Editor enables you
to
use wild cards (for example, using an asterisk * to indicate multiple characters or a
question mark ? to incidate a single character).
For additional information about this editor, see `Using the Ignored Files
For additional information see `Using the Ignored Files
Editor`_
Using the Activity Settings Window
@ -172,11 +168,11 @@ Using the Activity Settings Window
.. index:: activity, recent changes, sync activity
The Activity window provides an in-depth account of recent synchronization
activity. It shows files that have not been synchronized because they are on
the ignored files list or because they cannot be synced in a cross-platform
manner due to containing special characters that cannot be stored on certain
file systems.
The Activity window provides an in-depth account of recent synchronization activity. It
shows files that have not been synchronized because they are on the ignored files list,
or
because they cannot be synced due to containing special characters that cannot be stored
on certain file systems.
.. image:: images/settings_activity.png
@ -193,21 +189,18 @@ Using the General Settings Window
.. index:: general settings, auto start, startup, desktop notifications
The General settings window enables you to set general settings for the
ownCloud Desktop Client and provides information about the software version,
its creator, and the existance of any updates.
ownCloud Desktop Client, provides information about the software version,
its creator, and the existence of any updates.
.. image:: images/settings_general.png
The settings and information contained in this window are as follows:
* ``Launch on System Startup`` checkbox: Provides the option to check (enable)
or uncheck (disable) whether the ownCloud Desktop Client launches upon system
startup. By default, this option is enabled (checked)once you have configured
or uncheck (disable) whether the ownCloud Desktop Client launches at system
startup. By default, this option is enabled (checked) after you have configured
your account.
* ``Show Desktop Nofications`` checkbox: Provides the option to check (enable)
or uncheck (disable) bubble notifications alerting you as to when a set of
synchronization operations is performed.
or uncheck (disable) notifications about sync activity.
* ``Use Monochrome Icons`` checkbox: Provides the option to check (enable) or
uncheck (disable) the use of monochrome (visually less obtrusive) icons.
@ -220,33 +213,25 @@ The settings and information contained in this window are as follows:
.. note:: Information in this field can be valuable when submitting a support
request.
* ``Updates`` field: Provides information about any available updates for the
ownCloud Desktop Client.
* ``Updates`` field: Notifies you of any available updates for the ownCloud Desktop
Client.
Using the Network Settings Window
---------------------------------
.. index:: proxy settings, SOCKS, bandwith, throttling, limiting
The Network settings window enables you to define network proxy settings as
well as limit the download and upload bandwidth utilization of file
synchronizations.
The Network settings window enables you to define network proxy settings, and also to
limit download and upload bandwidth.
.. image:: images/settings_network.png
Specifying Proxy Settings
^^^^^^^^^^^^^^^^^^^^^^^^^
A proxy server is a server (for example, a computer system or an application)
that functions as an intermediary contact for requests from clients that are
seeking resources from other servers. For the ownCloud Desktop Client, you can
define the following proxy settings:
* ``No Proxy`` option: Specifies that the ownCloud Client circumvent the default
proxy configured on the system.
* ``No Proxy`` option: Do not use a proxy.
* ``Use system proxy`` option: Default setting. Follows the systems proxy
settings. On Linux systems, this setting uses the value of the variable
``http_proxy``.
settings.
* ``Specify proxy manually as`` option: Enables you to specify
the following custom proxy settings:
- ``HTTP(S)``: Used when you are required to use an HTTP(S) proxy server (for
@ -267,16 +252,8 @@ define the following proxy settings:
Bandwidth Limiting
^^^^^^^^^^^^^^^^^^
Synchronization of files between a client and server can utilized a lot of
bandwidth. Bandwidth limiting can assist in shaping the total download or
upload bandwidth (or both) of your client/server connection to a more
manageable level. By limiting your bandwidth usage, you can maintain free
bandwidth for other applications to use.
The ownCloud Desktop Client enables you to limit (throttle) the bandwidth usage
for both file downloads and file uploads. The Download Bandwidth field (for
data flowing from the ownCloud server to the client) provides the following
options:
Synchronization of files between a client and server can use a lot of
bandwidth, so you can limit how much your ownCloud sync client uses.
- ``No limit`` option: The default setting for the client; specifies that there
are no limit settings on the amount of data downloaded from the server.
@ -308,15 +285,12 @@ Using the Ignored Files Editor
You might have some files or directories that you do not want to backup and
store on the server. To identify and exclude these files or directories, you
can use the *Ignored Files Editor* that is embedded in the ownCloud Desktop
Client.
can use the *Ignored Files Editor*.
.. image:: images/ignored_files_editor.png
The ``Ignored Files Editor`` enables you to define customized patterns
that the ownCloud Client uses to identify files and directories that you want
to exclude from the synchronization process. For your convenience, the editor is
pre-populated with a default list of typically ignore patterns. These patterns
For your convenience, the editor is
pre-populated with a default list of typical ignore patterns. These patterns
are contained in a system file (typically ``sync-exclude.lst``) located in the
ownCloud Client application directory. You cannot modify these pre-populated
patterns directly from the editor. However, if necessary, you can hover over
@ -329,14 +303,15 @@ pattern, locate the file, and edit the ``sync-exclude.lst`` file.
Each line in the editor contains an ignore pattern string. When creating custom
patterns, in addition to being able to use normal characters to define an
ignore pattern, you can use wildcards characters for matching values. As an
example, you can use an asterisk (``*``) to idenfify an arbitrary number of
example, you can use an asterisk (``*``) to identify an arbitrary number of
characters or a question mark (``?``) to identify a single character.
Patterns that end with a slash character (``/``) are applied to only directory
components of the path being checked.
.. note:: Custom entries are currently not validated for syntactical
correctness by the editor, but might fail to load correctly.
correctness by the editor, so you will not see any warnings for bad
syntax. If your synchronization does not work as you expected, check your syntax.
Each pattern string in the list is preceded by a checkbox. When the check box
contains a check mark, in addition to ignoring the file or directory component
@ -349,9 +324,8 @@ this list:
- The ownCloud Client always excludes files containing characters that cannot
be synchronized to other file systems.
- As of ownCloud Desktop Client version 1.5.0, files are removed that cause
individual errors three times during a synchronization. However, the client
provides the option of retrying a synchronization three additional times on
files that produce errors.
- Files are removed that cause individual errors three times during a synchronization.
However, the client provides the option of retrying a synchronization three additional
times on files that produce errors.
For more detailed information see :ref:`ignored-files-label`.