diff -r -u -N gparted_orig/configure.in gparted/configure.in
--- gparted_orig/configure.in	2006-05-24 15:24:08.000000000 +0200
+++ gparted/configure.in	2006-06-03 03:53:54.000000000 +0200
@@ -25,6 +25,13 @@
 AM_GLIB_GNU_GETTEXT
 AC_PROG_INTLTOOL
 
+dnl======================
+dnl GNOME stuff
+dnl=====================
+GNOME_INIT
+
+dnl Documentation
+GNOME_DOC_INIT
 
 dnl======================
 dnl checks for libs 
@@ -39,6 +46,9 @@
 AC_SUBST(GTKMM_LIBS)
 AC_SUBST(GTKMM_CFLAGS)
 
+PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 > 2.12)
+AC_SUBST(GNOME_LIBS)
+AC_SUBST(GNOME_CFLAGS)
 
 AC_OUTPUT([
 Makefile
@@ -47,4 +57,5 @@
 src/Makefile
 pixmaps/Makefile
 po/Makefile.in
+help/Makefile
 ])
diff -r -u -N gparted_orig/help/C/gparted.xml gparted/help/C/gparted.xml
--- gparted_orig/help/C/gparted.xml	1970-01-01 01:00:00.000000000 +0100
+++ gparted/help/C/gparted.xml	2006-06-03 03:54:18.000000000 +0200
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY legal SYSTEM "legal.xml">
+<!ENTITY appversion "1.9">
+<!ENTITY manrevision "1.7">
+<!ENTITY date "June 2006">
+<!ENTITY fr "<application>GParted</application>">
+<!ENTITY plainfr "GParted">
+<!-- Information about the entities
+	   The legal.xml file contains legal information, there is no need to edit the file. 
+	   Use the appversion entity to specify the version of the application.
+	   Use the manrevision entity to specify the revision number of this manual.
+	   Use the date entity to specify the release date of this manual.
+	   Use the fr entity to specify the name of the application. -->]>
+<!-- 
+	  (Do not remove this comment block.)
+  Maintained by the GNOME Documentation Project
+  http://developer.GNOME.org/projects/gdp
+  Template version: 2.0 beta
+  Template last modified Jan 30, 2002
+-->
+<!-- =============Document Header ============================= -->
+<article id="index" lang="en">
+<!-- please do not change the id; for translations, change lang to -->
+<!-- appropriate code -->
+  <articleinfo> 
+	<abstract role="description">
+	  <para>GParted is the Gnome Partition Editor</para>
+	</abstract>
+	<title>GParted Manual</title>       
+	<copyright>
+	  <year>2006</year>
+	  <holder>Bart Hakvoort</holder>
+	</copyright>
+
+<!-- translators: uncomment this:
+
+  <copyright>
+   <year>2002</year>
+   <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
+  </copyright>
+
+   -->
+<!-- An address can be added to the publisher information.  If a role is 
+	 not specified, the publisher/author is the same for all versions of the 
+	 document.  -->
+	<publisher> 
+	  <publishername>GParted Developer</publishername> 
+	</publisher> 
+
+   &legal; <!-- This file contains link to license for the
+   documentation (GNU FDL), and other legal stuff such as "NO
+   WARRANTY" statement. Please do not change any of this. -->
+
+	<authorgroup> 
+	  <author> 
+	    <firstname>Bart</firstname> 
+	    <surname>Hakvoort</surname> 
+	    <affiliation> 
+	      <orgname>GParted</orgname> 
+	      <address><email>hakvoort@cvs.gnome.org</email></address> 
+	    </affiliation> 
+	  </author> 
+	</authorgroup>
+
+	<releaseinfo>
+	  This manual describes version &appversion; of &plainfr;.
+	</releaseinfo>
+  </articleinfo>
+
+  <indexterm zone="index"> 
+	<primary>gparted</primary> 
+  </indexterm> 
+  <indexterm zone="index"> 
+	<primary>GParted</primary> 
+  </indexterm>
+  <indexterm zone="index"> 
+	<primary>partition</primary> 
+  </indexterm>
+
+<!-- ============= Document Body ================================== -->
+<!-- ============= Introduction =================================== -->
+<!-- Use the Introduction section to give a brief overview of what
+	 the application is and what it does. -->
+  <sect1 id="gparted-introduction"> 
+	<title>Introduction</title> 
+	<para>
+          	&fr; stands for Gnome Partition Editor.
+  	</para>
+	<para>
+		&fr; It uses libparted to detect and manipulate devices and partitiontables while several (optional) filesystemtools provide support for filesystems not included in libparted. These optional packages will be detected at runtime and don't require a rebuild of GParted.
+	</para>
+  </sect1>
+
+<!-- ============= Getting Started ================================ -->
+  <sect1 id="gparted-getting-started">
+	<title>Getting Started</title>
+  </sect1>
+
+<!-- ============= About ========================================== -->
+  <sect1 id="gparted-about">
+	<title>About &fr;</title>
+
+	<para>
+		&fr; written by Bart Hakvoort (<email>gparted@users.sourceforge.net</email>). If you need more information about &fr;,
+		please visit <ulink url="http://gparted.sourceforge.net" type="http">the &fr; web site.</ulink>. 
+	</para>
+
+	<para>
+	  Manual written by Diego Fdez. Durán (<email>dieg@users.sourceforge.net</email>).
+	</para>
+
+	<para>
+	  This program is distributed under the terms of the GNU
+	  General Public license as published by the Free Software
+	  Foundation; either version 2 of the License, or (at your option)
+	  any later version. A copy of this license can be found at this
+	  <ulink url="ghelp:gpl" type="help">link</ulink>, or in the file
+	  COPYING included with the source code of this program.
+	</para>
+  </sect1> 
+</article>
diff -r -u -N gparted_orig/help/C/legal.xml gparted/help/C/legal.xml
--- gparted_orig/help/C/legal.xml	1970-01-01 01:00:00.000000000 +0100
+++ gparted/help/C/legal.xml	2006-06-03 03:54:18.000000000 +0200
@@ -0,0 +1,76 @@
+   <legalnotice id="legalnotice">
+         <para>
+           Permission is granted to copy, distribute and/or modify this
+           document under the terms of the GNU Free Documentation
+           License (GFDL), Version 1.1 or any later version published
+           by the Free Software Foundation with no Invariant Sections,
+           no Front-Cover Texts, and no Back-Cover Texts.  You can find
+           a copy of the GFDL at this <ulink type="help"
+           url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+           distributed with this manual.
+          </para>
+          <para> This manual is part of a collection of GNOME manuals
+           distributed under the GFDL.  If you want to distribute this
+           manual separately from the collection, you can do so by
+           adding a copy of the license to the manual, as described in
+           section 6 of the license.
+         </para>
+ 
+         <para>
+           Many of the names used by companies to distinguish their
+           products and services are claimed as trademarks. Where those
+           names appear in any GNOME documentation, and the members of
+           the GNOME Documentation Project are made aware of those
+           trademarks, then the names are in capital letters or initial
+           capital letters.
+         </para>
+ 
+         <para>
+           DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
+           UNDER  THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
+           WITH THE FURTHER UNDERSTANDING THAT:
+ 
+           <orderedlist>
+                 <listitem>
+                   <para>DOCUMENT IS PROVIDED ON AN "AS IS" BASIS,
+                     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
+                     IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
+                     THAT THE DOCUMENT OR MODIFIED VERSION OF THE
+                     DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR
+                     A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE
+                     RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE
+                     OF THE DOCUMENT OR MODIFIED VERSION OF THE
+                     DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR
+                     MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT,
+                     YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY
+                     CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
+                     SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+                     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
+                     LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED
+                     VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER
+                     EXCEPT UNDER THIS DISCLAIMER; AND
+                   </para>
+                 </listitem>
+                 <listitem>
+                   <para>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
+                        THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE),
+                        CONTRACT, OR OTHERWISE, SHALL THE AUTHOR,
+                        INITIAL WRITER, ANY CONTRIBUTOR, OR ANY
+                        DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION
+                        OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH
+                        PARTIES, BE LIABLE TO ANY PERSON FOR ANY
+                        DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
+                        CONSEQUENTIAL DAMAGES OF ANY CHARACTER
+                        INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS
+                        OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
+                        MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR
+                        LOSSES ARISING OUT OF OR RELATING TO USE OF THE
+                        DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT,
+                        EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
+                        THE POSSIBILITY OF SUCH DAMAGES.
+                   </para>
+                 </listitem>
+           </orderedlist>
+         </para>
+   </legalnotice>
+ 
\ No hay ningún carácter de nueva línea al final del fichero
diff -r -u -N gparted_orig/help/gparted.omf.in gparted/help/gparted.omf.in
--- gparted_orig/help/gparted.omf.in	1970-01-01 01:00:00.000000000 +0100
+++ gparted/help/gparted.omf.in	2006-06-03 03:54:18.000000000 +0200
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
+<omf>  
+  <resource>
+    <creator>
+      dieg@users.sourceforge.net (Diego Fdez. Durán)
+    </creator>
+    <maintainer>
+      dieg@users.sourceforge.net (Diego Fdez. Durán)
+    </maintainer>
+    <title>
+      GParted Manual
+    </title>
+    <date>
+      2006-06-02
+    </date>
+    <version identifier="0.2.5" date="2006-06-01" description="Initial version for GParted 0.2.5"/>
+    <subject category="GNOME|Applications"/>
+    <description>
+      GParted User Manual
+    </description>
+    <type>
+      user's guide
+    </type>
+    <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
+    <identifier url="gparted.xml"/>
+    <language code="C"/>
+    <relation seriesid="6fae9e4e-f258-11da-91d9-ea5c4b1d9575"/>
+    <rights type="GNU FDL" license.version="1.1" holder="Diego Fdez. Durán"/>
+  </resource>
+</omf>
diff -r -u -N gparted_orig/help/Makefile.am gparted/help/Makefile.am
--- gparted_orig/help/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ gparted/help/Makefile.am	2006-06-03 03:54:18.000000000 +0200
@@ -0,0 +1,9 @@
+include $(top_srcdir)/gnome-doc-utils.make
+
+DOC_MODULE = gparted
+DOC_ENTITIES = legal.xml
+DOC_LINGUAS = 
+DOC_FIGURES = 
+
+dist-hook: doc-dist-hook
+
diff -r -u -N gparted_orig/Makefile.am gparted/Makefile.am
--- gparted_orig/Makefile.am	2006-02-18 00:20:28.000000000 +0100
+++ gparted/Makefile.am	2006-06-03 03:53:54.000000000 +0200
@@ -1,4 +1,4 @@
-SUBDIRS = compose include pixmaps po src
+SUBDIRS = compose include pixmaps po src help
 
 @INTLTOOL_DESKTOP_RULE@
 
@@ -13,10 +13,12 @@
 	$(DESKTOP_FILES)	\
 	intltool-extract.in  	\
 	intltool-merge.in	\
-	intltool-update.in
+	intltool-update.in	\
+	gnome-doc-utils.make
 
 DISTCLEANFILES =		\
 	intltool-extract	\
 	intltool-merge		\
 	intltool-update		\
-	$(desktop_DATA)		
+	$(desktop_DATA)		\
+	gnome-doc-utils.make
diff -r -u -N gparted_orig/src/main.cc gparted/src/main.cc
--- gparted_orig/src/main.cc	2006-02-10 23:16:31.000000000 +0100
+++ gparted/src/main.cc	2006-06-03 03:53:54.000000000 +0200
@@ -19,12 +19,19 @@
 
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/main.h>
+#include <libgnomeui/gnome-ui-init.h>
 
 int main( int argc, char *argv[] )
 {
 	//initialize thread system
 	Glib::thread_init() ;
 	
+	// GNOME Init
+	gnome_program_init (PACKAGE, VERSION,
+			    LIBGNOMEUI_MODULE, argc, argv,
+			    GNOME_PARAM_APP_DATADIR, DATADIR,
+			    NULL);
+
 	Gtk::Main kit( argc, argv ) ;
 		 
 	//i18n
diff -r -u -N gparted_orig/src/Makefile.am gparted/src/Makefile.am
--- gparted_orig/src/Makefile.am	2006-04-05 11:33:04.000000000 +0200
+++ gparted/src/Makefile.am	2006-06-03 03:53:54.000000000 +0200
@@ -1,7 +1,9 @@
 INCLUDES =						\
 	$(GTKMM_CFLAGS) 				\
+	$(GNOME_CFLAGS)					\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"		
+	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"	\
+	-DDATADIR=\""$(datadir)"\"
 
 AM_CFLAGS = -Wall	
 
@@ -52,5 +54,7 @@
 	
 gparted_LDFLAGS = -lparted -lgthread-2.0 
 
-gparted_LDADD = $(GTKMM_LIBS)
+gparted_LDADD = \
+	$(GTKMM_LIBS) \
+	$(GNOME_LIBS)
 
diff -r -u -N gparted_orig/src/Win_GParted.cc gparted/src/Win_GParted.cc
--- gparted_orig/src/Win_GParted.cc	2006-05-27 21:51:55.000000000 +0200
+++ gparted/src/Win_GParted.cc	2006-06-03 03:53:54.000000000 +0200
@@ -35,6 +35,8 @@
 #include <gtkmm/radiobuttongroup.h>
 #include <gtkmm/main.h>
 
+#include <libgnome/gnome-help.h>
+
 namespace GParted
 {
 	
@@ -1102,16 +1104,24 @@
 
 void Win_GParted::menu_help_contents()
 {
-	Gtk::MessageDialog dialog( *this,
-				   _("Sorry, not yet implemented."),
-				   false,
-				   Gtk::MESSAGE_INFO,
-				   Gtk::BUTTONS_OK,
-				   true );
+	// FIXME: This code must be moved to another place
+	GError *error = NULL;
+	
+	gnome_help_display("gparted", NULL, &error);
 
-	dialog .set_secondary_text( _( "Please visit http://gparted.sf.net for more information and support.") ) ;
 
-	dialog .run();
+	if(error != NULL) {
+		Gtk::MessageDialog dialog( *this,
+					   _("Sorry, help not found"),
+					   false,
+					   Gtk::MESSAGE_INFO,
+					   Gtk::BUTTONS_OK,
+					   true );
+
+		dialog .set_secondary_text( _( "Please visit http://gparted.sf.net for more information and support.") ) ;
+
+		dialog .run();
+	}
 }
 
 
