From 329bb84da0da32f7351e5eaa7fe2928d80140bcd Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sat, 24 Jan 2004 07:58:44 +0000 Subject: [PATCH] Remove all trailing whitespace. This is a whitespace commit only, so translators can ignore this. --- en/gnome/contact.sgml | 12 ++-- en/gnome/docs/bugging.sgml | 70 ++++++++++---------- en/gnome/docs/faq2.sgml | 104 +++++++++++++++--------------- en/gnome/docs/gnome2_porting.sgml | 22 +++---- en/gnome/docs/gnome_porting.sgml | 4 +- en/gnome/docs/knownissues.sgml | 18 +++--- en/gnome/docs/porting.sgml | 62 +++++++++--------- en/gnome/docs/volunteer.sgml | 14 ++-- en/gnome/includes.xsl | 12 ++-- en/gnome/news.xml | 72 ++++++++++----------- en/gnome/newsflash.xsl | 16 ++--- en/gnome/rss.xsl | 6 +- en/gnome/screenshots.sgml | 6 +- 13 files changed, 209 insertions(+), 209 deletions(-) diff --git a/en/gnome/contact.sgml b/en/gnome/contact.sgml index ca6d5b226c..d7cddcac6b 100644 --- a/en/gnome/contact.sgml +++ b/en/gnome/contact.sgml @@ -1,6 +1,6 @@ - + %gnomeincludes; %includes; @@ -15,9 +15,9 @@ freebsd-gnome mailing list. All FreeBSD GNOME users, as well as those who wish to help improve and maintain GNOME on FreeBSD should feel free to - join. - However, you do not have to subscribe if you just want to - report a problem or ask for help - just send your message + join. + However, you do not have to subscribe if you just want to + report a problem or ask for help - just send your message to &email;@FreeBSD.org.

All relevant discussions should be carried out in the mailing list, @@ -27,12 +27,12 @@

-

FreeBSD GNOME developers can also be found lurking on IRC. +

FreeBSD GNOME developers can also be found lurking on IRC. So please join #freebsd-gnome on FreeNode if you would like to discuss GNOME on FreeBSD.

diff --git a/en/gnome/docs/bugging.sgml b/en/gnome/docs/bugging.sgml index 251bc0a579..51f2191606 100644 --- a/en/gnome/docs/bugging.sgml +++ b/en/gnome/docs/bugging.sgml @@ -1,6 +1,6 @@ - + %gnomeincludes; %includes; @@ -12,18 +12,18 @@

1. What to report?

The rule of the thumb is: report as much information as you - can. Even if there is some irrelevant information - developers can easily filter it out. On the contrary, the - situation is much worse when there is too little information to - reliably track down or reproduce the problem - in this case - developers have to spend their time guessing and/or asking + can. Even if there is some irrelevant information + developers can easily filter it out. On the contrary, the + situation is much worse when there is too little information to + reliably track down or reproduce the problem - in this case + developers have to spend their time guessing and/or asking originator of report to send more information.

-

There are plenty of examples of totally useless bug reports, - something like "Hey, gnomefoo port is broken. I'm running - FreeBSD-X.Y. Please fix." Needless to say, that such a report - is just a waste of your time, time of the appropriate developer, - and network bandwidth. At a bare minimum the report should +

There are plenty of examples of totally useless bug reports, + something like "Hey, gnomefoo port is broken. I'm running + FreeBSD-X.Y. Please fix." Needless to say, that such a report + is just a waste of your time, time of the appropriate developer, + and network bandwidth. At a bare minimum the report should include the following information:

@@ -73,8 +73,8 @@ information.

If you have a solution or a workaround for the problem then include - it into your report as well, even if you are not quite sure that - this is a correct fix. If it is not it could still give the + it into your report as well, even if you are not quite sure that + this is a correct fix. If it is not it could still give the developer an idea about what to look at; and save them some time.

@@ -88,35 +88,35 @@ your solution much faster.

-

Once you are sure this is a new problem, there are several ways - to report a bug in GNOME running on FreeBSD: you could +

Once you are sure this is a new problem, there are several ways + to report a bug in GNOME running on FreeBSD: you could send a report to the freebsd-gnome mailing list, file a problem report in the FreeBSD bug reporting system, send your report to the particular GNOME developers via their - bug tracking system, or + bug tracking system, or any combination of those.

-

It is impossible to define guidelines that will clearly tell you - where to report in each particular case - you have to use your own +

It is impossible to define guidelines that will clearly tell you + where to report in each particular case - you have to use your own common sense, however some rules follow:

diff --git a/en/gnome/docs/faq2.sgml b/en/gnome/docs/faq2.sgml index fb3b8d7eaf..66f4a37fc5 100644 --- a/en/gnome/docs/faq2.sgml +++ b/en/gnome/docs/faq2.sgml @@ -1,6 +1,6 @@ - + %gnomeincludes; %includes; @@ -11,15 +11,15 @@

Contents

  1. How do I get GNOME &gnomever; for FreeBSD? -
  2. GNOME &gnomever; is failing to build from ports. What +
  3. GNOME &gnomever; is failing to build from ports. What do I do? -
  4. I installed GNOME &gnomever;, but I am missing +
  5. I installed GNOME &gnomever;, but I am missing application foo. What gives?
  6. What is the best way to upgrade from GNOME 1.4 to GNOME 2?
  7. What is the best way to upgrade from GNOME 2.2 to GNOME &gnomever;? -
  8. How do I keep my GNOME &gnomever; components +
  9. How do I keep my GNOME &gnomever; components and applications up-to-date?
  10. Can I install GNOME 1.4 applications under GNOME &gnomever;? @@ -30,7 +30,7 @@
  11. How can I control what fonts are anti-aliased?
  12. How do I edit my GNOME 2 menus? -
  13. How do I use GTK+ 2 resource settings for +
  14. How do I use GTK+ 2 resource settings for GTK+ 2 applications when not in a GNOME environment?
  15. How do I configure settings for GNOME 1.4 applications under GNOME &gnomever;? @@ -38,14 +38,14 @@ How can I fix this?
  16. How do I add new GDM sessions?
-

Full Text

+

Full Text

  1. How do I get GNOME &gnomever; for FreeBSD?

    -

    There are two ways to install GNOME &gnomever; on FreeBSD. One way is to use +

    There are two ways to install GNOME &gnomever; on FreeBSD. One way is to use packages, and the other way is to use @@ -58,11 +58,11 @@ # pkg_add -r gnome2 -

    This will download the latest GNOME &gnomever; packages from the +

    This will download the latest GNOME &gnomever; packages from the FreeBSD FTP site, and proceed to install them on your system.

    -

    To build and install GNOME &gnomever; from ports, you should first +

    To build and install GNOME &gnomever; from ports, you should first cvsup the latest ports tree. Then:

    @@ -73,7 +73,7 @@

    For the best GNOME &gnomever; experience, you should install from - ports, after adding the following macros to your + ports, after adding the following macros to your /etc/make.conf file:

    @@ -125,25 +125,25 @@ exec gnome-session
             
  2. 
 	    
    GNOME &gnomever; is failing to build from ports.  What do I do?
    
 
-	    
    The majority of GNOME &gnomever; compilation problems can be solved 
-	      by making sure all the necessary GNOME &gnomever; components are 
+	    
    The majority of GNOME &gnomever; compilation problems can be solved
+	      by making sure all the necessary GNOME &gnomever; components are
 	      up-to-date.
    
-	      
+
 	    
    In general, when a GNOME &gnomever; component is not up-to-date,
 	      you will see an error similar to the following:
    
 
 	      
     checking for libgnomeui-2.0 libbonoboui-2.0 libbonobo-2.0 >= 2.2.1
-gnome-vfs-2.0 libgnomeprint-2.2 >= 2.3.0 libgnomeprintui-2.2 libglade-2.0... 
+gnome-vfs-2.0 libgnomeprint-2.2 >= 2.3.0 libgnomeprintui-2.2 libglade-2.0...
 configure: error: Library requirements (libgnomeui-2.0 libbonoboui-2.0
 libbonobo-2.0 >= 2.2.1 gnome-vfs-2.0 libgnomeprint-2.2 >= 2.3.0 libgnomeprintui-2.2
 libglade-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable
 if your libraries are in a nonstandard prefix so pkg-config can find them.
 	      
    
-	      
+
 	    
    Simply keeping your ports tree up-to-date will
 	      prevent these errors.
    
-	      
+
 	    
    If the pkg-config program is out-of-date, you may see
 	      a configure error similar to the following:
    
 
@@ -153,11 +153,11 @@ configure: error: *** pkg-config too old; version 0.14 or better required.
 
 	      
    While this may be buried in some other text, the error is
 	        very straight-forward: you need to upgrade pkg-config.
-		The pkg-config application is found in the 
+		The pkg-config application is found in the
 		devel/pkgconfig port.  By updating this port to
 		the latest version, this error will go away.
    
-	      
-	      
    You may see compiler errors relating to pthreads 
+
+	      
    You may see compiler errors relating to pthreads
 	      (&posix; threads), such as:
    
 
 	    
    @@ -172,9 +172,9 @@ options     _KPOSIX_PRIORITY_SCHEDULING
             
    
 
 	    
    If you are tracking -stable or -current, make sure that you
-	      do not have NOLIBC_R set in 
+	      do not have NOLIBC_R set in
 	      /etc/make.conf. If you do, remove it, then rebuild world.
-	      If you still have trouble, please send email to 
+	      If you still have trouble, please send email to
 	      
 	      &email;@FreeBSD.org with the output of the failed compilation.
 	      It is also helpful to include the config.log from the port's
@@ -203,9 +203,9 @@ options     _KPOSIX_PRIORITY_SCHEDULING
 
 	    
    Only the core desktop is included in the
 	      gnome2 package.  Here are some other GNOME
-	      meta-ports that offer convenient groupings of popular GNOME 2 
+	      meta-ports that offer convenient groupings of popular GNOME 2
 	      software.
    
-	    
+
 	    
      
 	      
    • The GNOME 2 Fifth Toe (x11/gnome2-fifth-toe)
 	        consists of stable GNOME 2 applications that many users
@@ -214,12 +214,12 @@ options     _KPOSIX_PRIORITY_SCHEDULING
 		messenger applications, and music and multimedia players
      • 
 
 	      
    • The GNOME 2 Hacker Tools
-	        (devel/gnome2-hacker-tools) consists of applications 
-		developers would need to create and maintain GNOME software 
-		projects.  This includes IDEs, interface builders, ``hacker'' 
+	        (devel/gnome2-hacker-tools) consists of applications
+		developers would need to create and maintain GNOME software
+		projects.  This includes IDEs, interface builders, ``hacker''
 		editors, and code generation tools.
      • 
 
-	      
    • The GNOME 2 Office (editors/gnome2-office) 
+	      
    • The GNOME 2 Office (editors/gnome2-office)
 	        consists of applications that are commonly found in office or
 		productivity suites.  This includes a spreadsheet application,
 		word processor, project management application, database
@@ -234,7 +234,7 @@ options     _KPOSIX_PRIORITY_SCHEDULING

    3. For example, to install the GNOME 2 Fifth Toe from packages:

    - + 
     # pkg_add -r gnome2-fifth-toe
    @@ -267,11 +267,11 @@ options _KPOSIX_PRIORITY_SCHEDULING the GNOME site. Make sure your GNOME 1.4 ports are up-to-date, and then remove the following GNOME 1.4 packages from the system:

    - + 
     gnomecore
 sawfish
-gnomeapplets 
+gnomeapplets
 gnomemedia
 gtop
 libgtop
@@ -287,7 +287,7 @@ eog
 ggv
    -

    After those packages are removed, you can build GNOME &gnomever; as per +

    After those packages are removed, you can build GNOME &gnomever; as per the instructions listed above.

    3. @@ -312,7 +312,7 @@ to run the above command after each step below)
  3. -

    How do I keep my GNOME &gnomever; components and applications +

    How do I keep my GNOME &gnomever; components and applications up-to-date?

    You are emphatically encouraged to use portupgrade -- @@ -366,7 +366,7 @@ to run the above command after each step below)

  4. Where can I get more themes for GNOME &gnomever;?

    -

    The website +

    The website art.gnome.org has been setup as a general GNOME theme repository. They offer some gtk+-2, metacity, sawfish, nautilus, icon, and gdm themes, as well as some backgrounds.

    @@ -376,7 +376,7 @@ to run the above command after each step below) themes for GNOME 2 as well as KDE and quite a few window managers.

    - +

    Freshmeat.net has a themes archive at themes.freshmeat.net, which contains themes and backgrounds for many window managers, @@ -385,7 +385,7 @@ to run the above command after each step below)

    A good site for some cool GNOME icons (some stock, some new) - is jimmac's + is jimmac's Icons site.

    See the instructions on the website for installing the themes. @@ -397,9 +397,9 @@ to run the above command after each step below)

  5. What window managers work well with GNOME &gnomever;?

    -

    The gnome2 meta-port installs the +

    The gnome2 meta-port installs the metacity window manager by default. Another popular window - manager that works well with GNOME &gnomever; is + manager that works well with GNOME &gnomever; is sawfish. Sawfish can be found in x11-wm/sawfish2.

    @@ -412,7 +412,7 @@ gnome-session-save --gui

    The gnome-session-save is important. Without it, the window manager will revert back to the one previously configured - upon next login. To switch back, simply reverse sawfish and + upon next login. To switch back, simply reverse sawfish and metacity.

    If you have gotten the GNOME &gnomever; desktop working under an @@ -425,31 +425,31 @@ gnome-session-save --gui

  6. Does GNOME &gnomever; support anti-aliased fonts?

    -

    Yes! Anti-aliasing requires XFree86 4.x with +

    Yes! Anti-aliasing requires XFree86 4.x with freetype2 support. To add freetype2 support to X, make - sure you have the following modules loaded in your + sure you have the following modules loaded in your XF86Config file under the Modules section:

     Load	"freetype"
 Load	"type1"
    - +

    Then, simply check out the Fonts capplet under Applications->Desktop Preferences. If you want a good set - of TrueType starter fonts, install the + of TrueType starter fonts, install the x11-fonts/webfonts port.

    Sometimes, after adding new fonts to the system, it is necessary to teach fontconfig about them. If you find that - newly added fonts are not made available even after + newly added fonts are not made available even after restarting GNOME 2, run the following command as root:

     # fc-cache -f -v
    -

    If you have any questions, please send them to +

    If you have any questions, please send them to &email;@FreeBSD.org.

    7. @@ -458,7 +458,7 @@ Load "type1"

  7. How can I control what fonts are anti-aliased?

    -

    GNOME &gnomever; makes use of Xft and fontconfig to handle +

    GNOME &gnomever; makes use of Xft and fontconfig to handle anti-aliasing. Fontconfig is a very powerful XML-based font configuration package. You can create a ~/.fonts.conf file that controls virtually @@ -493,7 +493,7 @@ Load "type1" want to edit any menu other than Favorites, you must be root.

    -

    To edit the menus, launch Nautilus, and enter the URL +

    To edit the menus, launch Nautilus, and enter the URL applications:///. From there you should be able to edit your entire application menu.

    8. @@ -520,7 +520,7 @@ Load "type1"
    1. If you have any theme engine references, you will have - to make sure there is a corresponding GTK+ 2 theme engine. + to make sure there is a corresponding GTK+ 2 theme engine. Otherwise, remove the engine entries.
    2. The default font specification should be outside of any style blocks and should be specified with @@ -556,7 +556,7 @@ Load "type1" permissions on the device nodes allow write access. Nautilus-cd-burner talks to CD/DVD burners through the SCSI CAM subsystem. Therefore, you must make sure - you have the following configured in your kernel:

      + you have the following configured in your kernel:

       device          scbus
@@ -586,12 +586,12 @@ device		atapicam
 
 	    
      The devices in parentheses at the end are important.  You
 	      must make sure the /dev entries for those devices
-	      are writable by the users that will be using 
+	      are writable by the users that will be using
 	      nautilus-cd-burner.  In addition to those devices,
-	      /dev/xpt* must also be writable to your 
-	      nautilus-cd-burner users.  The following 
+	      /dev/xpt* must also be writable to your
+	      nautilus-cd-burner users.  The following
 	      /etc/devfs.conf configuration will achieve the
-	      desired results given the above devlist (NB: 
+	      desired results given the above devlist (NB:
 	      devfs.conf is only supported on FreeBSD 5.x):
      
 
 	      
      diff --git a/en/gnome/docs/gnome2_porting.sgml b/en/gnome/docs/gnome2_porting.sgml
index 67bd6be72f..4ef314870a 100644
--- a/en/gnome/docs/gnome2_porting.sgml
+++ b/en/gnome/docs/gnome2_porting.sgml
@@ -1,6 +1,6 @@
 
-
+
 
  %gnomeincludes;
  %includes;
@@ -92,13 +92,13 @@
 			  x11-toolkits/gtk20
 			  atk pango
 			
-			
+
 			
 			  gtksourceview
 			  x11-toolkits/gtksourceview
 			  libgnome libgnomeprintui
 			
-			
+
 			
 			  libartlgpl2
 			  graphics/libartlgpl2
@@ -110,7 +110,7 @@
 			  devel/libbonobo
 			  libxml2 orbit2
 			
-			
+
 			
 			  libbonoboui
 			  x11-toolkits/libbonoboui
@@ -134,7 +134,7 @@
 			  devel/libglade2
 			  libxml2 gtk20
 			
-			
+
 			
 			  libgnome
 			  x11/libgnome
@@ -188,7 +188,7 @@
 			  devel/libIDL
 			  glib20
 			
-			
+
 			
 			  libwnck
 			  x11-toolkits/libwnck
@@ -206,13 +206,13 @@
 			  textproc/libxml2
 			  pkgconfig
 			
-			
+
 			
 			  libxslt
 			  textproc/libxslt
 			  libxml2
 			
-			
+
 			
 			  libzvt
 			  x11-toolkits/libzvt
@@ -224,7 +224,7 @@
 			  net/linc
 			  glib20
 			
-			
+
 			
 			  nautilus2
 			  x11-fm/nautilus
@@ -242,13 +242,13 @@
 			  devel/ORBit2
 			  libidl
 			
-			
+
 			
 			  pango
 			  x11-toolkits/pango
 			  glib20
 			
-			
+
 			
 			  vte
 			  x11-toolkits/vte
diff --git a/en/gnome/docs/gnome_porting.sgml b/en/gnome/docs/gnome_porting.sgml
index f04fae12e4..e387eff246 100644
--- a/en/gnome/docs/gnome_porting.sgml
+++ b/en/gnome/docs/gnome_porting.sgml
@@ -1,6 +1,6 @@
 
-
+
 
  %gnomeincludes;
  %includes;
@@ -40,7 +40,7 @@
 			
 			  gnomehier
 			  gnomehier installs all the
-			    directories needed for both the GNOME 1 and 2 desktops.  
+			    directories needed for both the GNOME 1 and 2 desktops.
 				Only include this option if your port calls @dirrm
 				on one of the directories listed in the plist for
 				gnomehier.
diff --git a/en/gnome/docs/knownissues.sgml b/en/gnome/docs/knownissues.sgml
index fef1b5868c..2bf466f609 100644
--- a/en/gnome/docs/knownissues.sgml
+++ b/en/gnome/docs/knownissues.sgml
@@ -1,6 +1,6 @@
 
-
+
 
  %gnomeincludes;
  %includes;
@@ -9,11 +9,11 @@
 
   &header;
 
-	  
      Below is a list of known issues with GNOME &gnomever; that are 
+	  
      Below is a list of known issues with GNOME &gnomever; that are
 	    specific to FreeBSD.  These are not the only known issues,
 	    however.  Please familiarize yourself with the GNOME &gnomever;
 	    
-	    release notes which contains a 
+	    release notes which contains a
 	    
 	    list of known issues that affect all platforms.
      
 
@@ -23,11 +23,11 @@
 	      
 	        instructions for updating to GNOME &gnomever;.  This may
 	      still produce errors, however.  You may have to re-run
-	      pkgdb -F after each step.  If you continue to 
+	      pkgdb -F after each step.  If you continue to
 	      encounter errors after following the upgrade instructions,
 	      log the entire upgrade procedure (you can use the -l
-	      option to portupgrade to accomplish this).  
-	      Compress and send the log to 
+	      option to portupgrade to accomplish this).
+	      Compress and send the log to
 	      &email;@FreeBSD.org.
 	    
      
 
@@ -48,17 +48,17 @@
 
 	    
       gstreamer-0.6.3  doesn't play nice with rhythmbox. It is
 	      recommended you build rhythmbox with -DWITH_XINE for
-	      now. (UPDATE: As of gstreamer-plugins-0.6.3_1, this 
+	      now. (UPDATE: As of gstreamer-plugins-0.6.3_1, this
 	      problem has been resolved.)
 	    
      
 
 	  
      4. GDM crashes on startup
      
 
 	    
      GDM may crash on startup, especially on 5.1-RELEASE and
-	      earlier.  All GDM users need to copy 
+	      earlier.  All GDM users need to copy
 	      /usr/X11R6/etc/gdm/factory-gdm.conf over
 	      /usr/X11R6/etc/gdm/gdm.conf.  The old
-	      config version from GNOME 2.2 will not work.  Users of 
+	      config version from GNOME 2.2 will not work.  Users of
 	      5.1-RELEASE and earlier need to read the pkg-message
 	      that comes with the GDM2 port/package on how to patch OpenPAM
 	      to work with GDM2.
      
diff --git a/en/gnome/docs/porting.sgml b/en/gnome/docs/porting.sgml
index c703b0be40..c5c3d1d63b 100644
--- a/en/gnome/docs/porting.sgml
+++ b/en/gnome/docs/porting.sgml
@@ -1,6 +1,6 @@
 
-
+
 
  %gnomeincludes;
  %includes;
@@ -10,7 +10,7 @@
 
           
      This document assumes that you already know how the port system works,
 	    and therefore only provides GNOME-specific hints and tips.  General
-	    instructions can be found in the 
+	    instructions can be found in the
 	    FreeBSD Porter's Handbook.
 	  
      
 
@@ -62,8 +62,8 @@ USE_GNOME=	gtk12
 		list to make sure your port uses all relevant components.
      
 
 
-	  
      Once you have finished with your port, it is a good idea to 
-	    verify that your port depends on the correct list of components.  
+	  
      Once you have finished with your port, it is a good idea to
+	    verify that your port depends on the correct list of components.
 	    To see a list of what packages your port will actually require,
 	    use the command make package-depends from within
 	    your port's directory.
      
@@ -91,7 +91,7 @@ gtk+-2.0 >= 2.0.0	gail	libwnck-1.0		esound... yes
 		There are a number of other such redundancies that can be eliminated
 		from this list.
      
 
-          
      For the above list (taken from sysutils/gok), the 
+          
      For the above list (taken from sysutils/gok), the
 	    following is defined in the Makefile:
 
 
      @@ -113,7 +113,7 @@ USE_GNOME=	gnomehack gnomeprefix libgnomeui atspi libwnck
 	  
      What this means for you, as an application porter, is simply that
 	    you should not add GNOME 1-specific applications to the
 	    ports tree.
      
-	  
+
 	  
      If you wish to determine which version of the GNOME desktop
 	    environment is present on a user's machine, you can check the value
 	    of GNOME_DESKTOP_VERSION.  This variable is set to either
@@ -121,7 +121,7 @@ USE_GNOME=	gnomehack gnomeprefix libgnomeui atspi libwnck
 	    GNOME 1 or GNOME 2 desktop is installed.
      
 
 	
      Optional GNOME Dependencies
      
-	  
      If your port can optionally use GNOME, you must set 
+	  
      If your port can optionally use GNOME, you must set
 	    WANT_GNOME= yes in your Makefile, then check to see if
 	    HAVE_GNOME is set for each component from the list
 	    above that your port can use.  Since this is a conditional
@@ -147,29 +147,29 @@ WANT_GNOME=	yes
           
      
 
 	  
      Here, WANT_GNOME tells the ports system
-	    to check for the existence of the various GNOME components 
+	    to check for the existence of the various GNOME components
 	    listed above.  For each component found, its name is appended
-	    to HAVE_GNOME.  Since this port can use gnomepanel, 
-	    we check HAVE_GNOME to see if it contains 
-	    gnomepanel (for more on the :Mpattern make syntax, 
-	    please refer to the 
+	    to HAVE_GNOME.  Since this port can use gnomepanel,
+	    we check HAVE_GNOME to see if it contains
+	    gnomepanel (for more on the :Mpattern make syntax,
+	    please refer to the
 	    make(1) manpage).
 	    If gnomepanel is found, then it is added the list of
-	    USE_GNOME dependencies, and the port-specific 
+	    USE_GNOME dependencies, and the port-specific
 	    --with-gnome CONFIGURE_ARG is passed.
 	    In an old GNOME infrastructure, PKGNAMESUFFIX was
 	    automatically adjusted by the proper USE_* macro.
 	    Now it is up to the individual porter to do this.
 	    Our example port appends -gnome to the port name
-	    to indicate it has been built with GNOME support.  The same is 
-	    true for the DATADIR PLIST_SUB.  The 
+	    to indicate it has been built with GNOME support.  The same is
+	    true for the DATADIR PLIST_SUB.  The
 	    individual porter must decide when do the DATADIR
 	    substitution.  A good rule of thumb is to add the DATADIR
 	    PLIST_SUB when using the gnomeprefix
-	    component. 
+	    component.
 	  
      
 
-	  
      Note: You cannot add extra default USE_GNOME 
+	  
      Note: You cannot add extra default USE_GNOME
 	    components after the .include <bsd.port.pre.mk>.
 	    That is, the following is wrong
 	    :
      
@@ -211,13 +211,13 @@ WANT_GNOME=	yes
 
 	  
      A large number of GNOME applications (especially GNOME 2
 	    applications) install Open Source Metadata Framework (OMF)
-	    files which contain the help file information for those 
-	    applications.  These OMF files require special processing 
+	    files which contain the help file information for those
+	    applications.  These OMF files require special processing
 	    by ScrollKeeper in order for applications like Yelp to
-	    find help documentation.  In order to accomplish proper 
+	    find help documentation.  In order to accomplish proper
 	    registry of these OMF files when installing GNOME applications
-	    from packages, you should make sure your port's 
-	    pkg-plist has the following for each OMF file 
+	    from packages, you should make sure your port's
+	    pkg-plist has the following for each OMF file
 	    listed.
      
 
 	    
      @@ -246,11 +246,11 @@ WANT_GNOME=	yes
           
      Libtool Issues
      
 
 	  
      Most, if not all, GNOME applications depend on GNU's libtool.
-	    They also use the GNU configure system.   If your port installs 
+	    They also use the GNU configure system.   If your port installs
 	    shared libraries, you should add USE_LIBTOOL= yes to
 	    your port's Makefile.  This takes care of most of the libtool
 	    requirements, but will not prevent things such as .la files
-	    from being installed.  To ensure a proper shared library 
+	    from being installed.  To ensure a proper shared library
 	    installation, also consider adding the following line to your
 	    port's configure script directly below the line
 	    LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh":
      
@@ -258,9 +258,9 @@ WANT_GNOME=	yes
 	    
       $ac_aux_dir/ltconfig $LIBTOOL_DEPS
 	    
      
-	    
+
 	    
      This prevents the installation of .la files and
-	      ensures that ${PTHREAD_LIBS} will be passed to the 
+	      ensures that ${PTHREAD_LIBS} will be passed to the
 	      linker.
      
 
 
@@ -268,8 +268,8 @@ $ac_aux_dir/ltconfig $LIBTOOL_DEPS
           
      Distfiles
      
 
           
      To separate GNOME 2 distfiles from the GNOME 1 distfiles, and to
-	    keep the distfiles directory clean, GNOME 1 ports that 
-	    download their distfiles from ${MASTER_SITE_GNOME} must 
+	    keep the distfiles directory clean, GNOME 1 ports that
+	    download their distfiles from ${MASTER_SITE_GNOME} must
 	    add the following to their
 	    Makefile:
      
 
@@ -277,15 +277,15 @@ $ac_aux_dir/ltconfig $LIBTOOL_DEPS
 DIST_SUBDIR=    gnome
           
      
 
-	  
      GNOME 2 ports that download their distfiles from 
+	  
      GNOME 2 ports that download their distfiles from
 	    ${MASTER_SITE_GNOME} must include the following in their
 	    Makefile:
      
-	
+
 	  
       DIST_SUBDIR=    gnome2
 	  
      
 
-	  
      Some GNOME distfiles come in both tar gzip as well as tar bzip2 
+	  
      Some GNOME distfiles come in both tar gzip as well as tar bzip2
 	    format.  To save time when downloading distfiles over slow links,
 	    you should use the bzip2 distfiles whenever possible.  To do this,
 	    add the following to your port's Makefile:
      
diff --git a/en/gnome/docs/volunteer.sgml b/en/gnome/docs/volunteer.sgml
index 30bca9f273..80e1a64caa 100644
--- a/en/gnome/docs/volunteer.sgml
+++ b/en/gnome/docs/volunteer.sgml
@@ -1,6 +1,6 @@
 
-
+
 
  %gnomeincludes;
  %includes;
@@ -15,24 +15,24 @@
 
 	  
        
 	    
      • 
-	     
        Test existing ports, and 
+	     
        Test existing ports, and
 	     report bugs.
        • 
 	    
      • 
 	     
        Regularly install GNOME from packages, and report any problems
 		with the install or the functionality.
        • 
 	    
      • 
-	     
        Find GNOME applications not yet ported to FreeBSD, and 
+	     
        Find GNOME applications not yet ported to FreeBSD, and
 		work on porting them over.
        • 
 	    
      • 
 	     
        
-		   Subscribe to the freebsd-gnome mailing list, and help 
+		   Subscribe to the freebsd-gnome mailing list, and help
 		   answer users' questions.
        • 
 	    
      • 
-	     
        Take patches and feedback from GNOME-related FreeBSD PRs 
-		back to GNOME authors so that the patches can be integrated 
+	     
        Take patches and feedback from GNOME-related FreeBSD PRs
+		back to GNOME authors so that the patches can be integrated
 		into the next release of the application.
        • 
 	    
      • 
-	     
        Proofread the FreeBSD GNOME project pages, 
+	     
        Proofread the FreeBSD GNOME project pages,
 		and offer feedback and updates.
        • 
 	  
      
 
diff --git a/en/gnome/includes.xsl b/en/gnome/includes.xsl
index c19b4ac12a..2686b2293b 100644
--- a/en/gnome/includes.xsl
+++ b/en/gnome/includes.xsl
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 
@@ -16,11 +16,11 @@
 	2.5
   
 
-                                                    
-                                                                             
-                                                     
-                   
-                                                                
+  
+    
+      
+        
+      
       @FreeBSD.org
      
         
 
diff --git a/en/gnome/news.xml b/en/gnome/news.xml
index e35475a434..27dfd0bd1d 100644
--- a/en/gnome/news.xml
+++ b/en/gnome/news.xml
@@ -2,7 +2,7 @@
 
 
 
 
   
     
-      $FreeBSD: www/en/gnome/news.xml,v 1.53 2003/12/14 16:20:40 marcus Exp $
+      $FreeBSD: www/en/gnome/news.xml,v 1.54 2004/01/06 17:36:56 marcus Exp $
     
   
 
@@ -39,9 +39,9 @@
 		    
      The GNOME 2.5.2 desktop, "You want me to blow on
 			your toes?" release, is now available for FreeBSD.
 			To accompany this release, the FreeBSD GNOME
-			team has setup an 
-			FAQ on how to 
-			track the GNOME development branches.  Please read 
+			team has setup an
+			FAQ on how to
+			track the GNOME development branches.  Please read
 			that to familiarize yourself with what is involved.
 			This release can be checked out from the
 			MarcusCom CVS repository.
@@ -64,7 +64,7 @@
 		
 		    GNOME 2.5.1 available for FreeBSD
 
-		    
      The GNOME 2.5.1 desktop, "Hey, at least I'm 
+		    
      The GNOME 2.5.1 desktop, "Hey, at least I'm
 			housebroken" release, is now available for
 			FreeBSD.  This release is jammed packed with
 			goodies including Evolution 1.5, gnome-network,
@@ -96,7 +96,7 @@
 			released.  However, it can be obtained from the
 			MarcusCom CVS repository
 			with the help of the ``marcusmerge'' script.  For
-			a complete list of what's changed, checkout the 
+			a complete list of what's changed, checkout the
 			release announcement.
      
 		
 
@@ -110,7 +110,7 @@
 			MarcusCom CVS repository.
 			Be sure to get the latest copy of the ``marcusmerge''
 			script while you're there to help with the upgrade.
-			Thanks to a few of our users, there is also a 
+			Thanks to a few of our users, there is also a
 			man page
 			to go with this script.  NOTE: this is a
 			developers release, and bugs will exist.  If you're
@@ -137,7 +137,7 @@
 	    
 
 	
-	
+
     	
 	    October
 
@@ -149,9 +149,9 @@
 
 		    
      Thanks to work by 
 			    Marcel Moolenaar, the GNOME desktop now builds
-			on ia64.  There are runtime issues to be resolved, 
+			on ia64.  There are runtime issues to be resolved,
 			but this was expected. Most importantly, we have new
-			ways to exercise FreeBSD/ia64 in general and KSE/ia64 
+			ways to exercise FreeBSD/ia64 in general and KSE/ia64
 			in particular.  Not to mention that we can proceed
 			porting and building other GNOME ports.  GNOME for
 			FreeBSD now runs on i386, Alpha, Sparc64, and ia64.
@@ -205,9 +205,9 @@
 		    GNOME 2.4 Release Candidate 1 available for FreeBSD
 
 		    
      The GNOME 2.4 Release Candidate 1 (aka "Kublai") desktop
-			has been released and ported to FreeBSD.  Those 
+			has been released and ported to FreeBSD.  Those
 			wanting to make GNOME 2.4 the best release ever
-			should checkout the ``ports'' module per the 
+			should checkout the ``ports'' module per the
 			instructions at the
 			MarcusCom CVS repository.
 			Be sure to get the ``marcusmerge'' script as well to
@@ -246,9 +246,9 @@
 
 		
 		    GNOME 2.4 Beta 1 desktop available for FreeBSD
-		    
      The GNOME 2.4 Beta 1 (aka "Jelme") desktop has been 
-			released, and ported to FreeBSD.  For those of you 
-			chomping at the bit to test drive this baby, checkout 
+		    
      The GNOME 2.4 Beta 1 (aka "Jelme") desktop has been
+			released, and ported to FreeBSD.  For those of you
+			chomping at the bit to test drive this baby, checkout
 			the ``ports'' module per the instructions at the
 			MarcusCom CVS repository.
 			Be sure to get the ``marcusmerge'' script as well to
@@ -272,7 +272,7 @@
 		    
      Alexander
 			    Nedotsukov has been granted a commit
 			bit, and has joined the FreeBSD GNOME team.
-			Alexander will be working on general GNOME 
+			Alexander will be working on general GNOME
 			desktop porting and bug-busting as well as focusing
 			on his ports of the GNOME 2 C++ bindings.  Please
 			join us in welcoming Alexander to the team!
      
@@ -397,11 +397,11 @@
 		
 		    GNOME 2.3.0 desktop available for FreeBSD
 
-		    
      Calling all testers!  The first of the GNOME 2.3 
+		    
      Calling all testers!  The first of the GNOME 2.3
 			development releases is now available.  Code named
 			"Mighty Atom," this release includes quite a few
 			new proposed modules.  The GNOME 2.3 snapshots will
-			become the GNOME 2.4 desktop on or around 
+			become the GNOME 2.4 desktop on or around
 			September 8.  The full scoop can be found
 			
 			    here.  Those wanting to test this release
@@ -469,9 +469,9 @@
 			and ports have been made for FreeBSD.  This is the
 			last release candidate before GNOME 2.2 is released
 			on February 5.  For those wanting to test this
-			release, checkout the ``ports'' module per the 
+			release, checkout the ``ports'' module per the
 			instructions at
-			http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi.  A script is 
+			http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi.  A script is
 			also provided at that site to help in merging this
 			tree with the official FreeBSD ports tree.
      
 		      
@@ -497,7 +497,7 @@
 		
 		    GNOME desktop 2.2 Release Candidate 1 available for FreeBSD
 
-		    
      The GNOME 2.1.90 desktop, "1.21 Jigawatts" release, is 
+		    
      The GNOME 2.1.90 desktop, "1.21 Jigawatts" release, is
 			available, and ports have been made.  This is the
 			first release candidate for GNOME 2.2, and is
 			considered to be quite stable.  People wanting to
@@ -541,7 +541,7 @@
 			For those wanting to particpate in the testing,
 		        the ports are available via anonymous CVS from
 			MarcusCom.  Checkout the ``ports'' module per the
-			instructions at 
+			instructions at
 			http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi.
 		    
      
 		      
@@ -549,17 +549,17 @@
 
 	    
 		1
-	        
+
 		
 		    GNOME 2.1.3 desktop available for FreeBSD
 
 		    
      The GNOME 2.1.3 desktop, "Twin Pines" release, is
 			available and ports have been made for it (including
 			the GStreamer components!).  For those wanting to
-			test this next installment in the 2.1 developer 
+			test this next installment in the 2.1 developer
 			series, ports are available via anonymous CVS from
 			MarcusCom.  Checkout the ``ports'' module per the
-			instructions at 
+			instructions at
 			http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi.
 		    
      
 		      
@@ -602,8 +602,8 @@
 			  newer modules (such as system-tray) haven't yet been
 			  ported.  For those wanting to test this latest development
 			  snapshot, ports are available via anonymous CVS from
-			  MarcusCom.  Checkout the ``ports'' module per the 
-			  instructions at 
+			  MarcusCom.  Checkout the ``ports'' module per the
+			  instructions at
 			  
 			  http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi.
 	      
      
@@ -639,7 +639,7 @@
 
 	
      The GNOME 2.1.0 desktop, "88MPH" release is available, and ports
 	  have been made for those wanting to test.  The ports are available
-	  via CVS from MarcsuCom. A cvsweb interface is available from 
+	  via CVS from MarcsuCom. A cvsweb interface is available from
 	  
 	  http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi.  The module
 	  name is ``ports''.  Instructions for checking out the
@@ -696,7 +696,7 @@
 	  at 
 	  http://www.gnome.org/start/2.0/.  The ports collection is
 	  already in sync with 2.0.1, and 2.0.1 packages are available for
-	  i386 -stable from 
+	  i386 -stable from
 	  
 	  http://www.marcuscom.com/downloads/packages/gnome/.
 	
      
@@ -709,7 +709,7 @@
       
         GNOME 2 Packages Now Available!
 
-	
      GNOME 2 packages for i386 FreeBSD-stable have been posted to 
+	
      GNOME 2 packages for i386 FreeBSD-stable have been posted to
 	  
 	  http://www.marcuscom.com/downloads/packages/gnome/.  Both
 	  .tgz and .tbz packages have been posted.  This includes everything
@@ -746,7 +746,7 @@
 
 	  
      The FreeBSD GNOME team is proud to announce that GNOME 2.0
 	    Release has been ported to FreeBSD.  This comes four days after
-	    the GNOME Project made their press release.  Look for 
+	    the GNOME Project made their press release.  Look for
 	    documentation updates to cover the new GNOME 2.0 desktop.
      
 	      
             
@@ -809,7 +809,7 @@
             Another goal is to provide set of pre-built GNOME2 binary
             packages on the official FreeBSD 4.6 release media along with
             GNOME 1.4 bits and pieces.
      
-            
+
           
      We would encourage any help from our users in the form of
             problem reports, patches, suggestions etc.
      
         
@@ -873,7 +873,7 @@
             and FreeBSD port was updated accordingly.  Update is strongly
             recommended to all current users.
      
         
-              
+      
 
       
         11
@@ -942,7 +942,7 @@
         
 
       
-        
+
 
       
 	28
diff --git a/en/gnome/newsflash.xsl b/en/gnome/newsflash.xsl
index 20cabd5e46..43394ba098 100644
--- a/en/gnome/newsflash.xsl
+++ b/en/gnome/newsflash.xsl
@@ -1,6 +1,6 @@
 
 
-
+
 
 
@@ -14,12 +14,12 @@
   
     
   
-  
+
   
 
   
     
-      
+
       
 
       
 
 	
 	FreeBSD GNOME News
 
 	
-	
+
 	
 	
       
@@ -50,7 +50,7 @@
   
 
   
-  
+
   
     
      
        
@@ -74,7 +74,7 @@
 
 	
 	   
-	  , 
+	  ,
 	  : 
 	
 	
      
diff --git a/en/gnome/rss.xsl b/en/gnome/rss.xsl
index 60a2b16d0b..ece173f61c 100644
--- a/en/gnome/rss.xsl
+++ b/en/gnome/rss.xsl
@@ -1,4 +1,4 @@
-
+
 
 
 
   
-  
+  
   
 
   
@@ -18,7 +18,7 @@
     
-    
+
       
         FreeBSD GNOME Project News
 	http://www.FreeBSD.org/gnome
diff --git a/en/gnome/screenshots.sgml b/en/gnome/screenshots.sgml
index 5458ffa0fd..5aa2d27dd2 100644
--- a/en/gnome/screenshots.sgml
+++ b/en/gnome/screenshots.sgml
@@ -1,6 +1,6 @@
 
-
+
 
  %gnomeincludes;
  %includes;
@@ -14,7 +14,7 @@
 	
      GNOME 2.4 Screenshots
      
 
 	
      Dual screens at 2048x768 showing off the
-	  Epiphany web browser, and the new Themus and 
+	  Epiphany web browser, and the new Themus and
 	  CD-Burner Nautilus views:
      
 	  Screen Shot 11
 	  
@@ -26,7 +26,7 @@
 	  
 	
      
 
-	
      Xchat, Xmms, StickyNotes, and GKrellM with the Koynacity-Blue 
+	
      Xchat, Xmms, StickyNotes, and GKrellM with the Koynacity-Blue
 	  metacity, Aquativo 1.5 GTK, and Flat blue icon themes:
      
 	  Screen Shot 13