Merge lp:~clissold345/ubuntu-docs/fix-for-1658785 into lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10

[Chris Perry]

I've only mentioned Ubuntu One briefly. Logging in or registering with Ubuntu One is very straightforward and in this context it's not the main task (which is installing or removing an application).

I was a bit concerned that for snaps the user has to enter two passwords. So I've spelled out that the second password is the Ubuntu password not the Ubuntu One password.

I thought it was a good idea to mention that Synaptic doesn't list snaps - though I haven't updated the Synaptics page (addremove-install-synaptic.html) to mention snaps.

I removed the step about internet access. Synaptics must require internet access but we don't mention that on the Synaptics page (addremove-install-synaptic.html), so why mention it here?

I went through the steps in both procedures pretty carefully and made a few changes that had nothing to do with snaps. Eg I prefer a step in a procedure to start "do such and such" or "if condition, do such and such" so I made some minor revisions to the two procedures.

[Gunnar Hjalmarsson (gunnarhj)]

Thanks for your work on this. Two things:

"Ubuntu password" is vague. First I wondered what it was about. "user password" is better IMO. You find an example of a more precise description on e.g. prefs-language-install.page.

Nothing was added to the launcher when I tested (on zesty).

review: Needs Fixing

[lp:~clissold345/ubuntu-docs/fix-for-1658785]

597. By Chris Perry on 2017-02-13

Snap documentation in 17.04; LP: #1658785

[Chris Perry (clissold345)]

Yes "user password" is OK. I still like the text in brackets because it (surely) makes it impossible for anyone to confuse the two passwords.

Thanks for checking the procedures on 17.04. I was using 16.04. I'm planning to install the beta of 17.04 when it's available and do some checks on the help.

[Gunnar Hjalmarsson (gunnarhj)]

Looks good now. Thanks!

review: Approve

=== modified file 'ubuntu-help/C/addremove-install.page'
--- ubuntu-help/C/addremove-install.page	2016-11-04 00:28:33 +0000
+++ ubuntu-help/C/addremove-install.page	2017-02-13 21:02:57 +0000
@@ -31,8 +31,17 @@
    </p>
 
    <p>
+    Applications are available in two formats: snap packages and Debian packages.
+    An application available as a snap package is from now on referred to as a <em>snap</em>.
+    In order to install (or remove) a snap you have to log on to Ubuntu One. Some 
+    applications are available in both formats. In such a case in <app>Ubuntu Software</app> the snap will be
+    listed first.
+   </p>
+
+   <p>
     You may also wish to install software that does not have a GUI. To install
     such software, you can use <link xref="addremove-install-synaptic">Synaptic</link>.
+    Note that <app>Synaptic</app> does not list snaps.
   </p>
 
   <p>
@@ -42,13 +51,6 @@
   <steps>
     <item>
       <p>
-        Connect to the Internet using a <link 
-        xref="net-wireless-connect">wireless</link> or <link 
-        xref="net-wired-connect">wired connection</link>.
-      </p>
-    </item>
-    <item>
-      <p>
         Click the <app>Ubuntu Software</app> icon in the <gui>Launcher</gui>, or search
         for <input>Software</input> in the search bar of the <gui>Dash</gui>.
       </p>
@@ -61,27 +63,28 @@
     </item>
     <item>
       <p>
-        Select the application that you are interested in and click 
+        Select the application that you want to install and click 
         <gui>Install</gui>.
       </p>
     </item>
-    <item>
+
+   <item>
       <p>
-        You will be asked to enter your password. Once you have done that the 
-        installation will begin.
+        If you're installing a snap, log on to Ubuntu One.
       </p>
     </item>
+
+
     <item>
       <p>
+        You will be asked to authenticate by entering your password (that is, your user password, not your Ubuntu One password). 
+        Once you have done that the installation will begin. 
         The installation usually finishes quickly, but could take a while if you 
         have a slow Internet connection.
       </p>
-    </item>
-    <item>
-      <p>
-        A shortcut to your new app will be added to the Launcher.
-      </p>
-    </item>
+
+    </item>
+
   </steps>
   
 </page>
 
=== modified file 'ubuntu-help/C/addremove-remove.page'
--- ubuntu-help/C/addremove-remove.page	2016-11-04 00:28:33 +0000
+++ ubuntu-help/C/addremove-remove.page	2017-02-13 21:02:57 +0000
@@ -23,9 +23,15 @@
     You can use <app>Ubuntu Software</app> to remove applications that you 
     no longer use.</p>
 
+   <p>Applications are available in two formats: snap packages and Debian packages. 
+   An application available as a snap package is from now on referred to as a <em>snap</em>.
+   In order to remove (or install) a snap you have to log on to Ubuntu One.
+   Some applications are available in both formats. In such a case in <app>Ubuntu Software</app> the snap will be listed first.</p> 
+
+
    <p>You may also wish to remove software that does not have a GUI.
     To remove such software, you can use
-    <link xref="addremove-install-synaptic">Synaptic</link>.
+    <link xref="addremove-install-synaptic">Synaptic</link>. Note that <app>Synaptic</app> does not list snaps.
   </p>
 
   <p>To remove an application:</p>
@@ -49,17 +55,34 @@
         by looking through the list of installed applications.
       </p>
     </item>
+
     <item>
       <p>
         Select the application and click <gui>Remove</gui>.
       </p>
     </item>
-    <item>
-      <p>
-        You may be asked to enter your password. After you have done that, the 
-        application will be removed.
-      </p>
-    </item>
+
+    <item>
+      <p>
+        Confirm that you want to remove the application.
+      </p>
+    </item>
+
+
+    <item>
+      <p>
+    If you're removing a snap, log on to Ubuntu One. 
+      </p>
+    </item>
+
+
+    <item>
+      <p>
+        You will be asked to authenticate by entering your password (that is, your user password, not your Ubuntu One password).
+        After you have done that, the application will be removed.
+      </p>
+    </item>
+
   </steps>
 
   <note>
 
=== modified file 'ubuntu-help/C/disk-partitions.page'
--- ubuntu-help/C/disk-partitions.page	2017-01-17 10:26:26 +0000
+++ ubuntu-help/C/disk-partitions.page	2017-02-13 21:02:57 +0000
@@ -46,12 +46,12 @@
  </item>
  <item>
   <p> In the left pane, you will find a list of hard disks,
-  CD/DVD drives, and other physical devices. Select the device that you want to
+  CD/DVD drives, other physical devices, and loop devices. Select the device that you want to
   inspect.</p>
  </item>
  <item>
   <p> In the right pane, the area labeled <gui>Volumes</gui> provides a visual
-  breakdown of the volumes and partitions present on the selected device. It
+  breakdown of the volumes and partitions (if any) present on the selected device. It
   also contains a variety of tools used to manage these volumes.</p>
 
   <p>Be careful: it is possible to completely erase the data on your disk with