In .:

2008-01-15 Benny Malengier <benny.malengier@gramps-project.org>
	* man/Makefile.am: Swedish removed again so it builds again
	* removed help files of version 2.x, only wiki manual now!
	* COPYING-DOCS -> help/COPYING-DOCS : refers to old doc, moved
	* Makefile.am: removed help subdir, and COPYING-DOCS
	The idea should be that should we add documentation again, it is done
	in the help dir with separate source packages too for translations
In help:
2008-01-15  Benny Malengier <benny.malengier@gramps-project.org>
	* Removed 2.2 manual, at the moment no manual of gramps is kept in SVN,
	  it can only be found on the wiki.
	* help/gramps.omf.in: removed
	* help/gramps.pot: removed
	* help/Makefile.am: removed



svn: r9819

COPYING-DOCS

@@ -1,13 +0,0 @@
-The User Manual for Gramps is distributed under the terms of
-GNU General Public License (GPL). Yes, it is under GNU GPL and
-*NOT* under GNU FDL.
-
-As such, this manual meets citeria of Debian Free Software Guidelines 
-(DFSG) and can be distributed through Debian main (as opposed to non-free).
-
-Please see file named COPYING for exact terms of the license.
-
-Alex Roitman
-February 15, 2005
-
-$Id$

ChangeLog

@@ -1,4 +1,10 @@
-
+2008-01-15 Benny Malengier <benny.malengier@gramps-project.org>
+	* man/Makefile.am: Swedish removed again so it builds again
+	* removed help files of version 2.x, only wiki manual now!
+	* COPYING-DOCS -> help/COPYING-DOCS : refers to old doc, moved
+	* Makefile.am: removed help subdir, and COPYING-DOCS
+	The idea should be that should we add documentation again, it is done
+	in the help dir with separate source packages too for translations
 
 2008-01-15  Peter Landgren <peter.talken@telia.com>
     * man/Makefail.am: Swedish added (sv).

Makefile.am

@@ -1,11 +1,11 @@
 # This is the top level Makefile for Gramps
 # $Id$
 
-SUBDIRS = m4 po src data example help
+SUBDIRS = m4 po src data example
 
 EXTRA_DIST = \
 	config.rpath autogen.sh \
-	COPYING-DOCS FAQ COPYING \
+	FAQ COPYING \
 	intltool-extract.in intltool-merge.in intltool-update.in \
 	config.sub config.guess gnome-doc-utils.make
 

README

@@ -29,13 +29,10 @@ No longer needed in 3.0:
 
 Documentation
 ---------------------------------
-The User Manual is now maintained, built and installed using gnome-doc-utils.
+The User Manual is now maintained on the gramps website,
-Please see the documentation for the gnome-doc-utils package to learn
-how this works.
-
-Current HTML documentation can also be found on the gramps website,
 http://www.gramps-project.org/wiki/index.php?title=User_manual
-
+We might in the future distribute again a manual via gnome-doc-utils, this has not
+been decided yet though.
 
 
 Building on non-Linux systems: i18n support and GNU make

data/man/Makefile.am

@@ -1,7 +1,7 @@
 # This is the data/man level Makefile for Gramps
 # $Id$
 
-SUBDIRS = fr sv
+SUBDIRS = fr
 
 man_IN_FILES = gramps.1.in
 man_MANS = $(man_IN_FILES:.1.in=.1)

help/COPYING-DOCS

@@ -0,0 +1,13 @@
+For version 3.0, the manual can be found dual licenced under the GNU GPL and under GNU Free Documentation License 1.2 on our wiki: http://www.gramps-project.org/wiki/index.php?title=Gramps_3.0_Wiki_Manual
+
+For version 2.x, the manual can be found in branch22 of the SVN repository, under the GNU GPL license.
+
+As such, this manual meets citeria of Debian Free Software Guidelines 
+(DFSG) and can be distributed through Debian main (as opposed to non-free).
+
+Please see file named COPYING for exact terms of the license.
+
+Benny Malengier
+January 15, 2008
+
+$Id$

help/ChangeLog

@@ -1,3 +1,10 @@
+2008-01-15  Benny Malengier <benny.malengier@gramps-project.org>
+	* Removed 2.2 manual, at the moment no manual of gramps is kept in SVN,
+	  it can only be found on the wiki.
+	* help/gramps.omf.in: removed
+	* help/gramps.pot: removed
+	* help/Makefile.am: removed
+
 2007-06-25  Alex Roitman  <shura@gramps-project.org>
 	* de/de.po: Add file from 2.2.
 	* de/figures/*.png: Add files from 2.2.

help/Makefile.am

@@ -1,69 +0,0 @@
-# This is the help level Makefile for gramps
-# $Id$
-
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
-
-DOC_MODULE = gramps
-DOC_ENTITIES = gramps.xml
-
-DOC_FIGURES = \
-	figures/bookreport.png\
-	figures/cfe-ar.png\
-	figures/cfe-df.png\
-	figures/child-ref.png\
-	figures/column-editor.png\
-	figures/comp-people.png\
-	figures/date-selection.png\
-	figures/edit-ad.png\
-	figures/edit-an.png\
-	figures/edit-at.png\
-	figures/edit-bm.png\
-	figures/edit-ev.png\
-	figures/edit-ev-ref.png\
-	figures/edit-family.png\
-	figures/edit-media.png\
-	figures/edit-person-addresses.png\
-	figures/edit-person-assoc.png\
-	figures/edit-person-attributes.png\
-	figures/edit-person-gallery.png\
-	figures/edit-person-internet.png\
-	figures/edit-person-lds.png\
-	figures/edit-person-names.png\
-	figures/edit-person-notes.png\
-	figures/edit-person.png\
-	figures/edit-person-sources.png\
-	figures/edit-plc.png\
-	figures/edit-rel.png\
-	figures/edit-si.png\
-	figures/edit-src.png\
-	figures/events.png\
-	figures/export-druid.png\
-	figures/family-list.png\
-	figures/family.png\
-	figures/family-warn.png\
-	figures/find-people.png\
-	figures/first-open.png\
-	figures/gedcom-export.png\
-	figures/mainwin.png\
-	figures/media.png\
-	figures/merge-people.png\
-	figures/merge-plc.png\
-	figures/merge-src.png\
-	figures/noside-nofilt.png\
-	figures/pedigree-child-cut.png\
-	figures/pedigree.png\
-	figures/pedigree-siblings-cut.png\
-	figures/places.png\
-	figures/prefs.png\
-	figures/reorder.png\
-	figures/repository.png\
-	figures/researcher.png\
-	figures/scratch-pad.png\
-	figures/select-family.png\
-	figures/select-person.png\
-	figures/side-filt.png\
-	figures/sources.png
-
-DOC_LINGUAS = fr nb sk nl de
-#hu ru

help/README-DOCS

@@ -0,0 +1 @@
+As of version 3.0 the help manual is no longer maintained in svn, but on the wiki instead.