fix up help text

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

11 files changed, 90 insertions, 115 deletions

diff --git a/src/fe/gtk/CronDaemon.py b/src/fe/gtk/CronDaemon.py
index e197889..2bf1ae2 100644
--- a/src/fe/gtk/CronDaemon.py
+++ b/src/fe/gtk/CronDaemon.py
@@ -9,14 +9,14 @@ from ProgressDialog import *
 
 class Panel(GLIScreen):
 
-	title = "Logging Daemon"
+	title = "Cron Daemon"
 	active_selection = None
 	radio_crons = {}
 	_helptext = """
-<b><u>Logging Daemon</u></b>
+<b><u>Cron Daemon</u></b>
 
-Pick a cron. The most common choice is syslog-ng. This option is not \
-available in Networkless mode.
+Pick a cron daemon. The most common choice is vixie-cron. This option is \
+not available in Networkless mode.
 """
 	crons = [ "vixie-cron", "fcron", "dcron", "None" ]
 
diff --git a/src/fe/gtk/ExtraPackages.py b/src/fe/gtk/ExtraPackages.py
index d82b483..47567d4 100644
--- a/src/fe/gtk/ExtraPackages.py
+++ b/src/fe/gtk/ExtraPackages.py
@@ -20,20 +20,18 @@ class Panel(GLIScreen):
 	_helptext = """
 <b><u>Extra Packages</u></b>
 
-Packages available via GRP (pre-compiled binaries on the livecd that get copied
-over) are labeled with (GRP), and include all of their dependencies.  For
-instance gnome (GRP) includes all of gnome, including xorg-x11.  Fluxbox,
-however, is not available in GRP and must be compiled.  The list of packages is
-very limited, as Portage has a vast list of available packages.  If you have
-packages you need to install in addition to the list, enter them in a space
-separated list in the text field.  The installer is designed to get you a system
-capable of booting into a graphical environment, not install every single
-package you will ever use.  That would just massively increase the changes of a
-failed package ruining your installation.
+If you're doing a networkless install, all of the packages listed on the right \
+are available for the installer to install directly from the LiveCD (including \
+dependencies) without access to the internet.
 
-If you choose a graphical desktop such as gnome, kde, or fluxbox, be sure to
-choose xdm from the startup services and to set your Display Manager (and/or
-XSession for fluxbox) in the Other Settings screen.
+If you're not doing a networkless install, all of your packages will be \
+compiled from source. The list on the right is by no means comprehensive. If \
+there are other packages you wish to install, enter them below separated by \
+spaces.
+
+If you choose a graphical desktop such as gnome, kde, or fluxbox, be sure to \
+also select xorg-x11 from the list. Otherwise, you will not have a fully \
+functioning graphical environment.
 """
 	
 	# list of packages to emerge from the checked off items.
diff --git a/src/fe/gtk/InstallFailed.py b/src/fe/gtk/InstallFailed.py
index 474ee58..5fdcf52 100644
--- a/src/fe/gtk/InstallFailed.py
+++ b/src/fe/gtk/InstallFailed.py
@@ -12,7 +12,7 @@ class Panel(GLIScreen):
 <b><u>Install Failed</u></b>
 
 Your install has failed for one of numerous reasons. You can find the error in \
-the logfile at /tmp/install.log.failed. Once you determine that the error was \
+the logfile at /tmp/installer.log.failed. Once you determine that the error was \
 not caused by you, please file a bug at http://bugs.gentoo.org/ in the \
 Gentoo Hosted Projects/Installer component.
 """
diff --git a/src/fe/gtk/InstallMode.py b/src/fe/gtk/InstallMode.py
index 3e6d845..af09714 100644
--- a/src/fe/gtk/InstallMode.py
+++ b/src/fe/gtk/InstallMode.py
@@ -17,10 +17,6 @@ Welcome to the GTK+ front-end for the Gentoo Linux Installer. It is highly \
 recommended that you have gone through the manual install process a time or \
 two, or at least read through the install guide.
 
-If you have installed Gentoo Linux previously using this installer and you \
-saved your configuration settings (install profile), you can click the "Load" \
-button to load your previous settings as defaults.
-
 There are 3 install modes you can choose from: Networkless, Standard, and \
 Advanced. The "Networkless" mode is used for installs where you have no access \
 to the internet, or you just want a fast install using what's available on the \
diff --git a/src/fe/gtk/Logger.py b/src/fe/gtk/Logger.py
index d1426ef..74934ee 100644
--- a/src/fe/gtk/Logger.py
+++ b/src/fe/gtk/Logger.py
@@ -15,7 +15,7 @@ class Panel(GLIScreen):
 	_helptext = """
 <b><u>Logging Daemon</u></b>
 
-Pick a logger. The most common choice is syslog-ng. This option is not \
+Pick a logging daemon. The most common choice is syslog-ng. This option is not \
 available in Networkless mode.
 """
 	loggers = [ "syslog-ng", "metalog", "sysklogd" ]
diff --git a/src/fe/gtk/MakeDotConf.py b/src/fe/gtk/MakeDotConf.py
index ba918c5..e41dd63 100644
--- a/src/fe/gtk/MakeDotConf.py
+++ b/src/fe/gtk/MakeDotConf.py
@@ -28,67 +28,67 @@ class Panel(GLIScreen):
 	_helptext = """
 <b><u>Make.conf</u></b>
 
-One of the unique (and best) features of Gentoo is the ability to define flags
-(called USE flags) that determine what components are compiled into
-applications.  For example, you can enable the "alsa" flag and programs that
-have alsa capability will compile in support for alsa.  Otherwise they will
-leave it out, resulting in smaller, faster applications.  The result is a
-finely-tuned OS with no unnecessary components to slow you down.
-
-There are two types of USE flags, local (for only one application), and global
-(for all apps).  The local use flags will tell you which package they refer to
-in the Description.  Note that the names of the USE flags can sometimes be
-misleading since they often refer to only one package.
+One of the unique (and best) features of Gentoo is the ability to define flags \
+(called USE flags) that determine what components are compiled into \
+applications.  For example, you can enable the "alsa" flag and programs that \
+have alsa capability will compile in support for alsa.  Otherwise they will \
+leave it out, resulting in smaller, faster applications.  The result is a \
+finely-tuned OS with no unnecessary components to slow you down. \
+
+There are two types of USE flags, local (for only one application), and global \
+(for all apps).  The local use flags will tell you which package they refer to \
+in the Description.  Note that the names of the USE flags can sometimes be \
+misleading since they often refer to only one package. \
 
 CFLAGS:
 
-The CFLAGS variable defines the optimization flags for the gcc C and C++
-compilers. Although we define those generally here, you will only have maximum
-performance if you optimize these flags for each program separately. The reason
+The CFLAGS variable defines the optimization flags for the gcc C and C++ \
+compilers. Although we define those generally here, you will only have maximum \
+performance if you optimize these flags for each program separately. The reason \
 for this is because every program is different. 
 
-A first setting is the processor, which specifies the name of the target
+A first setting is the processor, which specifies the name of the target \
 architecture.  Select your Proc from the list.
 
-A second one is the -O flag (that is a capital O, not a zero), which specifies
-the gcc optimization class flag. Possible classes are s (for size-optimized),
-0 (zero - for no optimizations), 1, 2 or 3 for more speed-optimization flags
-(every class has the same flags as the one before, plus some extras).  2 is a
+A second one is the -O flag (that is a capital O, not a zero), which specifies \
+the gcc optimization class flag. Possible classes are s (for size-optimized), \
+0 (zero - for no optimizations), 1, 2 or 3 for more speed-optimization flags \
+(every class has the same flags as the one before, plus some extras).  2 is a \
 safe level of optimization.
 
 You can add additional custom CFLAGS with the textbox.
 
-Another popular optimization flag is -pipe (use pipes rather than temporary
+Another popular optimization flag is -pipe (use pipes rather than temporary \
 files for communication between the various stages of compilation).
 
-Mind you that using -fomit-frame-pointer (which doesn't keep the frame pointer
-in a register for functions that don't need one) might have serious
+Mind you that using -fomit-frame-pointer (which doesn't keep the frame pointer \
+in a register for functions that don't need one) might have serious \
 repercussions on the debugging of applications! 
 
 Other:
 
-Select Use unstable only if you are an expert Gentoo user or want to use
-bleeding edge unstable applications.  This is highly NOT recommended because it
-will often result in failed installations due to compilation errors in unstable
+Select Use unstable only if you are an expert Gentoo user or want to use \
+bleeding edge unstable applications.  This is highly NOT recommended because it \
+will often result in failed installations due to compilation errors in unstable \
 applications.
 
-Select Build binary packages if you plan on using the compiled packages
+Select Build binary packages if you plan on using the compiled packages \
 elsewhere (very rarely needed).
 
-DistCC functionality has not yet been implemented with the GTK+ frontend.  If
+DistCC functionality has not yet been implemented with the GTK+ frontend.  If \
 you need this, use gli-dialog, the command-line frontend to GLI.
 
 Select ccache to enable ccache support via CC.
 
-The CHOST variable declares the target build host for your system. This variable
-should already be set to the correct value. Do not edit it as that might break
-your system. If the CHOST variable does not look correct to you, you might be
+The CHOST variable declares the target build host for your system. This variable \
+should already be set to the correct value. Do not edit it as that might break \
+your system. If the CHOST variable does not look correct to you, you might be \
 using the wrong stage3 tarball.
 
-With MAKEOPTS you define how many parallel compilations should occur when you
-install a package. A good choice is the number of CPUs in your system plus one,
-but this guideline isn't always perfect. The syntax for the MAKEOPTS varaible is
-"-jN" where N is the number of parallel compilations (for example: -j2).
+With MAKEOPTS you define how many parallel compilations should occur when you \
+install a package. A good choice is the number of CPUs in your system plus one, \
+but this guideline isn't always perfect. The syntax for the MAKEOPTS varaible is \
+"-jN" where N is the number of parallel compilations (for example: -j2). 
 """
 
 	def __init__(self, controller):
diff --git a/src/fe/gtk/Networking.py b/src/fe/gtk/Networking.py
index d3e9f76..eff3826 100644
--- a/src/fe/gtk/Networking.py
+++ b/src/fe/gtk/Networking.py
@@ -25,18 +25,15 @@ class Panel(GLIScreen):
 	_helptext = """
 <b><u>Networking</u></b>
 
-If you previously set up a network interface in the Pre-install Configuration
-screen, it should show up configured again in the Device list.
-
-All detected interfaces should show up in the list, but you also have the option
-to type in your own interface. Once you select an interface, select DHCP or
-Static Configuration.  Then once you have set your network settings make sure to
+All detected interfaces should show up in the list, but you also have the option \
+to type in your own interface. Once you select an interface, select DHCP or \
+Static Configuration.  Then once you have set your network settings make sure to \
 click Save to add the interface to the list.
 
-Wireless support currently is unavailable, but coming soon!  We even have the
+Wireless support currently is unavailable, but coming soon!  We even have the \
 boxes for it all ready to go.
 
-Don't forget to set a hostname and domain name in the
+Don't forget to set a hostname and domain name in the \
 "Hostname / Proxy Information / Other" tab!
 """
 	
diff --git a/src/fe/gtk/OtherSettings.py b/src/fe/gtk/OtherSettings.py
index ef1ed51..6b2c68b 100644
--- a/src/fe/gtk/OtherSettings.py
+++ b/src/fe/gtk/OtherSettings.py
@@ -22,7 +22,7 @@ class Panel(GLIScreen):
 <b><u>Other Settings</u></b>
 
 Display Manager:
-If you installed gnome, choose gdm. If you installed kde, choose kdm. If you
+If you installed gnome, choose gdm. If you installed kde, choose kdm. If you \
 installed anything else specified in XSession, choose xdm.
 
 Console Font:
@@ -32,18 +32,18 @@ Extended Keymaps:
 You probably don't want to mess with this.
 
 Windowkeys:
-If installing on x86 you are safe with Yes, otherwise you'll probably want to
+If installing on x86 you are safe with Yes, otherwise you'll probably want to \
 say No.
 
 Keymap:
-This defaults to "us" if not set (recommended).  If you don't want an English
+This defaults to "us" if not set (recommended).  If you don't want an English \
 keymap, choose it from the list.
 
 XSession:
 Choose this only if you didn't choose gdm or kdm from the Display Manager list.
 
 Clock:
-If you chose a local timezone, you'll want to choose "local" for the clock
+If you chose a local timezone, you'll want to choose "local" for the clock \
 setting. Otherwise if you chose UTC in the Timezone screen, choose UTC here.
 
 Default Editor:
diff --git a/src/fe/gtk/PortageTree.py b/src/fe/gtk/PortageTree.py
index 30eaa7c..c6f84c5 100644
--- a/src/fe/gtk/PortageTree.py
+++ b/src/fe/gtk/PortageTree.py
@@ -17,31 +17,30 @@ class Panel(GLIScreen):
 	_helptext = """
 <b><u>Portage Tree</u></b>
 
-Portage is probably Gentoo's most notable innovation in software management. 
-When we talk about packages, we often mean software titles that are available
-to the Gentoo users through the Portage tree. The Portage tree is a collection
-of ebuilds, files that contain all information Portage needs to maintain
-software (install, search, query, ...). These ebuilds reside in /usr/portage by
+Portage is probably Gentoo's most notable innovation in software management. \
+When we talk about packages, we often mean software titles that are available \
+to the Gentoo users through the Portage tree. The Portage tree is a collection \
+of ebuilds, files that contain all information Portage needs to maintain \
+software (install, search, query, ...). These ebuilds reside in /usr/portage by \
 default.
 
-Whenever you ask Portage to perform some action regarding software titles, it
-will use the ebuilds on your system as a base. It is therefore important that
-you regularly update the ebuilds on your system so Portage knows about new
+Whenever you ask Portage to perform some action regarding software titles, it \
+will use the ebuilds on your system as a base. It is therefore important that \
+you regularly update the ebuilds on your system so Portage knows about new \
 software, security updates, etc.
 
 There are several ways of obtaining an initial Portage tree.
 
-Normal: This is the normal method of downloading and syncing the Portage tree
+Normal: This is the normal method of downloading and syncing the Portage tree \
 from the Internet.  It will give you the most up-to-date tree.
 
-Webrsync: This is similar to Normal.  It will download via http a dialy Portage
+Webrsync: This is similar to Normal.  It will download via http a dialy Portage \
 snapshot and sync that.
 
-Snapshot: This is if you have a specially-built portage snapshot you want to use
-or if you want to use the copy on the Livecd to save downloading the tree
-(useful for those on dial-up).  This is the least up-to-date way to get an
-initial Portage tree.  It is necessary to choose the Livecd snapshot if you are
-doing a Dynamic or GRP install.
+Snapshot: This is if you have a specially-built portage snapshot you want to use \
+or if you want to use the copy on the Livecd to save downloading the tree \
+(useful for those on dial-up).  This is the least up-to-date way to get an \
+initial Portage tree.
 """
 
 	def __init__(self, controller):
diff --git a/src/fe/gtk/Stage.py b/src/fe/gtk/Stage.py
index 0dc347c..946b43b 100644
--- a/src/fe/gtk/Stage.py
+++ b/src/fe/gtk/Stage.py
@@ -21,22 +21,15 @@ whatever architecture/processor specified in the filename.  While Gentoo still \
 offers stage1 and stage2 tarballs, the official installation method uses only \
 the stage3 tarball.
 
-The Livecd also provides many programs using GRP, which will package up the \
-livecd files and install them as binaries.  This is useful for getting large \
-applications like gnome installed quickly.  If doing a GRP install, the Dynamic \
-stage3 is also recommended.  Dynamic creates a stage3 tarball on the fly from \
-the contents of the Livecd, and does not involve any downloading, but can be a \
-bit slow.
-
-<b>For those doing a networkless installation, you must select "Dynamic" and \
-"GRP Install" from the Stage screen.</b> Otherwise select a stage and click \
-the "..." to browse for a tarball location.
-
-In the URI Browser, select the type (such as http) and then press the "..." next \
+You have the option of either downloading a stage from the internet or letting \
+the installer create a stage3 equivalent on the fly from the contents of the \
+LiveCD, and does not involve any downloading, but it can be a bit slow.
+
+To us the URI Browser, select the type (such as http) and then press the "..." next \
 to Host to choose a mirror address. Once your host has been selected the path \
 below should change automatically and you should be able to browse through the \
 folders to find your stage tarball. The path to the tarballs is usually \
-/releases/{architecture ex. x86}/current/stages/{sub-arch}/filename.tar.bz2 \
+/releases/<architecture ex. x86>/current/stages/<subarch>/filename.tar.bz2
 """
 
 	def __init__(self, controller):
diff --git a/src/fe/gtk/Users.py b/src/fe/gtk/Users.py
index 4cb4e56..1d01904 100644
--- a/src/fe/gtk/Users.py
+++ b/src/fe/gtk/Users.py
@@ -26,24 +26,16 @@ class Panel(GLIScreen):
 	_helptext = """
 <b><u>Users</u></b>
 
-Start off by setting the root password.  This will be the root password on the
-newly-installed system, *NOT* the Livecd. Type it again to verify, and then
-click the Verify button to check your typing.
-
-Once you have clicked Verify you can then click Add user to add a normal user.
-
-Adding a User for Daily Use:
-
-Working as root on a Unix/Linux system is dangerous and should be avoided as
-much as possible. Therefore it is strongly recommended to add a user for
+Working as root on a Unix/Linux system is dangerous and should be avoided as \
+much as possible. Therefore it is strongly recommended to add a user for \
 day-to-day use.
 
-Enter the username and password in respective boxes.  Make sure to type your
-password carefully, it is not verified. All other fields are optional, but
+Enter the username and password in respective boxes.  Make sure to type your \
+password carefully, it is not verified. All other fields are optional, but \
 setting groups is highly recommended.
 
-The groups the user is member of define what activities the user can perform.
-The following table lists a number of important groups you might wish to use:
+The groups the user is member of define what activities the user can perform. \
+The following table lists a number of important groups you might wish to use: \
 
 <u>Group</u> 		<u>Description</u>
 audio 		be able to access the audio devices
@@ -58,12 +50,12 @@ wheel 		be able to use su
 
 Enter them in a comma-separated list in the groups box.
 
-Optinally you may also specify the user's shell.  The default is /bin/bash.  If
-you want to disable the user from logging in you can set it to /bin/false. You
-can also specify the user's home directory (default is /home/username), userid
+Optinally you may also specify the user's shell.  The default is /bin/bash.  If \
+you want to disable the user from logging in you can set it to /bin/false. You \
+can also specify the user's home directory (default is /home/username), userid \
 (default is the next available ID), and a comment describing the user.
 
-Make sure to click Accept Changes to save the changes to your user.  They will
+Make sure to click Accept Changes to save the changes to your user.  They will \
 then show up in the list.
 """