diff -ur cvs-shadow/contrib/adduser.c shadow-new/contrib/adduser.c
--- cvs-shadow/contrib/adduser.c	1997-09-30 00:00:49.000000000 +0200
+++ shadow-new/contrib/adduser.c	2006-11-01 12:08:49.000000000 +0100
@@ -169,7 +169,7 @@
   if (geteuid () != 0)
     {
       printf ("It seems you don't have access to add a new user.  Try\n");
-      printf ("logging in as root or su root to gain super-user access.\n");
+      printf ("logging in as root or su root to gain superuser access.\n");
       exit (1);
     }
 
diff -ur cvs-shadow/contrib/groupmems.shar shadow-new/contrib/groupmems.shar
--- cvs-shadow/contrib/groupmems.shar	2000-08-26 20:37:32.000000000 +0200
+++ shadow-new/contrib/groupmems.shar	2006-11-01 12:08:49.000000000 +0100
@@ -211,8 +211,8 @@
 #define EXIT_SUCCESS		0	/* success */
 #define EXIT_USAGE		1	/* invalid command syntax */
 #define EXIT_GROUP_FILE		2	/* group file access problems */
-#define EXIT_NOT_ROOT		3	/* not super user  */
-#define EXIT_NOT_EROOT		4	/* not effective super user  */
+#define EXIT_NOT_ROOT		3	/* not superuser  */
+#define EXIT_NOT_EROOT		4	/* not effective superuser  */
 #define EXIT_NOT_PRIMARY	5	/* not primary owner of group  */
 #define EXIT_NOT_MEMBER		6	/* member of group does not exist */
 #define EXIT_MEMBER_EXISTS	7	/* member of group already exists */
@@ -481,11 +481,11 @@
 [\fB-g\fI group_name \fR]
 X.SH DESCRIPTION
 The \fBgroupmems\fR utility allows a user to administer his/her own
-group membership list without the requirement of super user privileges.
+group membership list without the requirement of superuser privileges.
 The \fBgroupmems\fR utility is for systems that configure its users to
 be in their own name sake primary group (i.e., guest / guest).
 X.P
-Only the super user, as administrator, can use \fBgroupmems\fR to alter
+Only the superuser, as administrator, can use \fBgroupmems\fR to alter
 the memberships of other groups.
 X.IP "\fB-a \fIuser_name\fR"
 Add a new user to the group membership list.
@@ -496,7 +496,7 @@
 X.IP "\fB-D\fR"
 Delete all users from the group membership list.
 X.IP "\fB-g \fIgroup_name\fR"
-The super user can specify which group membership list to modify.
+The superuser can specify which group membership list to modify.
 X.SH SETUP
 The \fBgroupmems\fR executable should be in mode \fB2770\fR as user \fBroot\fR
 and in group \fBgroups\fR.   The system administrator can add users to
diff -ur cvs-shadow/man/chfn.1.xml shadow-new/man/chfn.1.xml
--- cvs-shadow/man/chfn.1.xml	2006-11-01 11:54:55.000000000 +0100
+++ shadow-new/man/chfn.1.xml	2006-11-01 12:08:49.000000000 +0100
@@ -33,8 +33,8 @@
       </citerefentry> and similar programs. A normal user may only change
       the fields for her own account, subject to the restrictions in
       <filename>/etc/login.defs</filename>. (The default configuration is to
-      prevent users from changing their fullname.) The super user may change
-      any field for any account. Additionally, only the super user may use
+      prevent users from changing their fullname.) The superuser may change
+      any field for any account. Additionally, only the superuser may use
       the <option>-o</option> option to change the undefined portions of the
       GECOS field.
     </para>
diff -ur cvs-shadow/man/chsh.1.xml shadow-new/man/chsh.1.xml
--- cvs-shadow/man/chsh.1.xml	2006-11-01 11:54:55.000000000 +0100
+++ shadow-new/man/chsh.1.xml	2006-11-01 12:10:05.000000000 +0100
@@ -28,8 +28,8 @@
     <para>
       The <command>chsh</command> command changes the user login shell.
       This determines the name of the user's initial login command. A normal
-      user may only change the login shell for her own account, the super
-      user may change the login shell for any account.
+      user may only change the login shell for her own account, the
+      superuser may change the login shell for any account.
     </para>
 
   </refsect1>
@@ -72,7 +72,7 @@
     <para>
       The only restriction placed on the login shell is that the command
       name must be listed in <filename>/etc/shells</filename>, unless the
-      invoker is the super-user, and then any value may be added. An
+      invoker is the superuser, and then any value may be added. An
       account with a restricted login shell may not change her login shell.
       For this reason, placing <filename>/bin/rsh</filename> in
       <filename>/etc/shells</filename> is discouraged since accidentally
diff -ur cvs-shadow/man/groupmems.8.xml shadow-new/man/groupmems.8.xml
--- cvs-shadow/man/groupmems.8.xml	2006-11-01 11:54:55.000000000 +0100
+++ shadow-new/man/groupmems.8.xml	2006-11-01 12:12:02.000000000 +0100
@@ -27,13 +27,13 @@
     <title>DESCRIPTION</title>
     <para>
       The <command>groupmems</command> command allows a user to administer
-      his/her own group membership list without the requirement of super
-      user privileges. The <command>groupmems</command> utility is for
+      his/her own group membership list without the requirement of
+      superuser privileges. The <command>groupmems</command> utility is for
       systems that configure its users to be in their own name sake primary
       group (i.e., guest / guest).
     </para>
 
-    <para>Only the super user, as administrator, can use
+    <para>Only the superuser, as administrator, can use
       <command>groupmems</command> to alter the memberships of other groups.
     </para>
   </refsect1>
@@ -66,7 +66,7 @@
       <varlistentry>
 	<term><option>-g</option> <replaceable>group_name</replaceable></term>
 	<listitem>
-	  <para>The super user can specify which group membership
+	  <para>The superuser can specify which group membership
 	    list to modify.
 	  </para>
 	</listitem>
diff -ur cvs-shadow/man/passwd.1.xml shadow-new/man/passwd.1.xml
--- cvs-shadow/man/passwd.1.xml	2006-11-01 11:54:55.000000000 +0100
+++ shadow-new/man/passwd.1.xml	2006-11-01 12:11:07.000000000 +0100
@@ -28,7 +28,7 @@
     <para>
       The <command>passwd</command> command changes passwords for user accounts.
       A normal user may only change the password for his/her own account, while
-      the super user may change the password for any account.
+      the superuser may change the password for any account.
       <command>passwd</command> also changes account information, such as
       the full name of the user, the user's login shell, or his/her password
       expiry date and interval.
@@ -40,7 +40,7 @@
 	The user is first prompted for his/her old password, if one is
 	present. This password is then encrypted and compared against the
 	stored password. The user has only one chance to enter the correct
-	password. The super user is permitted to bypass this step so that
+	password. The superuser is permitted to bypass this step so that
 	forgotten passwords may be changed.
       </para>
 
diff -ur cvs-shadow/man/shadow.3.xml shadow-new/man/shadow.3.xml
--- cvs-shadow/man/shadow.3.xml	2006-05-20 14:11:38.000000000 +0200
+++ shadow-new/man/shadow.3.xml	2006-11-01 12:08:49.000000000 +0100
@@ -163,7 +163,7 @@
   <refsect1 id='caveats'>
     <title>CAVEATS</title>
     <para>
-      These routines may only be used by the super user as access to the
+      These routines may only be used by the superuser as access to the
       shadow password file is restricted.
     </para>
   </refsect1>
diff -ur cvs-shadow/man/su.1.xml shadow-new/man/su.1.xml
--- cvs-shadow/man/su.1.xml	2006-11-01 11:54:55.000000000 +0100
+++ shadow-new/man/su.1.xml	2006-11-01 12:08:49.000000000 +0100
@@ -8,7 +8,7 @@
   </refmeta>
   <refnamediv id='name'>
     <refname>su</refname>
-    <refpurpose>change user ID or become super-user</refpurpose>
+    <refpurpose>change user ID or become superuser</refpurpose>
   </refnamediv>
   <refsynopsisdiv id='synopsis'>
     <cmdsynopsis>
@@ -30,7 +30,7 @@
       The <command>su</command> command is used to become another user during
       a login session. Invoked without a <option>username</option>, 
       <command>su</command> defaults to
-      becoming the super user. The optional argument <option>-</option> may
+      becoming the superuser. The optional argument <option>-</option> may
       be used to provide an environment similar to what the user would
       expect had the user logged in directly.
     </para>
@@ -58,7 +58,7 @@
       The current environment is passed to the new shell. The value of
       <envar>$PATH</envar> is reset to <filename>/bin:/usr/bin</filename>
       for normal users, or <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename>
-      for the super user. This may be changed with the
+      for the superuser. This may be changed with the
       <emphasis>ENV_PATH</emphasis> and <emphasis>ENV_SUPATH</emphasis>
       definitions in <filename>/etc/login.defs</filename>.
     </para>
diff -ur cvs-shadow/po/it.po shadow-new/po/it.po
--- cvs-shadow/po/it.po	2006-07-28 19:44:57.000000000 +0200
+++ shadow-new/po/it.po	2006-11-01 12:08:49.000000000 +0100
@@ -18,7 +18,7 @@
 # “(shadow) group file”...............: «file dei gruppi (shadow)»
 # “shadow password”...................: «shadow password»
 # “(shadow) password file”............: «file delle (shadow) password»
-# “super user”........................: «root» o «amministratore»
+# “superuser”.........................: «root» o «amministratore»
 # “user name”.........................: «nome utente»
 #
 msgid ""
diff -ur cvs-shadow/src/groupmems.c shadow-new/src/groupmems.c
--- cvs-shadow/src/groupmems.c	2006-08-03 11:48:59.000000000 +0200
+++ shadow-new/src/groupmems.c	2006-11-01 12:08:49.000000000 +0100
@@ -47,8 +47,8 @@
 #define EXIT_SUCCESS		0	/* success */
 #define EXIT_USAGE		1	/* invalid command syntax */
 #define EXIT_GROUP_FILE		2	/* group file access problems */
-#define EXIT_NOT_ROOT		3	/* not super user  */
-#define EXIT_NOT_EROOT		4	/* not effective super user  */
+#define EXIT_NOT_ROOT		3	/* not superuser  */
+#define EXIT_NOT_EROOT		4	/* not effective superuser  */
 #define EXIT_NOT_PRIMARY	5	/* not primary owner of group  */
 #define EXIT_NOT_MEMBER		6	/* member of group does not exist */
 #define EXIT_MEMBER_EXISTS	7	/* member of group already exists */