Fix up nomeclature: "the Hurd" vs "GNU/Hurd" etc

1 files changed, 39 insertions, 34 deletions

diff --git a/faq.en.in b/faq.en.in
index fbecac43..fe91c80a 100644
--- a/faq.en.in
+++ b/faq.en.in
@@ -48,36 +48,40 @@ BSG's paper ``Towards a new strategy on OS design'' available at:
 ??	Grammatically speaking, what is the Hurd?
 
 {NHW} ``Hurd'', as an acronym, stands for ``Hird of Unix Replacing
-Daemons.''  And Hird, in turn, stands for ``Hurd of Interfaces
-Representing Depth.''
+Daemons''.  And Hird, in turn, stands for ``Hurd of Interfaces
+Representing Depth''.
 
 When we are referring to the kernel, we say ``Mach'' and use it as a
 proper noun.  For example: ``The GNU Mach kernel uses the device drivers
 found in version 2.0.x of the Linux kernel.''
 
-When we talking about the servers, we say ``the Hurd.''  For instance:
-The ext2 filesystem is provided by the Hurd, not by Mach.  Note, it is
-wrong to say any of the following: ``Hurd'', ``HURD,'' ``The HURD'' or
-``the hurd.''
+When we talking about the servers, we say ``the Hurd''.  For instance:
+The ext2 filesystem is provided by the Hurd, not by Mach.  The name of
+the project is ``the GNU Hurd''.  Note, it is wrong to say any of the
+following: ``Hurd'', ``HURD,'' ``The HURD'' or ``the hurd''.
 
-``The GNU Hurd'' is used when we wish to express the idea of the operating
-system, e.g. ``Currently, Debian is the only distribution of the GNU Hurd.''
+The whole operating system includes not only the kernel and the system
+servers, but also many more programs.  This system is called ``GNU'',
+or ``the GNU operating system''.  The GNU programs can also run on
+other operating system kernels.  We say ``GNU/Hurd'' when we want to
+put emphasis on the fact that this is the GNU system running on top of
+the Hurd.
 
-Finally, there is ``Debian GNU/Hurd.'' This refers to the distribution
-as created by the Debian developers.  For example: ``What do you run on
-your laptop?  Debian GNU/Hurd, of course.''
+Finally, there is ``Debian GNU/Hurd''. This refers to the distribution
+of the GNU system as created by the Debian developers.  For example:
+``What do you run on your laptop?  Debian GNU/Hurd, of course.''
 
-The French have a tendency to say: ``le Hurd.''  That is: masculine
+The French have a tendency to say: ``le Hurd''.  That is: masculine
 singular with a leading capital.
 
 ??	What mailing lists are there?
 
 {NHW} There are four principle mailing lists:
 
-- bug-hurd@gnu.org:  Hurd and Mach development.
-- help-hurd@gnu.org: General Hurd questions.
-- web-hurd@gnu.org:  Maintenance of the hurd webpages at
-  http://hurd.gnu.org
+- bug-hurd@gnu.org:  Development of the Hurd and Mach.
+- help-hurd@gnu.org: General questions about the Hurd.
+- web-hurd@gnu.org:  Maintenance of the Hurd webpages at
+  http://www.gnu.org/software/hurd/hurd.html
 - debian-hurd@lists.debian.org: All things related to Debian GNU/Hurd
   (especially porting issues).
 
@@ -115,9 +119,9 @@ implemented.
 
 ??	Where do I get Debian GNU/Hurd?
 
-{NHW} As the GNU Hurd is an official unstable Debian port, you can
-find the binaries at your local Debian mirror.  There are, however,
-several core packages that do not compile cleanly from source and have
+{NHW} As GNU/Hurd is an official unstable Debian port, you can find
+the binaries at your local Debian mirror.  There are, however, several
+core packages that do not compile cleanly from source and have
 several, unfortunate, hacks.  These can be found at:
 
 	ftp://alpha.gnu.org/pub/hurd/debian.
@@ -166,7 +170,7 @@ BIOS.  As for the latter, GNU Mach does not support loadable kernel
 modules.  Therefore, you will have to compile a new kernel and only
 activate those device drivers that you actually need.
 
-??	What partition type should I use for my GNU Hurd partitions?
+??	What partition type should I use for my GNU/Hurd partitions?
 
 {MB} You should use an ext2 filesystem.  Alternatively, you may use BSD
 style ufs.  The partition type number for ext2fs is 0x83 (this is the
@@ -220,9 +224,9 @@ but still doable.
 ??	How much swap do I need?
 
 {NHW} Generally, a lot; once you run out, Mach panics.  I have at least
-128MB of ram and 256MB of swap on all of my Hurd machines.
+128MB of ram and 256MB of swap on all of machines running GNU/Hurd.
 
-??	Can I share swap space between Linux and the Hurd?
+??	Can I share swap space between GNU/Linux and GNU/Hurd?
 
 {NHW} Yes.  The default pager recognizes and respects Linux swap
 partitions.  It will also swap to a raw partition, i.e. anything that it
@@ -230,12 +234,12 @@ does not recognize as Linux swap.  Therefore: BE CAREFUL.
 
 ??	Why do I get ``Operation not permitted error''?
 
-{MB} You forgot to set the file system owner of the Hurd partition to
-Hurd.  The Hurd uses additional information in the inodes to set
+{MB} You forgot to set the file system owner of the GNU/Hurd partition to
+``hurd''.  The Hurd uses additional information in the inodes to set
 translators.  To make this work, the partition must be marked as ``owned
 by the Hurd''.  This is normally done by passing the `-o hurd' option to
 `mke2fs' when creating ext2 system from other operating systems
-(filesystems created under the Hurd automatically enable this option).
+(filesystems created in GNU/Hurd automatically enable this option).
 If you failed to do this, you can still use the `e2os' script.
 
 ??	After `native-install' is finished, I had to write tthhiiss
@@ -291,7 +295,7 @@ do it for you.
 {MB} Give them to the kernel (i.e. on the GRUB command line) and it will
 pass them down to `serverboot' automatically.
 
-??	Can I use the GNU/Linux version of `e2fsck' on a Hurd partition?
+??	Can I use the GNU/Linux version of `e2fsck' on a GNU/Hurd partition?
 
 {MB} Yes, at least since `e2fsprogs-1.05'.  Check this with `e2fsck -V'
 first.
@@ -307,7 +311,7 @@ about translators.
 
 ??	Where is the documentation?
 
-{NHW} There are neither man pages nor info nodes for Hurd translators
+{NHW} There are neither man pages nor info nodes for the Hurd translators
 and commands.  Documentation lives inside of the binaries and can be
 found by passing the `--help' option to a given command.  For instance:
 
@@ -328,7 +332,7 @@ Read this and ask further questions on the mailing lists.
 {MB} The Hurd has the concept of a not-logged in user.  This user has
 neither user ids nor groups ids.  This stems from the fact that the Hurd
 supports uid and gid sets and one possibility is, of course, the empty
-set.  Rather than deny access in this case, Hurd filesystems offer a
+set.  Rather than deny access in this case, filesystems in the Hurd offer a
 forth permission triplet (i.e. rwx) which is used to determine the
 privileges for users with no credentials.  This, however, needs to be
 enabled on a file by file basis.  By default, the `other' permission
@@ -396,9 +400,10 @@ later).
 ??	Why does X not work?
 
 {MB} Try `export LD_LIBRARY_PATH=/usr/X11R6/lib'.  This is a linker
-issue.  The Hurd system wants to use `RPATH', however, Debian takes
+issue.  GNU/Hurd expects that `RPATH' is used, however, Debian takes
 certain measures to avoid this.  Note that this does not cut it for suid
-binaries because of security implications.
+binaries because of security implications.  We expect to rectify this
+by using `RUNPATH', which is specified in the new ELF standard.
 
 ??	What are these strange pids `2' and `3'?
 
@@ -508,7 +513,7 @@ to ask the translator sitting on /home to change from read-only to
 read/write mode.  Note that the command is being sent to the filesystem
 and not the store (e.g. /dev/hd0s1).
 
-??	When the Hurd crashes, GNU Mach automatically reboots.  Is
+??	When GNU/Hurd crashes, GNU Mach automatically reboots.  Is
 	there anyway I can make it pause so I can write down the error?
 
 {MB} Pass the `-H' option to init (add it to the boot command line), and
@@ -526,13 +531,13 @@ compiled.
 
 ??	Is porting easy?
 
-{NHW} Porting applications to the Hurd is relatively easy assuming the
-application is POSIX compliant as the Hurd does its best to be a
+{NHW} Porting applications to GNU/Hurd is relatively easy assuming the
+application is POSIX compliant as GNU/Hurd does its best to be a
 conforming operating system.
 
 The most common error made by programmers is assuming the MAXPATHLEN and
 PATH_MAX are defined.  On most operating systems this is set to a few
-thousand, however, on the Hurd, there is no maximum and thus, this is
+thousand, however, on GNU/Hurd, there is no maximum and thus, this is
 not set.  The correct thing to do is to submit a patch to the upstream
 author that allocates memory dynamically.