Git commit 58aa5b95c7024a775d847faca9232f0f4c65bf7c by Yuri Chornoivan. Committed on 17/11/2013 at 14:34. Pushed by yurchor into branch 'master'.
Add new synchronization page description, update screenshots M +- -- doc/configure-cacheproxy.png M +- -- doc/configure-dateandtime.png M +- -- doc/configure-navigation.png M +- -- doc/configure-plugins.png M +- -- doc/configure-routing.png A +- -- doc/configure-synchronization.png M +- -- doc/configure-view.png M +44 -2 doc/index.docbook http://commits.kde.org/marble/58aa5b95c7024a775d847faca9232f0f4c65bf7c diff --git a/doc/configure-cacheproxy.png b/doc/configure-cacheproxy.png index cccc368..4b27f56 100644 Binary files a/doc/configure-cacheproxy.png and b/doc/configure-cacheproxy.png differ diff --git a/doc/configure-dateandtime.png b/doc/configure-dateandtime.png index d959f1c..3e4bcb1 100644 Binary files a/doc/configure-dateandtime.png and b/doc/configure-dateandtime.png differ diff --git a/doc/configure-navigation.png b/doc/configure-navigation.png index e4addbd..e839d50 100644 Binary files a/doc/configure-navigation.png and b/doc/configure-navigation.png differ diff --git a/doc/configure-plugins.png b/doc/configure-plugins.png index 397e08e..9294860 100644 Binary files a/doc/configure-plugins.png and b/doc/configure-plugins.png differ diff --git a/doc/configure-routing.png b/doc/configure-routing.png index 1e34a77..2ae353d 100644 Binary files a/doc/configure-routing.png and b/doc/configure-routing.png differ diff --git a/doc/configure-synchronization.png b/doc/configure-synchronization.png new file mode 100644 index 0000000..a9aef99 Binary files /dev/null and b/doc/configure-synchronization.png differ diff --git a/doc/configure-view.png b/doc/configure-view.png index 909e61f..52847fe 100644 Binary files a/doc/configure-view.png and b/doc/configure-view.png differ diff --git a/doc/index.docbook b/doc/index.docbook index c461629..a454836 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -44,8 +44,8 @@ <legalnotice>&FDLNotice;</legalnotice> - <date>2013-06-23</date> - <releaseinfo>1.6</releaseinfo> + <date>2013-11-17</date> + <releaseinfo>1.7</releaseinfo> <abstract> <para>&marble; is a geographical atlas and a virtual globe @@ -968,6 +968,48 @@ the system's graphics drivers. </para> </variablelist> </sect1> +<sect1 id="configsynchronization"> +<title>Synchronization Configuration</title> +<para>Marble can upload route and bookmark data to <ulink + url="https://en.wikipedia.org/wiki/OwnCloud";>ownCloud</ulink> server and +synchronize them between &marble; instances installed on different devices. +</para> +<screenshot> +<screeninfo>The Synchronization configuration dialog</screeninfo> +<mediaobject> +<imageobject> +<imagedata fileref="configure-synchronization.png" format="PNG" /> +</imageobject> +<textobject> +<phrase>The Synchronization configuration dialog</phrase> +</textobject> +</mediaobject> +</screenshot> + +<variablelist> +<varlistentry> +<term><guilabel>Enable synchronization</guilabel></term> +<listitem> + <para>The synchronization can be enabled or disabled using this item. +When the synchronization is enabled you can choose whether to synchronize +route and bookmark data using the corresponding checkboxes or click on +<guibutton>Sync now</guibutton> to initiate synchronization +immediately.</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><guilabel>Credentials</guilabel></term> +<listitem> +<para>Here, you can enter your ownClowd credentials. More information on +ownClowd configuration can be found on the <ulink +url="https://owncloud.com/";>ownClowd official website</ulink>.</para> +</listitem> +</varlistentry> + +</variablelist> +</sect1> + <sect1 id="configrouting"> <title>Routing Configuration</title> <screenshot>
