[gnome-user-docs] refactored web* and net* sections, combining them under the net section
- From: Jim Campbell <jcampbell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-user-docs] refactored web* and net* sections, combining them under the net section
- Date: Sun, 4 Sep 2011 04:48:23 +0000 (UTC)
commit f902772c98fac5a10e530e29f6eaa5915ec54448
Author: Jim Campbell <jwcampbell gmail com>
Date: Sat Sep 3 23:47:38 2011 -0500
refactored web* and net* sections, combining them under the net section
gnome-help/C/index.page | 4 +-
gnome-help/C/net-adhoc.page | 2 +-
gnome-help/C/net-antivirus.page | 2 +-
gnome-help/C/net-browser.page | 24 +++++++
...fault-browser.page => net-default-browser.page} | 4 +-
...b-default-email.page => net-default-email.page} | 4 +-
gnome-help/C/net-editcon.page | 2 +-
.../{web-email-virus.page => net-email-virus.page} | 4 +-
gnome-help/C/net-email.page | 25 ++++++++
gnome-help/C/net-findip.page | 2 +-
gnome-help/C/net-firewall-on-off.page | 3 +-
gnome-help/C/net-firewall-ports.page | 2 +-
gnome-help/C/net-fixed-ip-address.page | 2 +-
gnome-help/C/net-general.page | 30 +++++++++
...b-install-flash.page => net-install-flash.page} | 4 +-
...l-moonlight.page => net-install-moonlight.page} | 4 +-
gnome-help/C/net-macaddress.page | 2 +-
gnome-help/C/net-manual.page | 3 +-
gnome-help/C/net-no-wireless-connection.page.stub | 4 +-
gnome-help/C/net-othersconnect.page | 2 +-
gnome-help/C/net-otherscontrol.page | 2 +-
gnome-help/C/net-passwordok-noconnect.page | 2 +-
gnome-help/C/net-problem.page | 23 +++++++
gnome-help/C/net-proxy.page | 3 +-
gnome-help/C/net-security-tips.page | 55 +++++++++++++++++
gnome-help/C/net-security.page | 23 +++++++
gnome-help/C/net-slow.page | 3 +-
gnome-help/C/net-vpn-connect.page | 3 +-
gnome-help/C/net-what-is-ip-address.page | 2 +-
gnome-help/C/net-wired-connect.page | 2 +-
gnome-help/C/net-wired.page | 23 +++++++
gnome-help/C/net-wireless-airplane.page | 2 +-
gnome-help/C/net-wireless-connect.page | 2 +-
gnome-help/C/net-wireless-disconnecting.page | 4 +-
gnome-help/C/net-wireless-find.page | 3 +-
gnome-help/C/net-wireless-hidden.page | 2 +-
gnome-help/C/net-wireless-troubleshooting.page | 2 +-
gnome-help/C/net-wireless-wepwpa.page | 2 +-
gnome-help/C/net-wireless.page | 27 ++++++++
gnome-help/C/net-wrongnetwork.page | 2 +-
gnome-help/C/net.page | 65 +++++---------------
gnome-help/C/shell-session-status.page | 3 +-
gnome-help/C/web.page | 53 ----------------
43 files changed, 290 insertions(+), 147 deletions(-)
---
diff --git a/gnome-help/C/index.page b/gnome-help/C/index.page
index e2ad1f0..ef34052 100644
--- a/gnome-help/C/index.page
+++ b/gnome-help/C/index.page
@@ -28,7 +28,7 @@
</links>
<links type="topic" style="toronto" groups="
- web media files
- net prefs hardware
+ net media files
+ prefs hardware
a11y tips more-help"/>
</page>
diff --git a/gnome-help/C/net-adhoc.page b/gnome-help/C/net-adhoc.page
index e51ded1..1310ac7 100644
--- a/gnome-help/C/net-adhoc.page
+++ b/gnome-help/C/net-adhoc.page
@@ -2,7 +2,7 @@
type="topic" style="task"
id="net-adhoc">
<info>
- <link type="guide" xref="net#wireless"/>
+ <link type="guide" xref="net-wireless"/>
<revision pkgversion="3.0" date="2011-04-05" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="outdated"/>
diff --git a/gnome-help/C/net-antivirus.page b/gnome-help/C/net-antivirus.page
index fbbb416..8f447a8 100644
--- a/gnome-help/C/net-antivirus.page
+++ b/gnome-help/C/net-antivirus.page
@@ -3,7 +3,7 @@
id="net-antivirus">
<info>
- <link type="guide" xref="net#security"/>
+ <link type="guide" xref="net-security"/>
<desc>There are few Linux viruses, so you probably don't need anti-virus software.</desc>
diff --git a/gnome-help/C/net-browser.page b/gnome-help/C/net-browser.page
new file mode 100644
index 0000000..a2fd5b8
--- /dev/null
+++ b/gnome-help/C/net-browser.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="guide" style="task 2column"
+ id="net-browser">
+
+ <info>
+ <revision version="3.2" date="2011-09-03" status="final"/>
+
+ <link type="guide" xref="net"/>
+
+ <desc>
+ <link xref="net-default-browser">Change the default browser</link>,
+ <link xref="net-install-flash">install flash</link>,
+ <link xref="net-install-java-plugin">install the java plugin</link>...
+ </desc>
+
+ <credit type="author">
+ <name>The Ubuntu Documentation Team</name>
+ </credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+<title>Web Browsers</title>
+
+</page>
diff --git a/gnome-help/C/web-default-browser.page b/gnome-help/C/net-default-browser.page
similarity index 95%
rename from gnome-help/C/web-default-browser.page
rename to gnome-help/C/net-default-browser.page
index a128af7..5abcc4b 100644
--- a/gnome-help/C/web-default-browser.page
+++ b/gnome-help/C/net-default-browser.page
@@ -1,8 +1,8 @@
<page xmlns="http://projectmallard.org/1.0/";
type="topic" style="task"
- id="web-default-browser">
+ id="net-default-browser">
<info>
- <link type="guide" xref="web#browser"/>
+ <link type="guide" xref="net-browser"/>
<revision pkgversion="3.0" date="2011-04-04" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="correct"/>
diff --git a/gnome-help/C/web-default-email.page b/gnome-help/C/net-default-email.page
similarity index 95%
rename from gnome-help/C/web-default-email.page
rename to gnome-help/C/net-default-email.page
index dcca66e..8c79f82 100644
--- a/gnome-help/C/web-default-email.page
+++ b/gnome-help/C/net-default-email.page
@@ -1,8 +1,8 @@
<page xmlns="http://projectmallard.org/1.0/";
type="topic" style="task"
- id="web-default-email">
+ id="net-default-email">
<info>
- <link type="guide" xref="web#email"/>
+ <link type="guide" xref="net-email"/>
<revision pkgversion="3.0" date="2011-04-04" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="correct"/>
diff --git a/gnome-help/C/net-editcon.page b/gnome-help/C/net-editcon.page
index 62bd129..21c1b27 100644
--- a/gnome-help/C/net-editcon.page
+++ b/gnome-help/C/net-editcon.page
@@ -2,7 +2,7 @@
type="topic" style="ui"
id="net-editcon">
<info>
- <link type="guide" xref="net"/>
+ <link type="guide" xref="net-wireless" group="first"/>
<revision pkgversion="3.0" date="2011-04-05" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-06" status="incomplete"/>
diff --git a/gnome-help/C/web-email-virus.page b/gnome-help/C/net-email-virus.page
similarity index 96%
rename from gnome-help/C/web-email-virus.page
rename to gnome-help/C/net-email-virus.page
index d5850de..a7fc0f8 100644
--- a/gnome-help/C/web-email-virus.page
+++ b/gnome-help/C/net-email-virus.page
@@ -1,8 +1,8 @@
<page xmlns="http://projectmallard.org/1.0/";
type="topic"
- id="web-email-virus">
+ id="net-email-virus">
<info>
- <link type="guide" xref="web#email"/>
+ <link type="guide" xref="net-email"/>
<link type="seealso" xref="net-antivirus"/>
<revision pkgversion="3.0" date="2011-04-04" status="final"/>
diff --git a/gnome-help/C/net-email.page b/gnome-help/C/net-email.page
new file mode 100644
index 0000000..b830d3e
--- /dev/null
+++ b/gnome-help/C/net-email.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="guide" style="task 2column"
+ id="net-email">
+
+ <info>
+ <revision version="3.2" date="2011-09-03" status="final"/>
+
+ <link type="guide" xref="net"/>
+
+ <desc>
+ <link xref="net-default-email">Default email apps</link>
+ </desc>
+
+ <credit type="author">
+ <name>The Ubuntu Documentation Team</name>
+ </credit>
+
+ <credit type="author">
+ <name>The GNOME Documentation Team</name>
+ </credit>
+ </info>
+
+<title>Email & email software</title>
+
+</page>
diff --git a/gnome-help/C/net-findip.page b/gnome-help/C/net-findip.page
index 78e055c..d8c2a07 100644
--- a/gnome-help/C/net-findip.page
+++ b/gnome-help/C/net-findip.page
@@ -2,7 +2,7 @@
type="topic" style="task"
id="net-findip">
<info>
- <link type="guide" xref="net"/>
+ <link type="guide" xref="net-general"/>
<link type="seealso" xref="net-what-is-ip-address"/>
<revision pkgversion="3.0" date="2011-04-05" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="final"/>
diff --git a/gnome-help/C/net-firewall-on-off.page b/gnome-help/C/net-firewall-on-off.page
index eefd783..507e072 100644
--- a/gnome-help/C/net-firewall-on-off.page
+++ b/gnome-help/C/net-firewall-on-off.page
@@ -3,8 +3,7 @@
id="net-firewall-on-off">
<info>
- <link type="guide" xref="net#security"/>
- <link type="guide" xref="web#connections"/>
+ <link type="guide" xref="net-security"/>
<desc>You can control which programs can access the network. This helps to keep your computer secure.</desc>
<revision pkgversion="3.0" date="2011-04-04" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-06" status="final"/>
diff --git a/gnome-help/C/net-firewall-ports.page b/gnome-help/C/net-firewall-ports.page
index a04eae8..08c8682 100644
--- a/gnome-help/C/net-firewall-ports.page
+++ b/gnome-help/C/net-firewall-ports.page
@@ -3,7 +3,7 @@
id="net-firewall-ports">
<info>
- <link type="guide" xref="net#security"/>
+ <link type="guide" xref="net-security"/>
<desc>You need to specify the right network port to enable/disable network access for a program with your firewall.</desc>
<revision pkgversion="3.0" date="2011-04-04" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-06" status="final"/>
diff --git a/gnome-help/C/net-fixed-ip-address.page b/gnome-help/C/net-fixed-ip-address.page
index 947b5e1..5068de5 100644
--- a/gnome-help/C/net-fixed-ip-address.page
+++ b/gnome-help/C/net-fixed-ip-address.page
@@ -2,7 +2,7 @@
type="topic" style="task"
id="net-fixed-ip-address">
<info>
- <link type="guide" xref="net#wired"/>
+ <link type="guide" xref="net-wired"/>
<revision pkgversion="3.0" date="2011-04-04" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-06" status="final"/>
diff --git a/gnome-help/C/net-general.page b/gnome-help/C/net-general.page
new file mode 100644
index 0000000..998ebc0
--- /dev/null
+++ b/gnome-help/C/net-general.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="guide" style="task 2column"
+ id="net-general">
+
+ <info>
+ <revision version="3.2" date="2011-09-03" status="final"/>
+
+ <link type="guide" xref="net"/>
+
+ <desc>
+ <link xref="net-findip">Find your IP address</link>,
+ <link xref="net-wireless-wepwpa">WEP & WPA security</link>,
+ <link xref="net-macaddress">MAC addresses</link>,
+ <link xref="net-proxy">proxies</link>...
+ </desc>
+
+ <credit type="author">
+ <name>The Ubuntu Documentation Team</name>
+ </credit>
+
+ <credit type="author">
+ <name>The GNOME Documentation Team</name>
+ </credit>
+
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+<title>Networking terms & tips</title>
+
+</page>
diff --git a/gnome-help/C/web-install-flash.page b/gnome-help/C/net-install-flash.page
similarity index 97%
rename from gnome-help/C/web-install-flash.page
rename to gnome-help/C/net-install-flash.page
index 447e7ac..d8a7bd9 100644
--- a/gnome-help/C/web-install-flash.page
+++ b/gnome-help/C/net-install-flash.page
@@ -1,8 +1,8 @@
<page xmlns="http://projectmallard.org/1.0/";
type="topic" style="task"
- id="web-install-flash">
+ id="net-install-flash">
<info>
- <link type="guide" xref="web#browser"/>
+ <link type="guide" xref="net-browser"/>
<revision pkgversion="3.0" date="2011-04-04" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="correct"/>
diff --git a/gnome-help/C/web-install-moonlight.page b/gnome-help/C/net-install-moonlight.page
similarity index 95%
rename from gnome-help/C/web-install-moonlight.page
rename to gnome-help/C/net-install-moonlight.page
index 622cccd..c2947ab 100644
--- a/gnome-help/C/web-install-moonlight.page
+++ b/gnome-help/C/net-install-moonlight.page
@@ -1,8 +1,8 @@
<page xmlns="http://projectmallard.org/1.0/";
type="topic" style="task"
- id="web-install-moonlight">
+ id="net-install-moonlight">
<info>
- <link type="guide" xref="web#browser"/>
+ <link type="guide" xref="net-browser"/>
<revision pkgversion="3.0" date="2011-04-04" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="correct"/>
diff --git a/gnome-help/C/net-macaddress.page b/gnome-help/C/net-macaddress.page
index 3282916..a69f7b6 100644
--- a/gnome-help/C/net-macaddress.page
+++ b/gnome-help/C/net-macaddress.page
@@ -2,7 +2,7 @@
type="topic" style="tip"
id="net-macaddress">
<info>
- <link type="guide" xref="net"/>
+ <link type="guide" xref="net-general"/>
<revision pkgversion="3.0" date="2011-04-05" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="final"/>
diff --git a/gnome-help/C/net-manual.page b/gnome-help/C/net-manual.page
index 272b5a9..a784bca 100644
--- a/gnome-help/C/net-manual.page
+++ b/gnome-help/C/net-manual.page
@@ -2,7 +2,8 @@
type="topic" style="task"
id="net-manual">
<info>
- <link type="guide" xref="net"/>
+ <link type="guide" xref="net-wired"/>
+ <link type="guide" xref="net-wireless"/>
<revision pkgversion="3.0" date="2011-04-07" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-04-06" status="outdated"/>
diff --git a/gnome-help/C/net-no-wireless-connection.page.stub b/gnome-help/C/net-no-wireless-connection.page.stub
index 6fa4c7e..7796ae8 100644
--- a/gnome-help/C/net-no-wireless-connection.page.stub
+++ b/gnome-help/C/net-no-wireless-connection.page.stub
@@ -2,8 +2,8 @@
type="topic" style="problem"
id="net-no-wireless-connection">
<info>
- <link type="guide" xref="net#problems"/>
- <link type="guide" xref="net#wireless"/>
+ <link type="guide" xref="net-problem"/>
+ <link type="guide" xref="net-wireless"/>
<revision pkgversion="3.0" date="2011-03-20" status="stub"/>
<credit type="author">
diff --git a/gnome-help/C/net-othersconnect.page b/gnome-help/C/net-othersconnect.page
index 1d19eb2..2decd61 100644
--- a/gnome-help/C/net-othersconnect.page
+++ b/gnome-help/C/net-othersconnect.page
@@ -2,7 +2,7 @@
type="topic" style="problem"
id="net-othersconnect">
<info>
- <link type="guide" xref="net#problems"/>
+ <link type="guide" xref="net-problem"/>
<link type="seealso" xref="net-otherscontrol"/>
<revision pkgversion="3.0" date="2011-04-04" status="final"/>
diff --git a/gnome-help/C/net-otherscontrol.page b/gnome-help/C/net-otherscontrol.page
index f4c4386..41128b5 100644
--- a/gnome-help/C/net-otherscontrol.page
+++ b/gnome-help/C/net-otherscontrol.page
@@ -2,7 +2,7 @@
type="topic" style="problem"
id="net-otherscontrol">
<info>
- <link type="guide" xref="net#problems"/>
+ <link type="guide" xref="net-problem"/>
<link type="seealso" xref="user-admin-explain"/>
<revision pkgversion="3.0" date="2011-04-04" status="final"/>
diff --git a/gnome-help/C/net-passwordok-noconnect.page b/gnome-help/C/net-passwordok-noconnect.page
index 6761017..8388e42 100644
--- a/gnome-help/C/net-passwordok-noconnect.page
+++ b/gnome-help/C/net-passwordok-noconnect.page
@@ -2,7 +2,7 @@
type="topic" style="problem"
id="net-passwordok-noconnect">
<info>
- <link type="guide" xref="net#wireless"/>
+ <link type="guide" xref="net-wireless"/>
<revision pkgversion="3.0" date="2011-04-05" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="final"/>
diff --git a/gnome-help/C/net-problem.page b/gnome-help/C/net-problem.page
new file mode 100644
index 0000000..b2199e3
--- /dev/null
+++ b/gnome-help/C/net-problem.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="guide" style="task 2column"
+ id="net-problem">
+
+ <info>
+ <revision version="3.2" date="2011-09-03" status="final"/>
+
+ <link type="guide" xref="net"/>
+
+ <desc>
+ <link xref="net-wireless-troubleshooting">Troubleshooting wireless connections</link>,
+ <link xref="net-wireless-find">Finding your wifi network</link>,
+ </desc>
+
+ <credit type="author">
+ <name>The Ubuntu Documentation Team</name>
+ </credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+<title>Network problems</title>
+
+</page>
diff --git a/gnome-help/C/net-proxy.page b/gnome-help/C/net-proxy.page
index 3738722..6b8549c 100644
--- a/gnome-help/C/net-proxy.page
+++ b/gnome-help/C/net-proxy.page
@@ -2,8 +2,7 @@
type="topic" style="question"
id="net-proxy">
<info>
- <link type="guide" xref="net"/>
- <link type="guide" xref="web#connections"/>
+ <link type="guide" xref="net-general"/>
<revision pkgversion="3.0" date="2011-04-04" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="final"/>
diff --git a/gnome-help/C/net-security-tips.page b/gnome-help/C/net-security-tips.page
new file mode 100644
index 0000000..e0adc59
--- /dev/null
+++ b/gnome-help/C/net-security-tips.page
@@ -0,0 +1,55 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="guide" style="task"
+ id="net-security-tips">
+
+ <info>
+ <revision version="3.2" date="2011-09-30" status="final"/>
+
+ <link type="guide" xref="net-general"/>
+
+ <desc>
+ General tips to keep in mind when using the internet
+ </desc>
+
+ <credit type="author">
+ <name>Steven Richards</name>
+ <email>steven richardspc gmail com</email>
+ </credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+<title>Staying safe on the internet</title>
+
+<p>A reason why you may be using Linux is for the robust security that it is known for. One reason
+Linux is relatively safe from malware and viruses is due to the number of people that use it.
+Viruses are targeted at popular operating systems like Windows that have an extremely massive
+user base. Linux is also very secure due to its open source nature which allows experts
+to modify and enhance the security features included with each distribution.</p>
+
+<p>Despite the measures taken to ensure your installation of Linux is secure, there
+are always vulnerabilities. As an average user on the internet you are still susceptible to:</p>
+
+ <list>
+ <item><p>Phishing Scams (Sites that try to obtain sensitive information through deception)</p></item>
+ <item><p><link xref="net-email-virus">Forwarding malicious emails</link></p></item>
+ <item><p><link xref="net-antivirus">Applications with malicious intents (Viruses)</link></p></item>
+ <item><p><link xref="net-wireless-wepwpa">Unwarranted remote/local network access</link></p></item>
+ </list>
+
+<p>To stay safe from malicious exploits, keep in mind the following tips:</p>
+
+ <list>
+ <item><p>Do not open emails, attachments, or links that were sent from people you do not know.</p></item>
+ <item><p>If a website's offer is too good to be true or asks for sensitive information
+that seems unnecessary, then think twice about what you are submitting and the potential
+consequences if that information is compromised by identity thieves or other criminals.</p></item>
+ <item><p>Be careful in providing any application root level permissions, especially ones that
+you have not used before or apps that are not well-known. Providing anyone/anything with root level
+permissions puts your computer at high risk to exploitation.</p></item>
+ <item><p>Make sure you are only running necessary remote-access services. Having
+<app>SSH</app> or <app>VNC</app> running can be useful but also leaves your computer open to intrusion if not
+secured properly. Consider using a <link xref="net-firewall-on-off">firewall</link> to help
+protect your computer from intrusion.</p></item>
+ </list>
+
+</page>
diff --git a/gnome-help/C/net-security.page b/gnome-help/C/net-security.page
new file mode 100644
index 0000000..21e3e06
--- /dev/null
+++ b/gnome-help/C/net-security.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="guide" style="task"
+ id="net-security">
+
+ <info>
+ <revision version="3.2" date="2011-09-03" status="final"/>
+
+ <link type="guide" xref="net"/>
+
+ <desc>
+ <link xref="net-antivirus">Antivirus software</link>,
+ <link xref="net-firewall-on-off">basic firewalls</link>...
+ </desc>
+
+ <credit type="author">
+ <name>The Ubuntu Documentation Team</name>
+ </credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+<title>Keeping safe on the internet</title>
+
+</page>
diff --git a/gnome-help/C/net-slow.page b/gnome-help/C/net-slow.page
index d19ca38..929c3c0 100644
--- a/gnome-help/C/net-slow.page
+++ b/gnome-help/C/net-slow.page
@@ -2,8 +2,7 @@
type="topic" style="problem"
id="net-slow">
<info>
- <link type="guide" xref="net#problems"/>
- <link type="guide" xref="web#connections"/>
+ <link type="guide" xref="net-problem"/>
<revision pkgversion="3.0" date="2011-04-04" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="final"/>
diff --git a/gnome-help/C/net-vpn-connect.page b/gnome-help/C/net-vpn-connect.page
index 2f513f9..0d34e60 100644
--- a/gnome-help/C/net-vpn-connect.page
+++ b/gnome-help/C/net-vpn-connect.page
@@ -2,7 +2,8 @@
type="topic" style="task"
id="net-vpn-connect">
<info>
- <link type="guide" xref="net#vpn"/>
+ <link type="guide" xref="net-wireless"/>
+ <link type="guide" xref="net-wired"/>
<revision pkgversion="3.0" date="2011-04-04" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-06" status="incorrect"/>
diff --git a/gnome-help/C/net-what-is-ip-address.page b/gnome-help/C/net-what-is-ip-address.page
index 585297f..7b2d97e 100644
--- a/gnome-help/C/net-what-is-ip-address.page
+++ b/gnome-help/C/net-what-is-ip-address.page
@@ -2,7 +2,7 @@
type="topic" style="question"
id="net-what-is-ip-address">
<info>
- <link type="guide" xref="net"/>
+ <link type="guide" xref="net-general"/>
<revision pkgversion="3.0" date="2011-04-05" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="final"/>
diff --git a/gnome-help/C/net-wired-connect.page b/gnome-help/C/net-wired-connect.page
index a34d9b6..1a1ea36 100644
--- a/gnome-help/C/net-wired-connect.page
+++ b/gnome-help/C/net-wired-connect.page
@@ -2,7 +2,7 @@
type="topic" style="task"
id="net-wired-connect">
<info>
- <link type="guide" xref="net#wired"/>
+ <link type="guide" xref="net-wired"/>
<revision pkgversion="3.0" date="2011-04-05" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="final"/>
diff --git a/gnome-help/C/net-wired.page b/gnome-help/C/net-wired.page
new file mode 100644
index 0000000..e0b910d
--- /dev/null
+++ b/gnome-help/C/net-wired.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="guide" style="task"
+ id="net-wired">
+
+ <info>
+ <revision version="3.2" date="2011-09-03" status="final"/>
+
+ <link type="guide" xref="net"/>
+
+ <desc>
+ <link xref="net-wired-connect">Wired internet connections</link>,
+ <link xref="net-fixed-ip-address">fixed IP addresses</link>...
+ </desc>
+
+ <credit type="author">
+ <name>The Ubuntu Documentation Team</name>
+ </credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+<title>Wired Networking</title>
+
+</page>
diff --git a/gnome-help/C/net-wireless-airplane.page b/gnome-help/C/net-wireless-airplane.page
index f024a8e..5e8fd26 100644
--- a/gnome-help/C/net-wireless-airplane.page
+++ b/gnome-help/C/net-wireless-airplane.page
@@ -2,7 +2,7 @@
type="topic" style="task"
id="net-wireless-airplane">
<info>
- <link type="guide" xref="net#wireless"/>
+ <link type="guide" xref="net-wireless"/>
<revision pkgversion="3.0" date="2011-04-04" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="final"/>
diff --git a/gnome-help/C/net-wireless-connect.page b/gnome-help/C/net-wireless-connect.page
index 7481d40..5791fd2 100644
--- a/gnome-help/C/net-wireless-connect.page
+++ b/gnome-help/C/net-wireless-connect.page
@@ -2,7 +2,7 @@
type="topic" style="task"
id="net-wireless-connect">
<info>
- <link type="guide" xref="net#wireless"/>
+ <link type="guide" xref="net-wireless" group="#first"/>
<link type="seealso" xref="net-wireless-troubleshooting"/>
<link type="seealso" xref="net-passwordok-noconnect"/>
<link type="seealso" xref="net-wireless-disconnecting"/>
diff --git a/gnome-help/C/net-wireless-disconnecting.page b/gnome-help/C/net-wireless-disconnecting.page
index 13b82da..aae079d 100644
--- a/gnome-help/C/net-wireless-disconnecting.page
+++ b/gnome-help/C/net-wireless-disconnecting.page
@@ -2,8 +2,8 @@
type="topic" style="problem"
id="net-wireless-disconnecting">
<info>
- <link type="guide" xref="net#wireless"/>
- <link type="guide" xref="net#problems"/>
+ <link type="guide" xref="net-wireless"/>
+ <link type="guide" xref="net-problem"/>
<revision pkgversion="3.0" date="2011-03-28" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="final"/>
diff --git a/gnome-help/C/net-wireless-find.page b/gnome-help/C/net-wireless-find.page
index 53a8b33..81a2976 100644
--- a/gnome-help/C/net-wireless-find.page
+++ b/gnome-help/C/net-wireless-find.page
@@ -2,7 +2,8 @@
type="topic" style="problem"
id="net-wireless-find">
<info>
- <link type="guide" xref="net#wireless"/>
+ <link type="guide" xref="net-wireless"/>
+ <link type="guide" xref="net-problem"/>
<link type="seealso" xref="net-wireless-hidden"/>
<revision pkgversion="3.0" date="2011-04-05" status="final"/>
diff --git a/gnome-help/C/net-wireless-hidden.page b/gnome-help/C/net-wireless-hidden.page
index ba6a187..c526502 100644
--- a/gnome-help/C/net-wireless-hidden.page
+++ b/gnome-help/C/net-wireless-hidden.page
@@ -2,7 +2,7 @@
type="topic" style="task"
id="net-wireless-hidden">
<info>
- <link type="guide" xref="net#wireless"/>
+ <link type="guide" xref="net-wireless"/>
<link type="seealso" xref="net-editcon#wireless"/>
<revision pkgversion="3.0" date="2011-04-05" status="final"/>
diff --git a/gnome-help/C/net-wireless-troubleshooting.page b/gnome-help/C/net-wireless-troubleshooting.page
index 9445e39..ff2d622 100644
--- a/gnome-help/C/net-wireless-troubleshooting.page
+++ b/gnome-help/C/net-wireless-troubleshooting.page
@@ -2,7 +2,7 @@
type="topic" style="task"
id="net-wireless-troubleshooting">
<info>
- <link type="guide" xref="net#wireless" group="first"/>
+ <link type="guide" xref="net-wireless" group="first"/>
<link type="guide" xref="hardware#problems" group="first"/>
<link type="next" xref="net-wireless-troubleshooting-initial-check"/>
diff --git a/gnome-help/C/net-wireless-wepwpa.page b/gnome-help/C/net-wireless-wepwpa.page
index 9411759..4da5fae 100644
--- a/gnome-help/C/net-wireless-wepwpa.page
+++ b/gnome-help/C/net-wireless-wepwpa.page
@@ -2,7 +2,7 @@
type="topic" style="tip"
id="net-wireless-wepwpa">
<info>
- <link type="guide" xref="net#wireless"/>
+ <link type="guide" xref="net-wireless"/>
<revision pkgversion="3.0" date="2011-04-05" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="final"/>
diff --git a/gnome-help/C/net-wireless.page b/gnome-help/C/net-wireless.page
new file mode 100644
index 0000000..a21ab46
--- /dev/null
+++ b/gnome-help/C/net-wireless.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="guide" style="task 2column"
+ id="net-wireless">
+
+ <info>
+ <revision version="3.2" date="2011-09-30" status="final"/>
+
+ <link type="guide" xref="net" group="#first"/>
+ <link type="seealso" xref="net-general"/>
+ <link type="seealso" xref="net-problem"/>
+
+ <desc>
+ <link xref="net-wireless-connect">Connect to wifi</link>,
+ <link xref="net-wireless-hidden">Hidden networks</link>,
+ <link xref="net-editcon">Edit connection settings</link>,
+ <link xref="net-wireless-disconnecting">Disconnecting</link>...
+ </desc>
+
+ <credit type="author">
+ <name>The Ubuntu Documentation Team</name>
+ </credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ </info>
+
+<title>Wireless Networking</title>
+
+</page>
diff --git a/gnome-help/C/net-wrongnetwork.page b/gnome-help/C/net-wrongnetwork.page
index 5eb7aae..2e02cfa 100644
--- a/gnome-help/C/net-wrongnetwork.page
+++ b/gnome-help/C/net-wrongnetwork.page
@@ -2,7 +2,7 @@
type="topic" style="problem"
id="net-wrongnetwork">
<info>
- <link type="guide" xref="net#problems"/>
+ <link type="guide" xref="net-problem"/>
<link type="seealso" xref="net-editcon"/>
<revision pkgversion="3.0" date="2011-04-05" status="final"/>
<revision pkgversion="3.0" version="3.0.1" date="2011-06-13" status="incorrect"/>
diff --git a/gnome-help/C/net.page b/gnome-help/C/net.page
index 6446ee8..cdffd9d 100644
--- a/gnome-help/C/net.page
+++ b/gnome-help/C/net.page
@@ -7,13 +7,24 @@
<revision pkgversion="3.0" version="3.0.1" date="2011-04-06" status="outdated"/>
<link type="guide" xref="index" group="net"/>
- <link type="guide" xref="web#connections" group="#first" />
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
</credit>
+
+
+ <desc>
+ <link xref="net-wireless">Wireless</link>,
+ <link xref="net-wired">wired</link>,
+ <link xref="net-problem">connection problems</link>,
+ <link xref="net-browser">web browsing</link>,
+ <link xref="net-email">email accounts</link>,
+ <link xref="net-chat">instant messaging</link>...
+ </desc>
+
+<!--
<desc>
<link xref="net#problems">Connection problems</link>,
<link xref="net#wireless">wireless</link>,
@@ -22,57 +33,13 @@
<link xref="net#security">security</link>,
<link xref="net#security">anti-virus</link>...
</desc>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
- </info>
-
-<title>Internet & networking</title>
-
-<section id="problems" style="2column">
- <info>
- <title type="link" role="trail">Troubleshooting</title>
- </info>
- <title>Troubleshooting internet connection problems</title>
-</section>
-
-<section id="wireless" style="2column">
- <info>
- <title type="link" role="trail">Wireless</title>
- </info>
- <title>Wireless connections</title>
-</section>
-
-<section id="wired" style="2column">
- <info>
- <title type="link" role="trail">Wired</title>
- </info>
- <title>Wired connections</title>
-</section>
-
-<section id="sharing" style="2column">
- <info>
- <title type="link" role="trail">Sharing files</title>
- </info>
- <title>Sharing files on the network</title>
-</section>
-<section id="security" style="2column">
- <title>Security</title>
-</section>
-
-<!--
-<section id="mobile" style="2column">
- <info>
- <title type="link" role="trail">Mobile</title>
- </info>
- <title>Mobile internet</title>
-</section>
-->
-<section id="vpn" style="2column">
- <info>
- <title type="link" role="trail">VPN</title>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
- <title>VPN connections</title>
-</section>
+
+<title>Networking, web, email & chat</title>
+<links type="topic" style="toronto"/>
</page>
diff --git a/gnome-help/C/shell-session-status.page b/gnome-help/C/shell-session-status.page
index 77ee4b8..a37b17f 100644
--- a/gnome-help/C/shell-session-status.page
+++ b/gnome-help/C/shell-session-status.page
@@ -5,8 +5,7 @@
<info>
- <link type="guide" xref="shell-overview#desktop" />
- <link type="guide" xref="web#chat" />
+ <link type="guide" xref="net-chat" />
<desc>Change your chat status and hide notifications.</desc>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
