[gnome-user-docs] g-h: Reorg under prefs/settings, some under hardware
- From: Shaun McCance <shaunm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-user-docs] g-h: Reorg under prefs/settings, some under hardware
- Date: Sun, 3 Apr 2011 21:31:59 +0000 (UTC)
commit f69c02694799cf0c7f12d2d8eb504f3e53afa2f7
Author: Shaun McCance <shaunm gnome org>
Date: Sun Apr 3 17:36:46 2011 -0400
g-h: Reorg under prefs/settings, some under hardware
gnome-help/C/app-banshee.page.stub | 2 +-
gnome-help/C/app-rhythmbox.page.stub | 2 +-
gnome-help/C/clock-calendar.page | 3 +-
gnome-help/C/clock-set.page | 2 +-
gnome-help/C/clock-timezone.page | 2 +-
gnome-help/C/clock.page | 24 +++++++++++
gnome-help/C/hardware-driver.page | 2 +-
gnome-help/C/hardware.page | 23 ++++++----
gnome-help/C/keyboard-cursor-blink.page | 2 +-
gnome-help/C/keyboard-layouts.page | 4 +-
gnome-help/C/keyboard-repeat-keys.page | 2 +-
gnome-help/C/keyboard.page | 19 ++++++++
gnome-help/C/look-background.page | 2 +-
gnome-help/C/look-dimscreen.page | 2 +-
gnome-help/C/look-resolution.page | 2 +-
gnome-help/C/media.page | 11 ++++-
gnome-help/C/mouse-disabletouchpad.page | 3 +-
gnome-help/C/mouse-drag-threshold.page | 3 +-
gnome-help/C/mouse-lefthanded.page | 3 +-
gnome-help/C/mouse-mousekeys.page | 2 +-
gnome-help/C/mouse-problem-doubleclick.page | 3 +-
gnome-help/C/mouse-problem-notmoving.page | 1 -
gnome-help/C/mouse-problems.page | 2 +-
gnome-help/C/mouse-sensitivity.page | 3 +-
gnome-help/C/mouse-sound.page | 3 +-
gnome-help/C/mouse-touchpad-scroll.page | 18 ++++++++
gnome-help/C/mouse-wakeup.page | 1 -
gnome-help/C/{mouse-prefs.page => mouse.page} | 12 +++--
gnome-help/C/power-turnoffbutton.page | 2 +-
gnome-help/C/prefs-display.page | 23 ++++++++++
gnome-help/C/prefs-language.page | 23 ++++++++++
gnome-help/C/prefs.page | 56 ++++---------------------
gnome-help/C/session-language.page | 2 +-
gnome-help/C/session-screenlocks.page | 2 +-
gnome-help/C/user-accounts.page | 10 +++-
gnome-help/C/user-privileges.page | 2 +-
gnome-help/Makefile.am | 7 +++-
37 files changed, 184 insertions(+), 101 deletions(-)
---
diff --git a/gnome-help/C/app-banshee.page.stub b/gnome-help/C/app-banshee.page.stub
index 25098f5..37235e8 100644
--- a/gnome-help/C/app-banshee.page.stub
+++ b/gnome-help/C/app-banshee.page.stub
@@ -2,7 +2,7 @@
type="topic"
id="app-banshee">
<info>
- <link type="guide" xref="media#sound" />
+ <link type="guide" xref="media#music" />
<revision pkgversion="3.0" date="2011-03-22" status="stub"/>
diff --git a/gnome-help/C/app-rhythmbox.page.stub b/gnome-help/C/app-rhythmbox.page.stub
index 1798fde..6f05db1 100644
--- a/gnome-help/C/app-rhythmbox.page.stub
+++ b/gnome-help/C/app-rhythmbox.page.stub
@@ -2,7 +2,7 @@
type="topic"
id="app-rhythmbox">
<info>
- <link type="guide" xref="media#sound" />
+ <link type="guide" xref="media#music" />
<revision pkgversion="3.0" date="2011-03-22" status="stub"/>
diff --git a/gnome-help/C/clock-calendar.page b/gnome-help/C/clock-calendar.page
index 6341055..cea3a55 100644
--- a/gnome-help/C/clock-calendar.page
+++ b/gnome-help/C/clock-calendar.page
@@ -3,7 +3,8 @@
id="clock-calendar">
<info>
- <link type="guide" xref="prefs#clock"/>
+ <link type="guide" xref="clock"/>
+ <link type="guide" xref="shell-overview#desktop"/>
<desc>Display your appointments on the calendar at the top of the screen.</desc>
diff --git a/gnome-help/C/clock-set.page b/gnome-help/C/clock-set.page
index b33ae93..6f988dc 100644
--- a/gnome-help/C/clock-set.page
+++ b/gnome-help/C/clock-set.page
@@ -3,7 +3,7 @@
id="clock-set">
<info>
- <link type="guide" xref="index#clock"/>
+ <link type="guide" xref="clock"/>
<desc>Update the time/date displayed at the top of the screen.</desc>
<revision pkgversion="3.0" date="2011-04-03" status="final"/>
<credit type="author">
diff --git a/gnome-help/C/clock-timezone.page b/gnome-help/C/clock-timezone.page
index e953f24..48cde2c 100644
--- a/gnome-help/C/clock-timezone.page
+++ b/gnome-help/C/clock-timezone.page
@@ -3,7 +3,7 @@
id="clock-timezone">
<info>
- <link type="guide" xref="prefs#clock"/>
+ <link type="guide" xref="clock"/>
<desc>Add other timezones so you can see what time it is in other cities.</desc>
<revision pkgversion="3.0" date="2011-04-03" status="final"/>
<credit type="author">
diff --git a/gnome-help/C/clock.page b/gnome-help/C/clock.page
new file mode 100644
index 0000000..89b12ce
--- /dev/null
+++ b/gnome-help/C/clock.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="guide"
+ id="clock">
+ <info>
+ <revision pkgversion="3.0" date="2011-04-03" status="stub"/>
+
+ <link type="guide" xref="prefs"/>
+
+ <desc>
+ <link xref="clock-set">Set date and time</link>,
+ <link xref="clock-timezone">timezone</link>,
+ <link xref="clock-calendar">calendar and appointments</link>...
+ </desc>
+
+ <credit type="author">
+ <name>Shaun McCance</name>
+ <email>shaunm gnome org</email>
+ </credit>
+
+ </info>
+
+<title>Date & time</title>
+
+</page>
diff --git a/gnome-help/C/hardware-driver.page b/gnome-help/C/hardware-driver.page
index 3037584..6634738 100644
--- a/gnome-help/C/hardware-driver.page
+++ b/gnome-help/C/hardware-driver.page
@@ -3,7 +3,7 @@
id="hardware-driver">
<info>
- <link type="guide" xref="hardware"/>
+ <link type="guide" xref="hardware" group="driver"/>
<desc>A hardware/device driver is something that allows your computer to use devices that are attached to it.</desc>
diff --git a/gnome-help/C/hardware.page b/gnome-help/C/hardware.page
index 37d72a1..c70fe9e 100644
--- a/gnome-help/C/hardware.page
+++ b/gnome-help/C/hardware.page
@@ -20,13 +20,20 @@
<link xref="hardware#graphics">graphics cards</link>,
<link xref="hardware#power">power settings</link>,
<link xref="hardware#bluetooth">Bluetooth</link>,
- <link xref="hardware#mouse">mouse</link>,
<link xref="hardware#disk">disk</link>
</desc>
</info>
<title>Hardware & drivers</title>
+<links type="topic" style="linklist" groups="driver">
+ <title>Drivers</title>
+</links>
+
+<links type="topic" style="linklist">
+ <title>Other topic groups</title>
+</links>
+
<section id="problems" style="2column">
<info>
<title type="link" role="trail">Troubleshooting</title>
@@ -49,21 +56,17 @@
-->
<section id="power" style="2column">
- <title>Power and batteries</title>
+ <info>
+ <title type="link" role="trail">Power</title>
+ <link type="guide" xref="prefs"/>
+ </info>
+ <title>Power and batteries</title>
</section>
<section id="bluetooth" style="2column">
<title>Bluetooth</title>
</section>
-<section id="keyboard" style="2column">
- <title>Keyboard</title>
-</section>
-
-<section id="mouse" style="2column">
- <title>Mouse</title>
-</section>
-
<section id="disk" style="2column">
<info><title type="text">Disks</title></info>
<title>Hard disks and other storage devices</title>
diff --git a/gnome-help/C/keyboard-cursor-blink.page b/gnome-help/C/keyboard-cursor-blink.page
index 36254df..49888dc 100644
--- a/gnome-help/C/keyboard-cursor-blink.page
+++ b/gnome-help/C/keyboard-cursor-blink.page
@@ -3,7 +3,7 @@
id="keyboard-cursor-blink">
<info>
<link type="guide" xref="a11y#vision" group="lowvision"/>
- <link type="guide" xref="prefs#keyboard"/>
+ <link type="guide" xref="keyboard"/>
<revision pkgversion="3.0" version="0.1" date="2011-03-20" status="review"/>
<desc>And adjust the blinking speed.</desc>
diff --git a/gnome-help/C/keyboard-layouts.page b/gnome-help/C/keyboard-layouts.page
index 7221e16..7d27fec 100644
--- a/gnome-help/C/keyboard-layouts.page
+++ b/gnome-help/C/keyboard-layouts.page
@@ -2,8 +2,8 @@
type="topic" style="task"
id="keyboard-layouts">
<info>
- <link type="guide" xref="hardware#keyboard"/>
- <link type="guide" xref="prefs#languages"/>
+ <link type="guide" xref="prefs-language"/>
+ <link type="guide" xref="keyboard"/>
<revision pkgversion="3.0" date="2011-03-20" status="candidate"/>
<credit type="author">
diff --git a/gnome-help/C/keyboard-repeat-keys.page b/gnome-help/C/keyboard-repeat-keys.page
index 3d4ae03..1fbf324 100644
--- a/gnome-help/C/keyboard-repeat-keys.page
+++ b/gnome-help/C/keyboard-repeat-keys.page
@@ -3,7 +3,7 @@
id="keyboard-repeat-keys">
<info>
<link type="guide" xref="a11y#mobility" group="keyboard"/>
- <link type="guide" xref="prefs#keyboard"/>
+ <link type="guide" xref="keyboard"/>
<revision pkgversion="3.0" version="0.1" date="2011-03-20" status="review"/>
<credit type="author copyright">
diff --git a/gnome-help/C/keyboard.page b/gnome-help/C/keyboard.page
new file mode 100644
index 0000000..a813e85
--- /dev/null
+++ b/gnome-help/C/keyboard.page
@@ -0,0 +1,19 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="guide"
+ id="keyboard">
+ <info>
+ <revision pkgversion="3.0" date="2011-04-03" status="stub"/>
+
+ <link type="guide" xref="prefs"/>
+ <link type="guide" xref="hardware"/>
+
+ <credit type="author">
+ <name>Shaun McCance</name>
+ <email>shaunm gnome org</email>
+ </credit>
+
+ </info>
+
+<title>Keyboard</title>
+
+</page>
diff --git a/gnome-help/C/look-background.page b/gnome-help/C/look-background.page
index 92e8ea8..15d07b8 100644
--- a/gnome-help/C/look-background.page
+++ b/gnome-help/C/look-background.page
@@ -4,7 +4,7 @@
id="look-background">
<info>
- <link type="guide" xref="prefs#display"/>
+ <link type="guide" xref="prefs-display"/>
<desc>How to set an image as your desktop background.</desc>
<revision pkgversion="3.0" version="0.1" date="2011-03-13" status="review"/>
diff --git a/gnome-help/C/look-dimscreen.page b/gnome-help/C/look-dimscreen.page
index 9a01b49..bc56084 100644
--- a/gnome-help/C/look-dimscreen.page
+++ b/gnome-help/C/look-dimscreen.page
@@ -5,7 +5,7 @@
id="look-dimscreen">
<info>
- <link type="guide" xref="prefs#display"/>
+ <link type="guide" xref="prefs-display"/>
<desc>Dim, turn off and lock it after some time.</desc>
<revision pkgversion="3.0" version="0.1" date="2011-03-19" status="review"/>
<credit type="author">
diff --git a/gnome-help/C/look-resolution.page b/gnome-help/C/look-resolution.page
index a783f3c..0db730b 100644
--- a/gnome-help/C/look-resolution.page
+++ b/gnome-help/C/look-resolution.page
@@ -3,7 +3,7 @@
id="look-resolution">
<info>
- <link type="guide" xref="prefs#display"/>
+ <link type="guide" xref="prefs-display"/>
<link type="guide" xref="hardware-problems-graphics"/>
<link type="seealso" xref="look-display-fuzzy"/>
diff --git a/gnome-help/C/media.page b/gnome-help/C/media.page
index 08b23b3..1bef4d7 100644
--- a/gnome-help/C/media.page
+++ b/gnome-help/C/media.page
@@ -23,7 +23,16 @@
<title>Sound, video & pictures</title>
<section id="sound" style="2column">
- <info><title type="link" role="trail">Sound</title></info>
+ <info>
+ <title type="link" role="trail">Sound</title>
+ <title type="link" role="topic">Sound</title>
+ <desc>
+ <link xref="sound-volume">Volume</link>,
+ <link xref="sound-usespeakers">speakers and headphones</link>,
+ <link xref="sound-usemic">microphones</link>...
+ </desc>
+ <link type="guide" xref="prefs"/>
+ </info>
<title>Basic sound</title>
</section>
diff --git a/gnome-help/C/mouse-disabletouchpad.page b/gnome-help/C/mouse-disabletouchpad.page
index eef4021..d36b8c0 100644
--- a/gnome-help/C/mouse-disabletouchpad.page
+++ b/gnome-help/C/mouse-disabletouchpad.page
@@ -3,8 +3,7 @@
style="task"
id="mouse-disabletouchpad">
<info>
- <link type="guide" xref="hardware#mouse"/>
- <link type="guide" xref="prefs#mouse"/>
+ <link type="guide" xref="mouse"/>
<link type="seealso" xref="mouse-mousekeys"/>
<desc>
diff --git a/gnome-help/C/mouse-drag-threshold.page b/gnome-help/C/mouse-drag-threshold.page
index 9520276..ba084f7 100644
--- a/gnome-help/C/mouse-drag-threshold.page
+++ b/gnome-help/C/mouse-drag-threshold.page
@@ -2,8 +2,7 @@
type="topic" style="a11y"
id="mouse-drag-threshold">
<info>
- <link type="guide" xref="hardware#mouse"/>
- <link type="guide" xref="mouse-prefs"/>
+ <link type="guide" xref="mouse"/>
<link type="guide" xref="a11y#mobility" group="clicking"/>
<revision pkgversion="3.0" version="0.1" date="2011-02-25" status="candidate"/>
diff --git a/gnome-help/C/mouse-lefthanded.page b/gnome-help/C/mouse-lefthanded.page
index 737e83e..3cb0c29 100644
--- a/gnome-help/C/mouse-lefthanded.page
+++ b/gnome-help/C/mouse-lefthanded.page
@@ -3,8 +3,7 @@
style="task"
id="mouse-lefthanded">
<info>
- <link type="guide" xref="hardware#mouse"/>
- <link type="guide" xref="mouse-prefs"/>
+ <link type="guide" xref="mouse"/>
<desc><guiseq><gui>Mouse</gui><gui>General</gui><gui>Mouse Orientation</gui></guiseq></desc>
<revision pkgversion="3.0" version="0.1" date="2011-03-19" status="candidate"/>
diff --git a/gnome-help/C/mouse-mousekeys.page b/gnome-help/C/mouse-mousekeys.page
index ebe4e86..5119b5f 100644
--- a/gnome-help/C/mouse-mousekeys.page
+++ b/gnome-help/C/mouse-mousekeys.page
@@ -3,7 +3,7 @@
style="tip"
id="mouse-mousekeys">
<info>
- <link type="guide" xref="mouse-prefs"/>
+ <link type="guide" xref="mouse"/>
<link type="guide" xref="a11y#mobility" group="pointing"/>
<desc>
diff --git a/gnome-help/C/mouse-problem-doubleclick.page b/gnome-help/C/mouse-problem-doubleclick.page
index 3383d2e..de06a84 100644
--- a/gnome-help/C/mouse-problem-doubleclick.page
+++ b/gnome-help/C/mouse-problem-doubleclick.page
@@ -3,9 +3,8 @@
style="problem"
id="mouse-problem-doubleclick">
<info>
- <link type="guide" xref="hardware#mouse"/>
<link type="guide" xref="mouse-problems"/>
- <link type="guide" xref="mouse-prefs"/>
+ <link type="guide" xref="mouse"/>
<link type="guide" xref="a11y#mobility" group="clicking"/>
<desc>
diff --git a/gnome-help/C/mouse-problem-notmoving.page b/gnome-help/C/mouse-problem-notmoving.page
index f401123..0b45b4b 100644
--- a/gnome-help/C/mouse-problem-notmoving.page
+++ b/gnome-help/C/mouse-problem-notmoving.page
@@ -4,7 +4,6 @@
id="mouse-problem-notmoving">
<info>
<link type="guide" xref="mouse-problems"/>
- <link type="guide" xref="hardware#mouse"/>
<desc>
How to check your mouse if it is not working.
</desc>
diff --git a/gnome-help/C/mouse-problems.page b/gnome-help/C/mouse-problems.page
index 31dd6e0..166ca58 100644
--- a/gnome-help/C/mouse-problems.page
+++ b/gnome-help/C/mouse-problems.page
@@ -2,7 +2,7 @@
type="guide"
id="mouse-problems">
<info>
- <link type="guide" xref="prefs#mouse"/>
+ <link type="guide" xref="mouse"/>
<desc>
<link xref="mouse-problem-doubleclick">Click speed</link>, <link xref="mouse-problem-notmoving">pointer not moving</link>, <link xref="mouse-problem-themeerror">theme</link>...
diff --git a/gnome-help/C/mouse-sensitivity.page b/gnome-help/C/mouse-sensitivity.page
index 62455fc..3fb2896 100644
--- a/gnome-help/C/mouse-sensitivity.page
+++ b/gnome-help/C/mouse-sensitivity.page
@@ -2,8 +2,7 @@
type="topic" style="task"
id="mouse-sensitivity">
<info>
- <link type="guide" xref="hardware#mouse"/>
- <link type="guide" xref="mouse-prefs"/>
+ <link type="guide" xref="mouse"/>
<link type="guide" xref="mouse-problems"/>
<link type="guide" xref="a11y#mobility" group="pointing"/>
diff --git a/gnome-help/C/mouse-sound.page b/gnome-help/C/mouse-sound.page
index 1e13c82..8a833b8 100644
--- a/gnome-help/C/mouse-sound.page
+++ b/gnome-help/C/mouse-sound.page
@@ -3,8 +3,7 @@
style="task"
id="mouse-sound">
<info>
- <link type="guide" xref="mouse-prefs"/>
- <link type="guide" xref="hardware#mouse"/>
+ <link type="guide" xref="mouse"/>
<desc>
Play a sound when mouse is clicked.
</desc>
diff --git a/gnome-help/C/mouse-touchpad-scroll.page b/gnome-help/C/mouse-touchpad-scroll.page
new file mode 100644
index 0000000..98823c3
--- /dev/null
+++ b/gnome-help/C/mouse-touchpad-scroll.page
@@ -0,0 +1,18 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="topic"
+ style="task"
+ id="mouse-touchpad-scroll">
+<info>
+ <link type="guide" xref="mouse"/>
+ <desc>XXXXX</desc>
+
+ <revision pkgversion="3.0" date="2011-04-03" status="stub"/>
+ <credit type="author">
+ <name>Shaun McCance</name>
+ <email>shaunm gnome org</email>
+ </credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+</info>
+
+<title>Scroll with the touchpad</title>
+</page>
diff --git a/gnome-help/C/mouse-wakeup.page b/gnome-help/C/mouse-wakeup.page
index c54b93d..f8d2a00 100644
--- a/gnome-help/C/mouse-wakeup.page
+++ b/gnome-help/C/mouse-wakeup.page
@@ -4,7 +4,6 @@
<info>
<link type="guide" xref="mouse-problems"/>
- <link type="guide" xref="hardware#mouse"/>
<desc>Wake-up your mouse.</desc>
<revision pkgversion="3.0" version="0.9" date="2011-04-01" status="candidate"/>
<credit type="author">
diff --git a/gnome-help/C/mouse-prefs.page b/gnome-help/C/mouse.page
similarity index 58%
rename from gnome-help/C/mouse-prefs.page
rename to gnome-help/C/mouse.page
index 1a02901..8ca325a 100644
--- a/gnome-help/C/mouse-prefs.page
+++ b/gnome-help/C/mouse.page
@@ -1,11 +1,13 @@
<page xmlns="http://projectmallard.org/1.0/";
type="guide"
- id="mouse-prefs">
+ id="mouse">
<info>
- <link type="guide" xref="prefs#mouse"/>
- <link type="guide" xref="hardware#mouse"/>
+ <link type="guide" xref="prefs"/>
+ <link type="guide" xref="hardware"/>
<desc>
- Adjust your mouse preferences.
+ <link xref="mouse-lefthanded">Left-handed</link>,
+ <link xref="mouse-sensitivity">speed and sensitivity</link>,
+ <link xref="mouse-touchpad-scroll">touchpad scrolling</link>...
</desc>
<revision pkgversion="3.0" version="0.1" date="2011-03-19" status="review"/>
@@ -16,7 +18,7 @@
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
-<title>Mouse Preferences</title>
+<title>Mouse</title>
<links type="topic" style="2column"/>
</page>
diff --git a/gnome-help/C/power-turnoffbutton.page b/gnome-help/C/power-turnoffbutton.page
index fb9612e..1adea4e 100644
--- a/gnome-help/C/power-turnoffbutton.page
+++ b/gnome-help/C/power-turnoffbutton.page
@@ -3,7 +3,7 @@
id="power-turnoffbutton">
<info>
- <link type="guide" xref="prefs#power"/>
+ <link type="guide" xref="hardware#power"/>
<desc>Look in <guiseq><gui>System Settings</gui><gui>Power</gui></guiseq> for the option to change this.</desc>
<revision pkgversion="3.0" version="0.1" date="2011-03-19" status="review"/>
<credit type="author">
diff --git a/gnome-help/C/prefs-display.page b/gnome-help/C/prefs-display.page
new file mode 100644
index 0000000..c805e69
--- /dev/null
+++ b/gnome-help/C/prefs-display.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="guide"
+ id="prefs-display">
+ <info>
+ <revision pkgversion="3.0" date="2011-04-03" status="stub"/>
+
+ <link type="guide" xref="prefs"/>
+
+ <credit type="author">
+ <name>Shaun McCance</name>
+ <email>shaunm gnome org</email>
+ </credit>
+
+ <desc>
+ <link xref="look-background">Background</link>,
+ <link xref="look-resolution">size and rotation</link>,
+ <link xref="look-dimscreen">brightness</link>...
+ </desc>
+ </info>
+
+<title>Display & screen</title>
+
+</page>
diff --git a/gnome-help/C/prefs-language.page b/gnome-help/C/prefs-language.page
new file mode 100644
index 0000000..1af9e06
--- /dev/null
+++ b/gnome-help/C/prefs-language.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="guide"
+ id="prefs-language">
+ <info>
+ <revision pkgversion="3.0" date="2011-04-03" status="stub"/>
+
+ <link type="guide" xref="prefs"/>
+
+ <credit type="author">
+ <name>Shaun McCance</name>
+ <email>shaunm gnome org</email>
+ </credit>
+
+ <desc>
+ <link xref="session-language">Change language</link>,
+ <link xref="keyboard-layouts">keyboard layouts</link>...
+ </desc>
+
+ </info>
+
+<title>Language & region</title>
+
+</page>
diff --git a/gnome-help/C/prefs.page b/gnome-help/C/prefs.page
index b4a1707..c3e4518 100644
--- a/gnome-help/C/prefs.page
+++ b/gnome-help/C/prefs.page
@@ -5,7 +5,7 @@
<revision pkgversion="3.0" date="2011-04-03" status="final"/>
<link type="guide" xref="index" group="prefs"/>
- <title role="trail" type="link">Preferences</title>
+ <title role="trail" type="link">Settings</title>
<credit type="author copyright">
<name>Shaun McCance</name>
@@ -14,55 +14,15 @@
</credit>
<desc>
- <link xref="prefs#keyboard">Keyboard</link>,
- <link xref="prefs#mouse">mouse</link>,
- <link xref="prefs#display">display</link>,
- <link xref="prefs#languages">languages</link>,
- <link xref="prefs#users">user accounts</link>
+ <link xref="keyboard">Keyboard</link>,
+ <link xref="mouse">mouse</link>,
+ <link xref="prefs-display">display</link>,
+ <link xref="prefs-language">languages</link>,
+ <link xref="user-accounts">user accounts</link>...
</desc>
</info>
-<title>User & system preferences</title>
- <links type="topic" style="2column"/>
-
-<section id="display">
- <title>Display</title>
-<links type="topic" style="2column"/>
-</section>
-
-<section id="keyboard">
- <title>Keyboard</title>
-<links type="topic" style="2column"/>
-</section>
-
-<section id="languages">
- <title>Languages</title>
- <links type="topic" style="2column"/>
-</section>
-
-<section id="mouse">
- <title>Mouse</title>
-<links type="topic" style="2column"/>
-</section>
-
-<section id="power">
- <title>Power saving and screensaver</title>
- <links type="topic" style="2column"/>
-</section>
-
-<section id="sound">
- <title>Sound</title>
- <links type="topic" style="2column"/>
-</section>
-
-<section id="clock">
- <title>Time and date</title>
- <links type="topic" style="2column"/>
-</section>
-
-<section id="users">
- <title>User accounts</title>
- <links type="topic" style="2column"/>
-</section>
+<title>User & system settings</title>
+<links type="topic" style="toronto"/>
</page>
diff --git a/gnome-help/C/session-language.page b/gnome-help/C/session-language.page
index b6b415a..33f3126 100644
--- a/gnome-help/C/session-language.page
+++ b/gnome-help/C/session-language.page
@@ -4,7 +4,7 @@
id="session-language">
<info>
- <link type="guide" xref="prefs#languages"/>
+ <link type="guide" xref="prefs-language"/>
<desc>Switch to using a different language for text on the screen.</desc>
<revision pkgversion="3.0" version="0.1" date="2011-03-19" status="incomplete"/>
<credit type="author">
diff --git a/gnome-help/C/session-screenlocks.page b/gnome-help/C/session-screenlocks.page
index e836799..bc5c576 100644
--- a/gnome-help/C/session-screenlocks.page
+++ b/gnome-help/C/session-screenlocks.page
@@ -4,7 +4,7 @@
<info>
<link type="guide" xref="shell-exit"/>
- <link type="guide" xref="prefs#display"/>
+ <link type="guide" xref="prefs-display"/>
<link type="guide" xref="hardware-problems-graphics"/>
<desc>Change how long to wait before locking the screen in the <gui>Screen</gui> settings.</desc>
diff --git a/gnome-help/C/user-accounts.page b/gnome-help/C/user-accounts.page
index 4b9350f..05769bb 100644
--- a/gnome-help/C/user-accounts.page
+++ b/gnome-help/C/user-accounts.page
@@ -3,9 +3,13 @@
id="user-accounts">
<info>
- <link type="guide" xref="prefs#users" group="#first" />
-
- <desc>Decide who has access to your computer, reset your password...</desc>
+ <link type="guide" xref="prefs"/>
+ <desc>
+ <link xref="user-add">Add user</link> or
+ <link xref="user-addguest">guest user</link>,
+ <link xref="user-changepassword">change password</link>,
+ <link xref="user-admin-change">administrators</link>...
+ </desc>
<revision pkgversion="3.0" version="0.1" date="2011-03-25" status="final"/>
<credit type="author">
<name>GNOME Documentation Project</name>
diff --git a/gnome-help/C/user-privileges.page b/gnome-help/C/user-privileges.page
index de8a1ef..14e608a 100644
--- a/gnome-help/C/user-privileges.page
+++ b/gnome-help/C/user-privileges.page
@@ -3,7 +3,7 @@
id="user-privileges">
<info>
- <link type="guide" xref="prefs#users"/>
+ <link type="guide" xref="user-accounts"/>
<desc>Choose who is allowed to modify important system settings.</desc>
<revision pkgversion="3.0" version="0.1" date="2011-02-24" status="draft"/>
<credit type="author">
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index d4cc335..c97d86c 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -58,6 +58,7 @@ DOC_PAGES = \
bluetooth-remove-connection.page \
bluetooth-send-file.page \
bluetooth-turn-on-off.page \
+ clock.page \
clock-calendar.page \
clock-set.page \
clock-timezone.page \
@@ -90,6 +91,7 @@ DOC_PAGES = \
hardware-problems-graphics.page \
hardware-problems-scanning.page \
index.page \
+ keyboard.page \
keyboard-cursor-blink.page \
keyboard-inputmethods.page \
keyboard-layouts.page \
@@ -100,18 +102,19 @@ DOC_PAGES = \
look-resolution.page \
media.page \
more-help.page \
+ mouse.page \
mouse-disabletouchpad.page \
mouse-drag-threshold.page \
mouse-lefthanded.page \
mouse-middleclick.page \
mouse-mousekeys.page \
- mouse-prefs.page \
mouse-problem-doubleclick.page \
mouse-problem-notmoving.page \
mouse-problems.page \
mouse-problem-themeerror.page \
mouse-sensitivity.page \
mouse-sound.page \
+ mouse-touchpad-scroll.page \
mouse-wakeup.page \
nautilus-behavior.page \
nautilus-bookmarks-edit.page \
@@ -170,6 +173,8 @@ DOC_PAGES = \
power-whydim.page \
power-willnotturnon.page \
prefs.page \
+ prefs-language.page \
+ prefs-display.page \
printing-2sided.page \
printing-booklet.page \
printing-cancel-job.page \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
