[gnome-user-docs] sharing-settings added, sharing-desktop updated
- From: Michael Hill <mdhill src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-user-docs] sharing-settings added, sharing-desktop updated
- Date: Fri, 10 May 2013 19:13:29 +0000 (UTC)
commit bf10022f4c6c6fb18d8c46c2e63f6b76138956e1
Author: Michael Hill <mdhillca gmail com>
Date: Fri May 10 15:09:59 2013 -0400
sharing-settings added, sharing-desktop updated
gnome-help/C/accounts.page | 6 +++-
gnome-help/C/privacy.page | 2 +-
gnome-help/C/settings-sharing.page | 27 +++++++++++++++
gnome-help/C/sharing-desktop.page | 64 ++++++++++++++++++++++++++----------
gnome-help/C/wacom.page | 6 +++-
gnome-help/Makefile.am | 1 +
6 files changed, 85 insertions(+), 21 deletions(-)
---
diff --git a/gnome-help/C/accounts.page b/gnome-help/C/accounts.page
index 139e794..f19d876 100644
--- a/gnome-help/C/accounts.page
+++ b/gnome-help/C/accounts.page
@@ -3,7 +3,11 @@
id="accounts">
<info>
- <desc>Access online services like Facebook and Google.</desc>
+ <desc>
+ <link xref="accounts-create">Create a new account</link>,
+ <link xref="accounts-add">Add an existing account</link>,
+ <link xref="accounts-remove">Remove an account</link>…
+ </desc>
<link type="guide" xref="prefs"/>
diff --git a/gnome-help/C/privacy.page b/gnome-help/C/privacy.page
index 5f49fd6..59bf6f8 100644
--- a/gnome-help/C/privacy.page
+++ b/gnome-help/C/privacy.page
@@ -9,7 +9,7 @@
<link xref="privacy-screen-lock">Screen lock</link>,
<link xref="privacy-name-visibility">Name & visibility</link>,
<link xref="privacy-history-recent-off">Usage history</link>,
- <link xref="privacy-purge">Purge trash & temporary files</link> . . .
+ <link xref="privacy-purge">Purge trash & temporary files</link>…
</desc>
<credit type="author">
<name>Jim Campbell</name>
diff --git a/gnome-help/C/settings-sharing.page b/gnome-help/C/settings-sharing.page
new file mode 100644
index 0000000..c698b87
--- /dev/null
+++ b/gnome-help/C/settings-sharing.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="guide" style="task 2column"
+ id="settings-sharing">
+
+<info>
+ <link type="guide" xref="prefs"/>
+ <revision pkgversion="3.8.2" version="0.1" date="2013-05-08" status="draft"/>
+ <desc>
+<!-- <link xref="sharing-bluetooth">Bluetooth sharing</link>, -->
+ <link xref="sharing-desktop">Screen sharing</link>
+<!-- <link xref="sharing-media">Media sharing</link>… -->
+ </desc>
+ <credit type="author">
+ <name>Michael Hill</name>
+ <email>mdhillca gmail com</email>
+ <years>2013</years>
+ </credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+</info>
+
+ <title>Sharing Settings</title>
+
+ <p>The <em>Sharing Settings</em> in GNOME help you control what is shared
+ over the local network, or through other technologies such as
+ <em>Bluetooth</em>.</p>
+
+</page>
diff --git a/gnome-help/C/sharing-desktop.page b/gnome-help/C/sharing-desktop.page
index ce6b506..a4c16c1 100644
--- a/gnome-help/C/sharing-desktop.page
+++ b/gnome-help/C/sharing-desktop.page
@@ -3,8 +3,9 @@
id="sharing-desktop">
<info>
<link type="guide" xref="sharing"/>
+ <link type="guide" xref="settings-sharing"/>
- <revision pkgversion="3.6.0" version="0.2" date="2012-10-14" status="review"/>
+ <revision pkgversion="3.8.2" version="0.3" date="2013-05-09" status="review"/>
<credit type="author">
<name>Ekaterina Gerasimova</name>
@@ -22,26 +23,50 @@
<title>Share your desktop</title>
<p>You can let other people view and control your desktop from another computer
- with a desktop viewing application. Configure <app>Desktop Sharing</app> to
+ with a desktop viewing application. Configure <gui>Screen Sharing</gui> to
allow others to access your desktop and set the security preferences.</p>
+ <note style="info package">
+ <p>You must have the <sys>Vino</sys> package installed for
+ <gui>Screen Sharing</gui> to be visible.</p>
+
+ <if:choose xmlns:if="http://projectmallard.org/if/1.0/">
+ <if:when test="action:install">
+ <p><link action="install:vino" style="button">Install Vino</link></p>
+ </if:when>
+ </if:choose>
+ </note>
+
<steps>
<item>
- <p>In the <gui>Activities overview</gui>, click the grid button in the
- dash and open <app>Desktop Sharing</app>.</p>
+ <p>Click your name on the top bar and select <gui>Settings</gui>.</p>
+ </item>
+ <item>
+ <p>Open <gui>Sharing</gui>.</p>
+ </item>
+ <item>
+ <p>If <gui>Sharing</gui> is <gui>OFF</gui>, switch it to
+ <gui>ON</gui>.</p>
</item>
<item>
- <p>To let others view your desktop, select
- <gui>Allow other users to view your desktop</gui>. This means that other
- people will be able to attempt to connect to your computer and view what's
- on your screen.</p>
+ <p>Select <gui>Screen Sharing</gui>.</p>
</item>
<item>
- <p>To let others interact with your desktop, select
- <gui>Allow other users to control your desktop</gui>. This may allow the
- other person to move your mouse, run applications, and browse files
- on your computer, depending on the security settings which you are currently
- using.</p>
+ <p>To let others view your desktop, switch <gui>Remote View</gui> to
+ <gui>ON</gui>. This means that other people will be able to attempt to
+ connect to your computer and view what's on your screen.</p>
+ </item>
+ <item>
+ <p>To let others interact with your desktop, switch
+ <gui>Remote Control</gui> to <gui>ON</gui>. This may allow the other
+ person to move your mouse, run applications, and browse files on your
+ computer, depending on the security settings which you are currently
+ using.</p>
+ <note style="tip">
+ <p>This option is enabled by default when <gui>Remote View</gui> is
+ <gui>ON</gui>.</p>
+ </note>
+
</item>
</steps>
@@ -52,9 +77,9 @@
option means before changing it.</p>
<terms>
<item>
- <title>Confirm access to your machine</title>
+ <title>Approve All Connections</title>
<p>If you want to be able to choose whether to allow someone to access
- your desktop, select <gui>You must confirm each access to this machine</gui>.
+ your desktop, switch <gui>Approve All Connections</gui> to <gui>ON</gui>.
If you disable this option, you will not be asked whether you want to allow
someone to connect to your computer.</p>
<note style="tip">
@@ -62,16 +87,16 @@
</note>
</item>
<item>
- <title>Enable password</title>
+ <title>Require Password</title>
<p>To require other people to use a password when connecting to your
- desktop, select <gui>Require the user to enter this password</gui>. If you do
+ desktop, switch <gui>Require Password</gui> to <gui>ON</gui>. If you do
not use this option, anyone can attempt to view your desktop.</p>
<note style="tip">
<p>This option is disabled by default, but you should enable it and set
a secure password.</p>
</note>
</item>
- <item>
+<!-- <item>
<title>Allow access to your desktop over the Internet</title>
<p>If your router supports UPnP Internet Gateway Device Protocol and it is
enabled, you can allow other people who are not on your local network to view
@@ -82,9 +107,11 @@
<p>This option is disabled by default.</p>
</note>
</item>
+-->
</terms>
</section>
+<!--
<section id="notification-icon">
<title>Show notification area icon</title>
<p>To be able to disconnect someone who is viewing your desktop, you need to
@@ -95,5 +122,6 @@
your desktop without your knowledge, depending on the security settings.</p>
</note>
</section>
+-->
</page>
diff --git a/gnome-help/C/wacom.page b/gnome-help/C/wacom.page
index 0fcd721..33b583d 100644
--- a/gnome-help/C/wacom.page
+++ b/gnome-help/C/wacom.page
@@ -3,7 +3,11 @@
id="wacom">
<info>
- <desc>Adjust the settings of your Wacom tablet.</desc>
+ <desc>
+ <link xref="wacom-multi-monitor">Map a monitor</link>,
+ <link xref="wacom-stylus">Configure the stylus</link>,
+ <link xref="wacom-left-handed">Use the tablet left handed</link>…
+ </desc>
<link type="guide" xref="prefs"/>
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index 3547bdd..c7d5880 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -342,6 +342,7 @@ HELP_FILES = \
session-formats.page \
session-language.page \
session-screenlocks.page \
+ settings-sharing.page \
sharing.page \
sharing-desktop.page \
shell-apps-favorites.page \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]