Updated web section

[Jeremy Bicha]

Here's another patch, building off Jim's work on unifying the web & net
sections.

Jeremy

On 12 April 2011 18:57, Jim Campbell <jwcampbell at gmail.com> wrote:

> Thanks, Jeremy!
>
> I've committed this patch, as well as your keyboard-shortcuts patch.  I
> made a few updates to the content on this patch, but it was very good,
> overall.
>
> Thanks again for your work!
>
> Jim
>
> On Tue, Apr 12, 2011 at 3:06 AM, Jeremy Bicha <jeremy at bicha.net> wrote:
>
>>  Here's my patch for gnome-user-docs updating the web section for Ubuntu.
>>
>> Jeremy
>>
>> --
>> ubuntu-doc mailing list
>> ubuntu-doc at lists.ubuntu.com
>> https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc
>>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/ubuntu-doc/attachments/20110414/9c73d0de/attachment.html>
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jeremy at bicha.net-20110414220212-5c3x5z4kp0ipjgp8
# target_branch: bzr+ssh://bazaar.launchpad.net/~ubuntu-core-\
#   doc/gnome-user-docs/natty/
# testament_sha1: fd963b3e14991f463790daa589c51517c5d57dab
# timestamp: 2011-04-14 18:14:07 -0400
# base_revision_id: jwcampbell at gmail.com-20110413213806-\
#   eeiyrr1dvnpxc1fd
# 
# Begin patch
=== modified file 'gnome-help/C/net.page'
--- gnome-help/C/net.page	2011-04-13 21:10:14 +0000
+++ gnome-help/C/net.page	2011-04-14 22:02:12 +0000
@@ -12,22 +12,24 @@
       <name>Shaun McCance</name>
       <email>shaunm at gnome.org</email>
     </credit>
+    <credit type="author">
+      <name>Ubuntu Documentation Team</name>
+      <email>ubuntu-doc at lists.ubuntu.com</email>
+    </credit>
 
     <desc>
       <link xref="net#wireless">Wireless</link>,
       <link xref="net#wired">wired</link>,
       <link xref="net#problems">connection problems</link>,
+      <link xref="net#browser">browser plug-ins</link>,
+      <link xref="net#email">email accounts</link>,
+      <link xref="net#chat">starting chats</link>,
       <link xref="net#sharing">sharing files</link>,
-      <link xref="net#security">security</link>,
-      <link xref="net#security">anti-virus</link>...
-      <link xref="web#connections">Internet connections</link>,
-      <link xref="web#chat">starting chats</link>,
-      <link xref="web#email">email accounts</link>,
-      <link xref="web#browser">plug-ins</link>...
+      <link xref="net#security">security</link>...
     </desc>
   </info>
 
-<title>Networking, email, web & chat</title>
+<title>Networking, web, email & chat</title>
 
 <section id="wireless" style="2column">
   <info>
@@ -50,6 +52,25 @@
   <title>Troubleshooting internet connection problems</title>
 </section>
 
+<section id="browser" style="2column">
+  <info>
+    <title type="link" role="trail">Web</title>
+  </info>
+ <title>Browsing the web</title>
+</section>
+
+<section id="email" style="2column">
+ <title>Email</title>
+</section>
+
+
+<section id="chat" style="2column">
+  <info>
+    <title type="link" role="trail">Chat</title>
+  </info>
+ <title>Chat (instant messaging)</title>
+</section>
+
 <section id="sharing" style="2column">
   <info>
     <title type="link" role="trail">Sharing files</title>
@@ -77,22 +98,4 @@
   <title>VPN connections</title>
 </section>
 
-<section id="chat" style="2column">
-  <info>
-    <title type="link" role="trail">Chat</title>
-  </info>
- <title>Chat (instant messaging)</title>
-</section>
-
-<section id="email" style="2column">
- <title>Email</title>
-</section>
-
-<section id="browser" style="2column">
-  <info>
-    <title type="link" role="trail">Web</title>
-  </info>
- <title>Browsing the web</title>
-</section>
-
 </page>

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbW/uwQAAfTfgFAQWWf//14R
BoC//9/wUASYU3rUNwVsM7uYSSQmRppiZTyZGqflMp+RTMpmoA9CeoMomTAU8TU0gyB6gGgNBoAB
JEEaTRkBkTSZPRNNDaTRptRk0yHMABMAATAAAAAASRSeQGmqeSJvVHqfhKNPKGg9TIABARzEW1MZ
GytHy7sTElgywobIJDG2wc1M4FbBZhGyNmO2N9U55xJOJePnZs41szJcvEIZKnqvjAyzeUXu0PdG
euI7vNrw7869v7fp8+vy5tv8pWvLHc/o7O6CkayNHoG1zjpiVWXa932Q8blIdr6piBg2Kq/pXJ93
YIRbRWSblSps2f27V64ciaSvwCW9KQNPytrd0b0LGNWfPBE63QaChcyXBjezapaREBhS63gIiOZl
iOUipLS/oRjEjoFaipgpwfwrSMTq6K7RFIyiFq5txfIBhYGeQmVg7KRepuefHZQxpNEtfWxpRi/W
XWVWCfARuFcpkIbxMucMBVyyrgFROIWBFSiU3ErYllwGiIEOjfpeX2FwUuRMJtGCDBYScVLBElCs
ID6M5uhJryRce4s0GybQlPATFKT9xT0wzDMZRSJ3RQaakRSiLq1thaEDqDXJCEPN4VSYoGVrIQaN
sMljFtltSnSZloTMhZksGsLoZpxeUJhsiTdNNpkgnU2b7/TKda6ocV2b20d8KeE7BmdDqBBPVzox
NLLtaBuBlBcJ9sc3gPJhhxnXyBh2TE2UtCTBvllYZm5Xd1qY4QnCDQYyRzMGHGIwHTvHDXj0dWBL
PSXroC9wbVOMB7IYLDxyCm2MOdqHxtYGHezdxipmcVMaA8Dy/KVtsf47dTBB0W+qMXmOcSvGXcIK
OBHy2YIJ57jO/zXqirx68p6BMw+xI1eMc3LMoE18uYXr48k/x4Eh1Ipol9zBcXH0B7Xq3bN8MHSi
U56FOtLkzIGfp82c/oCX2ex92uKbgHWbWLiC7cnqmquyIgz608zNu8nHMKVi/flw+ekRd3TgrCjC
93v3Sg38dCqSVP9uC1Q7Dkcn2zOBYJ9g5F55OPnwQxzHDv4iOgXXma0U4i0P65M2yDFO1JUuLT7b
Ep4da7p0OBQhYKBPkGXA1ktPGfcIt9ivVZQKJk3OLsCl5IFw2Haqo9RwGul3CcPNkJmDILfEWwiQ
SCThQnCbsN7l0KBFGswwMA46ZXB6GUuyQEdwZh9nN6gEFV264HljBRFEqAjAIpkqZ4aVlINHEPAV
NTUURQUsImGacruE97pk64o0P9itQNQbMkc3z0uCPrGrX1VoiDVtWIraRNZWG1zJ4WCjoFBqjhpV
dBEylTFjwazJz9B+gcBEiSPBw/jqM4QWFTierAui4DM81Rzi/I5Hx2cJwz6ECyt0BMTlE5ntCrYn
0EouTEQYHUHhiZ072Vnwa6mrdaNDWLWaxMF8wUwmu4Z6nrZQodRoJxV6dYZ78dup1jwVdkDKc1ML
V3hUTtDwFotwUrbrpYZ0pOl1roL6TuDf8XckU4UJC1v7sEA=