[Pkg-owncloud-commits] [owncloud-client] 468/484: more updates to 2.1 user manual
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Dec 16 00:38:23 UTC 2015
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 1a564b1672241da6a48d19af2c98f264a35b4bdf
Author: Carla Schroder <carla at owncloud.com>
Date: Wed Dec 2 11:52:42 2015 -0800
more updates to 2.1 user manual
---
doc/advancedusage.rst | 8 ++---
doc/autoupdate.rst | 19 +++++-----
doc/images/client-8.png | Bin 0 -> 83622 bytes
doc/images/client-9.png | Bin 0 -> 53065 bytes
doc/navigating.rst | 93 ++++++++++++++++++++++++------------------------
5 files changed, 61 insertions(+), 59 deletions(-)
diff --git a/doc/advancedusage.rst b/doc/advancedusage.rst
index df40707..a98e362 100644
--- a/doc/advancedusage.rst
+++ b/doc/advancedusage.rst
@@ -9,12 +9,12 @@ Options
.. index:: command line switches, command line, options, parameters
.. include:: options.rst
-Config File
------------
+Configuration File
+------------------
.. index:: config file
.. include:: conffile.rst
-ownCloud Commandline Client
----------------------------
+ownCloud Command Line Client
+----------------------------
.. index:: owncloudcmd
.. include:: owncloudcmd.rst
diff --git a/doc/autoupdate.rst b/doc/autoupdate.rst
index 1623af8..1ed6a13 100644
--- a/doc/autoupdate.rst
+++ b/doc/autoupdate.rst
@@ -31,9 +31,6 @@ If an update is available, and has been successfully downloaded, the ownCloud
client starts a silent update prior to its next launch and then restarts
itself. Should the silent update fail, the client offers a manual download.
-When you upgrade from 1.7 you should restart Windows to ensure that all the new
-features in 1.8 are enabled.
-
.. note:: Administrative privileges are required to perform the update.
Mac OS X
@@ -65,9 +62,15 @@ auto-update mechanism for different operating systems.
Preventing Automatic Updates in Windows Environments
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-You can prevent automatic updates from occuring in Windows environments using
-one of two methods. The first method allows users to override the automatic
-update check mechanism whereas the second method prevents any manual overrides.
+Users may disable automatic updates by adding this line to the [General]
+section of their ``owncloud.cfg`` files::
+
+ skipUpdateCheck=true
+
+Windows administrators have more options for preventing automatic updates in
+Windows environments by using one of two methods. The first method allows users
+to override the automatic update check mechanism, whereas the second method
+prevents any manual overrides.
To prevent automatic updates, but allow manual overrides:
@@ -125,8 +128,8 @@ Preventing Automatic Updates in Linux Environments
Because the Linux client does not provide automatic updating functionality, there is no
need to remove the automatic-update check. However, if you want to disable it edit your desktop
-client configuration file, ``$HOME/.local/share/data/ownCloud/owncloud.cfg``. Add these lines:
+client configuration file, ``$HOME/.local/share/data/ownCloud/owncloud.cfg``.
+Add these lines::
[General]
skipUpdateCheck=true
-
diff --git a/doc/images/client-8.png b/doc/images/client-8.png
new file mode 100644
index 0000000..efde10e
Binary files /dev/null and b/doc/images/client-8.png differ
diff --git a/doc/images/client-9.png b/doc/images/client-9.png
new file mode 100644
index 0000000..050d598
Binary files /dev/null and b/doc/images/client-9.png differ
diff --git a/doc/navigating.rst b/doc/navigating.rst
index 34d0c8a..5db1f1b 100644
--- a/doc/navigating.rst
+++ b/doc/navigating.rst
@@ -46,36 +46,35 @@ so you should click it to see what it has to tell you.
The red circle with the white "x" indicates a configuration error, such as an
incorrect login or server URL.
-Using the Right-Click Menu
---------------------------
+Systray Icon
+------------
-A right-click on the icon opens a menu for quick access to multiple operations.
+A right-click on the systray icon opens a menu for quick access to multiple
+operations.
.. image:: images/menu.png
:alt: the right-click sync client menu
-The Desktop Client menu provides the following options:
+This menu provides the following options:
* Quick access to your accounts
* Recent Changes, showing latest activities
* Status of your client version (whether it is up to date)
* Help menu
-* An option to log out of all of your accounts at once
+* An option to log in or log out of all of your accounts at once
* Quit ownCloud
-Using the Account Settings Window
----------------------------------
-
-.. index:: account settings, user, password, Server URL
-
-Click **Settings** in the right-click menu to see a summary of your ownCloud
-account settings, or left-click your systray icon. This shows which ownCloud
-account you are connected to, (or accounts, if you have more than one) your
-quota status, and a window for managing your synchronization settings.
+A left-click on your systray icon opens the desktop client to the account
+settings window.
.. image:: images/client6.png
:alt: Account settings window
+Configuring ownCloud Account Settings
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. index:: account settings, user, password, Server URL
+
At the top of the window are tabs for each configured sync account, and three
others for Activity, General and Network settings. On your account tabs you
have the following features:
@@ -83,7 +82,7 @@ have the following features:
* Connection status, showing which ownCloud server you are connected to, and
your ownCloud username.
* An **Account** button, which contains a dropdown menu with **Add New**,
- **Sign Out**, and **Remove**.
+ **Sign In/Sign Out**, and **Remove**.
* Used and available space on the server.
* Current synchronization status.
* **Add Folder Sync Connection** button, which is active only when you have
@@ -100,23 +99,35 @@ the sync status bar offers four additional options:
**Open Folder** opens a file explorer window displaying the client-side folder
that is being synced.
-**Choose What to Sync** opens the folder sync tree view. From there you can
-choose to sync all or only some of the folders in the folder tree.
+**Choose What to Sync** opens the folder sync tree view. Use this to sync all
+or only some of the folders in the folder tree.
-**Pause Sync** pauses sync operations for just this folder sync connection
-without making any changes to your account.
-**Resume Sync** resumes sync operations for this folder sync connection.
+**Pause Sync** pauses sync operations without making any changes to your
+account. It will continue to update file and folder lists, without
+downloading or updating files. To stop all sync activity use **Remove Sync**.
-**Remove Sync** removes this folder sync connection without removing the
-account. If you want to synchronize the folder tree again then click the
-**Add Folder Sync Connection** button, and re-select the folder tree that
-you want to sync.
+**Resume Sync** resumes sync operations.
+
+**Remove Sync** removes the sync connection without removing the account. This
+stops all sync activity, including file and folder list updates. If you want to
+synchronize the folder tree again then click the **Add Folder Sync Connection**
+button, and re-select the folder tree that you want to sync.
.. image:: images/client-7.png
:alt: Extra options for sync operations
+
+Activity Window
+---------------
The Activity window contains the log of your recent activities, including files
-downloaded and deleted, and which local folders your files went into.
+downloaded and deleted, which local folders your files went into, and files not
+synced.
+
+.. image:: images/client-8.png
+ :alt: Activity windows logs all server and client activities.
+
+General Window
+--------------
The General window has configuration options such as **Launch on System
Startup**, **Use Monochrome Icons**, and **Show Desktop Notifications**. This
@@ -124,29 +135,17 @@ is where you will find the **Edit Ignored Files** button, to launch the ignored
files editor, and **Ask confirmation before downloading
folders larger than [folder size]**.
-Multi-Account Support
----------------------
-
-You may now configure multiple ownCloud accounts in your desktop sync client.
-Simply click the **Account** > **Add New** button, and then follow the account
-creation wizard. The new account will appear as a new tab in the settings
-dialog, where you can adjust its settings at any time.
-
-Editing Ignored Files
----------------------
+.. image:: images/client-9.png
+ :alt: General window contains configuration options.
-The Ignored Files Editor can be opened by clicking on the button in the General
-tab of the settings dialog. The settings apply to all configured accounts. The
-:guilabel:`Ignored Files Editor` provides a list of 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 indicate a single
-character).
+Adding New Accounts
+^^^^^^^^^^^^^^^^^^^
-For additional information see `Using the Ignored Files
-Editor`_
+You may configure multiple ownCloud accounts in your desktop sync client. Simply
+click the **Account** > **Add New** button to add new account, and then follow
+the account creation wizard. The new account will appear as a new tab in the
+settings dialog, where you can adjust its settings at any time. Use **Account**
+> **Remove** to delete accounts.
Using the Network Window
------------------------
@@ -168,7 +167,7 @@ Using the Ignored Files Editor
You might have some local 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*.
+can use the *Ignored Files Editor* (General tab.)
.. image:: images/ignored_files_editor.png
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list