Updated web section
Jeremy Bicha
jeremy at bicha.net
Tue Apr 12 08:06:45 UTC 2011
Here's my patch for gnome-user-docs updating the web section for Ubuntu.
Jeremy
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jeremy at bicha.net-20110412080216-491t9th2m3rhn1jp
# target_branch: bzr+ssh://bazaar.launchpad.net/~ubuntu-core-\
# doc/gnome-user-docs/natty-unity/
# testament_sha1: cc34dae79b086e4a177b08c080725369c232083c
# timestamp: 2011-04-12 04:02:41 -0400
# base_revision_id: mdke at ubuntu.com-20110412070335-sybk5humr2epwz3w
#
# Begin patch
=== modified file 'gnome-help/C/web-default-browser.page'
--- gnome-help/C/web-default-browser.page 2011-04-06 19:22:40 +0000
+++ gnome-help/C/web-default-browser.page 2011-04-12 08:02:16 +0000
@@ -12,7 +12,7 @@
<email>philbull at gmail.com</email>
</credit>
- <desc>Change the default web browser by going to <gui>System Info</gui> in the <gui>System Settings</gui>.</desc>
+ <desc>Change the default web browser by going to <gui>Preferred Applications</gui> in the <gui>System Settings</gui>.</desc>
</info>
<title>Change which web browser websites are opened in</title>
@@ -21,15 +21,15 @@
<steps>
<item>
- <p>Click your name on the top bar and click <gui>System Settings</gui>.</p>
- </item>
-
- <item>
- <p>Open <gui>System Info</gui> and choose <gui>Default Applications</gui> from the list on the left side of the window.</p>
- </item>
-
- <item>
- <p>Choose which web browser you would like links to be opened in by changing the <gui>Web</gui> option.</p>
+ <p>Click the <gui>session indicator</gui> at the far top right of the screen and select <gui>System Settings</gui>.</p>
+ </item>
+
+ <item>
+ <p>In the <em>Personal</em> section, click <gui>Preferred Applications</gui>.</p>
+ </item>
+
+ <item>
+ <p>Choose which web browser you would like links to be opened in by changing the <gui>Web Browser</gui> option.</p>
</item>
</steps>
=== modified file 'gnome-help/C/web-default-email.page'
--- gnome-help/C/web-default-email.page 2011-04-06 19:22:40 +0000
+++ gnome-help/C/web-default-email.page 2011-04-12 08:02:16 +0000
@@ -12,7 +12,7 @@
<email>philbull at gmail.com</email>
</credit>
- <desc>Change the default email client by going to <gui>System Info</gui> in the <gui>System Settings</gui>.</desc>
+ <desc>Change the default email client by going to <gui>Preferred Applications</gui> in the <gui>System Settings</gui>.</desc>
</info>
<title>Change which mail application is used to write emails</title>
@@ -21,15 +21,15 @@
<steps>
<item>
- <p>Click your name on the top bar and click <gui>System Settings</gui>.</p>
- </item>
-
- <item>
- <p>Open <gui>System Info</gui> and choose <gui>Default Applications</gui> from the list on the left side of the window.</p>
- </item>
-
- <item>
- <p>Choose which email client you would like to be used by default by changing the <gui>Mail</gui> option.</p>
+ <p>Click the <gui>session indicator</gui> at the far top right of the screen and select <gui>System Settings</gui>.</p>
+ </item>
+
+ <item>
+ <p>In the <em>Personal</em> section, click <gui>Preferred Applications</gui>.</p>
+ </item>
+
+ <item>
+ <p>Choose which email client you would like to be used by default by changing the <gui>Mail Reader</gui> option.</p>
</item>
</steps>
=== modified file 'gnome-help/C/web-email-virus.page'
--- gnome-help/C/web-email-virus.page 2011-04-06 19:22:40 +0000
+++ gnome-help/C/web-email-virus.page 2011-04-12 08:02:16 +0000
@@ -13,7 +13,7 @@
<email>philbull at gmail.com</email>
</credit>
- <desc>Change the default email client by going to <gui>System Info</gui> in the <gui>System Settings</gui>.</desc>
+ <desc>Viruses are unlikely to infect your Linux computer but could infect other people you email.</desc>
</info>
<title>Do I need to scan my emails for viruses?</title>
=== modified file 'gnome-help/C/web-install-flash.page'
--- gnome-help/C/web-install-flash.page 2011-04-06 19:22:40 +0000
+++ gnome-help/C/web-install-flash.page 2011-04-12 08:02:16 +0000
@@ -19,42 +19,31 @@
<p><app>Flash</app> is a <em>plug-in</em> for your web browser which allows you to watch videos and use interactive web pages on some websites. Some websites won't work without Flash.</p>
-<p>If you do not have Flash installed, you will probably see a message telling you so when you visit a website that needs it. Flash is available as a free (but not open-source) download for most web browsers. Most Linux distributions have a version of Flash that you can install through their software installer (package manager) too.</p>
+<p>If you do not have Flash installed, you will probably see a message telling you so when you visit a website that needs it. Flash is available as a free (but not open-source) download for most web browsers.</p>
<steps>
- <title>If Flash is available from the software installer:</title>
- <item>
- <p>Open the software installer application and search for <input>flash</input>.</p>
- </item>
- <item>
- <p>Look for the <gui>Adobe Flash plug-in</gui>, <gui>Adobe Flash Player</gui> or similar and click to install it.</p>
+ <title>How to Install Flash</title>
+ <item>
+ <p>Click <link href="apt:flashplugin-installer">this link</link> to launch the <app>Software Center</app>.</p>
+ </item>
+ <item>
+ <p>Read the information and reviews to make sure you want to install.</p>
+ </item>
+ <item>
+ <p>If you choose to install Flash, click <gui>Install</gui> from the Software Center window.</p>
</item>
<item>
<p>If you have any web browser windows open, close them and then re-open them. The web browser should realize that Flash is installed when you open it again and you should now be able to view websites using Flash.</p>
</item>
</steps>
-<steps>
- <title>If Flash <em>is not</em> available from the software installer:</title>
- <item>
- <p>Go to the <link href="http://get.adobe.com/flashplayer">Flash Player download website</link>. Your browser and operating system should be automatically detected.</p>
- </item>
- <item>
- <p>Click where it says <gui>Select a version to download</gui> and choose the type of software installer that works for your Linux distribution. If you don't know which to use, choose the <file>.tar.gz</file> option.</p>
- </item>
- <item>
- <p>Look at the <link href="http://www.adobe.com/products/flashplayer/productinfo/instructions/">installation instructions for Flash</link> to learn how to install it for your web browser.</p>
- </item>
-</steps>
-
<section id="alternatives">
<title>Open-source alternatives to Flash</title>
<p>A handful of free, open-source alternatives to Flash are available. These tend to work better than the Flash plug-in in some ways (for example, by handling sound playback better), but worse in others (for example, by not being able to display some of the more complicated Flash pages on the web).</p>
<p>You might like to try one of these out if you are dissatisfied with the Flash player, or would like to use as much open-source software as possible on your computer. Here are a few of the options:</p>
<list>
- <item><p>Gnash</p></item>
- <item><p>LightSpark</p></item>
- <item><p>SWFdec (no longer being updated)</p></item>
+ <item><p><link href="apt:browser-plugin-gnash">Gnash</link></p></item>
+ <item><p><link href="apt:browser-plugin-lightspark">LightSpark</link></p></item>
</list>
</section>
=== modified file 'gnome-help/C/web-install-moonlight.page'
--- gnome-help/C/web-install-moonlight.page 2011-04-06 19:22:40 +0000
+++ gnome-help/C/web-install-moonlight.page 2011-04-12 08:02:16 +0000
@@ -21,10 +21,27 @@
<p>If you view a Silverlight-enabled website but don't have the plug-in installed, you will probably see a message telling you so. This message should have instructions telling you how to get the plug-in, but these instructions might not be suitable for your web browser or version of Linux.</p>
-<p>If you want to view Silverlight-enabled websites, you should install the <em>Moonlight</em> plug-in instead. This is a free, open-source version of Silverlight which runs on Linux.</p>
-
-<p>Some Linux distributions have a copy of Moonlight that you can install using their software installer; just open the installer and search for <input>Silverlight</input> or <input>Moonlight</input>.</p>
-
-<p>If your distribution doesn't have a Moonlight software package, see the <link href="http://www.mono-project.com/Moonlight">Moonlight website</link> for more information and installation instructions.</p>
+<p>If you want to view Silverlight-enabled websites, you should install the <em>Moonlight</em> plug-in instead. This is a free, open-source version of Silverlight which runs on Linux. Moonlight is not installed by default in Ubuntu.</p>
+
+<steps>
+ <title>How to Install Moonlight for Mozilla Firefox</title>
+ <item>
+ <p>Click <link href="apt:moonlight-plugin-mozilla">this link</link> to launch the <app>Software Center</app>.</p>
+ </item>
+ <item>
+ <p>Read the information and reviews to make sure you want to install.</p>
+ </item>
+ <item>
+ <p>If you choose to install Moonlight, click <gui>Install</gui> from the Software Center window.</p>
+ </item>
+ <item>
+ <p>If you have any web browser windows open, close them and then re-open them. The web browser should realize that Moonlight is installed when you open it again and you should now be able to view Silverlight websites.</p>
+ </item>
+</steps>
+
+<note>
+ <p>If you have installed Google Chrome or Chromium, you will also need to install
+<link href="apt:moonlight-plugin-chromium">this file</link> to use Moonlight on that browser.</p>
+</note>
</page>
# Begin bundle
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
More information about the ubuntu-doc
mailing list