update help text

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/branches/overhaul@1817 f8877401-5920-0410-a79b-8e2d7e04ca0d

3 files changed, 17 insertions, 23 deletions

diff --git a/src/fe/gtk/Bootloader.py b/src/fe/gtk/Bootloader.py
index f3d3726..adbc1b5 100644
--- a/src/fe/gtk/Bootloader.py
+++ b/src/fe/gtk/Bootloader.py
@@ -15,13 +15,14 @@ class Panel(GLIScreen):
 	_helptext = """
 <b><u>Bootloader</u></b>
 
-The bootloaders available depend on the architecture to be installed. For x86,
-the two bootloaders available are grub and lilo.  In amd64, only grub is
+The bootloaders available depend on the architecture to be installed. For x86, \
+the two bootloaders available are grub and lilo.  In amd64, only grub is \
 available. Gentoo recommends grub.
 
-For those who still like lilo, it is available.  Lilo will also detect windows
+For those who still like lilo, it is available.  Lilo will also detect windows \
 partitions (this support for grub coming soon).
-
+"""
+"""
 You almost always will want to check the Install in MBR option, unless you do
 not want your system to be bootable using your bootloader.
 
@@ -48,7 +49,7 @@ you will just leave this blank.
 		vert.set_border_width(10)
 
 		self.tmpbootloaders = self.bootloaders[self.controller.cc.get_arch()]
-		if self.controller.install_type == "advanced":
+		if self.controller.install_type != "networkless":
 			self.tmpbootloaders += self.bootloaders['none']
 
 		hbox = gtk.HBox(False)
diff --git a/src/fe/gtk/NetworkMounts.py b/src/fe/gtk/NetworkMounts.py
index c66e4b6..1875dba 100644
--- a/src/fe/gtk/NetworkMounts.py
+++ b/src/fe/gtk/NetworkMounts.py
@@ -21,21 +21,21 @@ class Panel(GLIScreen):
 	_helptext = """
 <b><u>Network Mounts</u></b>
 
-Here, you can specify network shares to mount during (and after) the install.
-They will be mounted along with the local partitions you specified on the
-previous screen when the install starts. This is useful for using a NFS mounted
+Here, you can specify network shares to mount during (and after) the install. \
+They will be mounted along with the local partitions you specified on the \
+previous screen when the install starts. This is useful for using a NFS mounted \
 /usr/portage.
 
-To start, click the button labeled 'New'. Then, select a mount type. Currently,
-the only supported type is NFS. If you get this choice wrong, you shall be
-shunned. Next, enter a hostname or IP address. Then, you can either enter the
-name of the share/export or click the button next to the field to have it
-auto-populated with the available shares on the host you entered in the box
-above. Enter a local mountpoint and mount options. Click the button labeled
+To start, click the button labeled 'New'. Then, select a mount type. Currently, \
+the only supported type is NFS. If you get this choice wrong, you shall be \
+shunned. Next, enter a hostname or IP address. Then, you can either enter the \
+name of the share/export or click the button next to the field to have it \
+auto-populated with the available shares on the host you entered in the box \
+above. Enter a local mountpoint and mount options. Click the button labeled \
 'Update' to save the new network mount.
 
-To edit an existing mount, select it in the list above. Edit any fields below
-and then click the 'Update' button. You can remove it from the list by clicking
+To edit an existing mount, select it in the list above. Edit any fields below \
+and then click the 'Update' button. You can remove it from the list by clicking \
 the 'Delete' button.
 """
 
diff --git a/src/fe/gtk/Partition.py b/src/fe/gtk/Partition.py
index e196053..455397c 100644
--- a/src/fe/gtk/Partition.py
+++ b/src/fe/gtk/Partition.py
@@ -69,13 +69,6 @@ click the Next button, your partition table will remain untouched.
 		vert = gtk.VBox(False, 0)
 		vert.set_border_width(10)
 
-#		content_str = _("""
-#		On this screen, you will be presented with a list of detected partitionable devices. Selecting
-#		a device will show you the current partitions on it (if any) and allow you to add, remove, and
-#		resize partitions.""")
-#		content_label = gtk.Label(content_str)
-#		vert.pack_start(content_label, expand=False, fill=False, padding=0) # This was removed for screen space
-
 		container = gtk.HBox(False, 0)
 		detected_dev_label = gtk.Label(_("Devices:"))
 		container.pack_start(detected_dev_label, expand=False, fill=False, padding=0)