From d143fce7f72e4f9211291e59402b1fbfe01de0fc Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Mon, 03 Nov 2014 20:56:11 -0500
Subject: docs: encrypted_trisquel.html Ease of use improvements

Advise the user to select a desktop during install.
Other small changes.
---
diff --git a/docs/howtos/encrypted_trisquel.html b/docs/howtos/encrypted_trisquel.html
index f888a73..91fa751 100644
--- a/docs/howtos/encrypted_trisquel.html
+++ b/docs/howtos/encrypted_trisquel.html
@@ -149,13 +149,19 @@
 	<h1>Tasksel</h1>
 
 		<p>
-			Just continue here, without selecting anything. You can install everything later (it's really easy).
+			Choose <i>&quot;Trisquel Desktop Environment&quot;</i> if you want GNOME, 
+			<i>&quot;Trisquel-mini Desktop Environment&quot;</i> if you
+			want LXDE or <i>&quot;Triskel Desktop Environment&quot;</i> if you want KDE. 
+			If you want to have no desktop (just a basic shell)
+			when you boot or if you want to create your own custom setup, then choose nothing here (don't select anything). 
+			You might also want to choose some of the other package groups; it's up to you.
 		</p>
 
 	<h1>Install the GRUB boot loader to the master boot record</h1>
 
 		<p>
 			Choose 'Yes'. It will fail, but don't worry. Then at the main menu, choose 'Continue without a bootloader'.
+			You could also choose 'No'. Choice is irrelevant here.
 		</p>
 
 		<p>
@@ -264,38 +270,10 @@
 			$ <b>sudo apt-get upgrade</b>
 		</p>
 
-	<h1>
-		Install a desktop (optional)
-	</h1>
-
-		<p>
-			Installs the default desktop:<br/>
-			$ <b>sudo apt-get install trisquel</b>
-		</p>
-
-		<p>
-			It might ask for postfix configuration. I just choose 'No configuration'.
-		</p>
-
-		<p>
-			Next time you boot, it'll start lightdm and you can login. To start lightdm now, do:<br/>
-			$ <b>sudo service lightdm start</b>
-		</p>
-
-		<p>
-			Go back to the terminal (ctrl-alt-f1) and exit:<br/>
-			$ <b>exit</b>
-		</p>
-
-		<p>
-			Go back to lightdm (ctrl-alt-f7) and login.
-		</p>
+	<h1>Postfix configuration</h1>
 
 		<p>
-			Since you installed using net install and you only installed the base system, network-manager isn't controlling
-			your eth0 but instead /etc/network/interfaces is. Comment out the eth0 lines in that file, and then do:<br/>
-			$ <b>sudo /etc/init.d/networking stop</b><br/>
-			$ <b>sudo service network-manager restart</b>
+			Choose <i>&quot;No Configuration&quot;</i> here (or maybe you want to select something else. It's up to you.)
 		</p>
 
 	<h1>
--
cgit v0.9.1