Fix my email address/copyright information in the documentation.

1 files changed, 16 insertions, 19 deletions

diff --git a/docs/C/gdm.xml b/docs/C/gdm.xml
index 8ad3046d..c5103019 100644
--- a/docs/C/gdm.xml
+++ b/docs/C/gdm.xml
@@ -54,7 +54,7 @@
       <author role="maintainer">
         <firstname>Brian</firstname><surname>Cameron</surname>
         <affiliation>
-          <address><email>Brian.Cameron@Sun.COM</email></address>
+          <address><email>Brian.Cameron@Oracle.COM</email></address>
         </affiliation>
       </author>
     </authorgroup>
@@ -77,12 +77,8 @@
     </copyright>
     <copyright>
       <year>2003</year>
-      <year>2004</year>
-      <year>2005</year>
-      <year>2006</year>
-      <year>2007</year>
-      <year>2008</year>
-      <holder>Sun Microsystems, Inc.</holder>
+       <year>2011</year>
+       <holder>Oracle and/or its affiliates. All rights reserved.</holder>
     </copyright>
 
     &legal;
@@ -328,9 +324,9 @@
         The greeter program also provides buttons which allow the user to
         shutdown or restart the system.  It is possible to configure GDM to not
         provide the shutdown and restart buttons, if desired.  GDM can also be
-        configured via PolicyKit (or via RBAC on Solaris) to require the user
-        have appropriate authorization before accepting the shutdown or restart
-        request.
+        configured via PolicyKit (or via RBAC on Oracle Solaris) to require the
+        user have appropriate authorization before accepting the shutdown or
+        restart request.
       </para>
 
       <para>
@@ -870,7 +866,7 @@ gdm: .your.domain
       </para>
 
       <para>
-        For example, on Solaris, the "solaris.system.shutdown"
+        For example, on Oracle Solaris, the "solaris.system.shutdown"
         authorization is used to control this.  Simply modify the 
         <filename>/etc/user_attr</filename> file so that the "gdm"
         user has this authorization.
@@ -1311,14 +1307,15 @@ TimedLogin=you
               <para>
                 When this key is true, GDM will call fgetpwent() to get a list
                 of local users on the system.  Any users with a user id less
-                than 500 (or 100 if running on Solaris) are filtered out.  The
-                Face Browser also will display any users that have previously
-                logged in on the system  (for example NIS/LDAP users).  It gets
-                this list via calling the <command>ck-history</command>
-                ConsoleKit interface.  It will also filter out any users which
-                do not have a valid shell (valid shells are any shell that
-                getusershell() returns - /sbin/nologin or /bin/false are
-                considered invalid shells even if getusershell() returns them).
+                than 500 (or 100 if running on Oracle Solaris) are filtered
+                out.  The Face Browser also will display any users that have
+                previously logged in on the system  (for example NIS/LDAP
+                users).  It gets this list via calling the
+                <command>ck-history</command> ConsoleKit interface.  It will
+                also filter out any users which do not have a valid shell
+                (valid shells are any shell that getusershell() returns -
+                /sbin/nologin or /bin/false are considered invalid shells even
+                if getusershell() returns them).
               </para>
 
               <para>