update NEWS

svn: r23470
Prepare mac build for 4.0.2 release.
2013-11-08 09:25:13 -08:00 · 2013-11-08 09:24:53 -08:00 · 2013-11-07 11:35:21 -08:00 · 2013-11-07 11:34:59 -08:00 · 2013-11-07 11:34:31 -08:00 · 2013-11-07 11:34:05 -08:00
1642 changed files with 667576 additions and 1103403 deletions
@@ -1,9 +0,0 @@
-# Make Github recognise Gramps as a Python project,
-# by marking .sql files as text files!
-# See: https://github.com/github/linguist/issues/2462
-# https://github.com/github/linguist/blob/master/README.md
-*.sql linguist-language=txt
-
-# Have Github ignore js vendored files.
-# https://github.com/gramps-project/gramps/tree/master/data/javascript
-#data/javascript/*.js linguist-vendored
@@ -10,12 +10,6 @@ dist/
 data/tips.xml
 gramps/plugins/lib/holidays.xml
 po/.intltool-merge-cache
-docs/_build/

-# Editing
+# Editor
 tags
-*.swp
-
-# Testing
-test/data
-gramps/webapp/grampsdb/fixtures/initial_data.json
@@ -1,29 +0,0 @@
-# After changing this file, check it on:
-#   http://lint.travis-ci.org/
-
-
-language: c
-#python:
-#    - 3.3
-#    - 3.4
-
-install:
-    - git clone --depth=50 --branch=maintenance/gramps42 git://github.com/gramps-project/gramps.git gramps-project/gramps
-    - cd gramps-project/gramps 
-    - time sudo apt-get update
-    - travis_retry sudo apt-get install gir1.2-pango gir1.2-gtk xdg-utils librsvg2-common libglib2.0-dev intltool 
-    - travis_retry sudo apt-get install python3-gobject python3-gi python3-cairo python3-gi-cairo python3-bsddb3 python3-dev python3-nose
-
-    - travis_retry curl https://bootstrap.pypa.io/get-pip.py | sudo python3
-    - travis_retry sudo pip3 install Django==1.7
-    - travis_retry sudo pip3 install pyicu==1.8
-    - travis_retry sudo pip3 install mock
-    - python3 setup.py build
-
-#before_script:
-#    - sudo Xvfb :99 -ac &
-#    - export DISPLAY=:99
-
-script:
-    -  mkdir -p /home/travis/.gramps/grampsdb/
-    -  DJANGO_SETTINGS_MODULE=gramps.webapp.settings nosetests3 --exclude=TestcaseGenerator --exclude=vcard --exclude=merge_ref_test  gramps
@@ -1,4 +1,4 @@
-**** This is Gramps Frequently Asked Questions ****
+**** This is GRAMPS Frequently Asked Questions ****

 The questions below frequently come up in mailing list discussions and forums.
 This list is by no means complete. If you would like to add questions/answers 
@@ -9,23 +9,23 @@ to this list, please email your suggestions to gramps-devel@lists.sf.net

 ==General==

- 1. What is Gramps?
+ 1. What is GRAMPS?

 2. Where do I get it and how much does it cost?

- 3. Does Gramps exist in other languages?
+ 3. Does GRAMPS exist in other languages?

 4. How do I keep backups?

 5. Does Gramps support Unicode fonts? In particular, does it support non-Roman Unicode fonts?

- 6. What is needed to install Gramps under Linux, Solaris, or FreeBSD?
+ 6. What is needed to install GRAMPS under Linux, Solaris, or FreeBSD?

 7. Does it work with Windows (tm)?

 8. Does it work with the Mac?

- 9. What are the Minimum Specs to run Gramps?
+ 9. What are the Minimum Specs to run GRAMPS?

 ==Preferences==

@@ -33,43 +33,43 @@ to this list, please email your suggestions to gramps-devel@lists.sf.net

 ==Collaboration-Portability==

- 11. Is Gramps compatible with other genealogical software?
+ 11. Is GRAMPS compatible with other genealogical software?

- 12. Can Gramps read files created by GenApp X?
+ 12. Can GRAMPS read files created by GenApp X?

- 13. Can Gramps write files readable by GenApp X?
+ 13. Can GRAMPS write files readable by GenApp X?

- 14. What standards does Gramps support?
+ 14. What standards does GRAMPS support?

- 15. How do I import data from another genealogy program into Gramps?
+ 15. How do I import data from another genealogy program into GRAMPS?

- 16. Can I install Gramps on a Linux Web Server and use it via a web browser? This would enable my relations worldwide to access and update it.
+ 16. Can I install GRAMPS on a Linux Web Server and use it via a web browser? This would enable my relations worldwide to access and update it.

 ==Reports==

- 17. Can Gramps print a genealogical tree for my family?
+ 17. Can GRAMPS print a genealogical tree for my family?

- 18. In what formats can Gramps output its reports?
+ 18. In what formats can GRAMPS output its reports?

 19. How can I change the default language in reports?

- 20. Is Gramps compatible with the Internet?
+ 20. Is GRAMPS compatible with the Internet?

 21. Can I create custom reports/filters/whatever?

 22. Why are non-latin characters displayed as garbage in PDF/PS reports?

- 23. I would like to contribute to Gramps by writing my favorite report.
+ 23. I would like to contribute to GRAMPS by writing my favorite report.

-==Database - Gramps file formats==
+==Database - GRAMPS file formats==

- 24. What is the maximum database size (bytes) Gramps can handle?
+ 24. What is the maximum database size (bytes) GRAMPS can handle?

- 25. How many people can Gramps database handle? 
+ 25. How many people can GRAMPS database handle? 

 26. My database is really big. Is there a way around loading all the data into memory?

- 27. Can I run Gramps from a database on a NFS share?
+ 27. Can I run GRAMPS from a database on a NFS share?

 28. Why is the database format not portable?

@@ -77,116 +77,123 @@ to this list, please email your suggestions to gramps-devel@lists.sf.net

 29. I found a bug and I want it fixed right now! What do I do?

- 30. Gramps should be a .... type of application
+ 30. GRAMPS should be a .... type of application

-==Gramps Webhosting ==
+==GRAMPS Webhosting ==
+
+ 31. How can I publish web sites generated by GRAMPS?
+
+ 32. How do I submit my pages to the GRAMPS library site (http://library.gramps-project.org)?
+
+ 33. After I upload my Family Web Page to library.gramps-project.org, is the password used for write privileges only or read privileges?
+
+ 34. Do I view the Family Web Page with a url into my browser? Or through a link on a list of Family Web Pages on the GRAMPS-Project.org site?

- 31. How can I publish web sites generated by Gramps?


 **** Questions and answers ****

 ==General==

-1. What is Gramps?
+1. What is GRAMPS?

-Gramps is the Genealogical Research and Analysis Management Program System. 
+GRAMPS is the Genealogical Research and Analysis Management Program System. 
 In other words, it is a personal genealogy program letting you store, edit, 
 and research genealogical data using the powers of your computer. 


 2. Where do I get it and how much does it cost?

-Gramps can be downloaded from http://sf.net/projects/gramps at no charge. 
-Gramps is an Open Source project covered by the GNU General Public License. 
+GRAMPS can be downloaded from http://sf.net/projects/gramps at no charge. 
+GRAMPS is an Open Source project covered by the GNU General Public License. 
 You have full access to the source code and are allowed to distribute the 
 program and source code freely. 


-3. Does Gramps exist in other languages?
+3. Does GRAMPS exist in other languages?

-Yes, at the moment Gramps is translated in 15 languages
+Yes, at the moment GRAMPS is translated in 15 languages


 4. How do I keep backups?

-Use a recent version of Gramps! From 2.2.5 onwards there is an automatic backup utility.
-It is extremely important to keep backups of your data, and keep them in a safe place. Gramps has a specific portable file format which is small, and human readable, denoted by .gramps. If you have allowed this in the preferences (In Edit menu->Preferences->General), Gramps will keep a backup of your database on exit. You can copy this backup file from time to time to a save location (eg a usb stick). 
+Use a recent version of GRAMPS! From 2.2.5 onwards there is an automatic backup utility.
+It is extremely important to keep backups of your data, and keep them in a safe place. GRAMPS has a specific portable file format which is small, and human readable, denoted by .gramps. If you have allowed this in the preferences (In Edit menu->Preferences->General), GRAMPS will keep a backup of your database on exit. You can copy this backup file from time to time to a save location (eg a usb stick). 

-Note: The .gramps files are compressed. Clicking them will open Gramps. To see the XML select them and open them with a decompressing utility (like ark, gunzip), after which you can extract the XML file which is human readable.
-Do not keep backups in GEDCOM. Not all information Gramps stores can be written in the GEDCOM. Hence, an export/import operation Gramps --> GEDCOM --> Gramps, will mean you lose data. Use the .gramps file format for backups!
+Note: The .gramps files are compressed. Clicking them will open GRAMPS. To see the XML select them and open them with a decompressing utility (like ark, gunzip), after which you can extract the XML file which is human readable.
+Do not keep backups in GEDCOM. Not all information GRAMPS stores can be written in the GEDCOM. Hence, an export/import operation GRAMPS --> GEDCOM --> GRAMPS, will mean you lose data. Use the .gramps file format for backups!
 Do not keep backups in GRDB format. GRDB is a database, which might be computer dependent (read, not working on a different PC). Small damage to a GRDB file can also not be repaired. Use the .gramps file format for backups!


 5. Does Gramps support Unicode fonts? In particular, does it support non-Roman Unicode fonts?

-Yes. Gramps works internally with Unicode (UTF-8), so all alphabets can be used on all entry fields. All reports fully support this, although for PDF/PS you need to work with gnome-print or openoffice.
+Yes. GRAMPS works internally with Unicode (UTF-8), so all alphabets can be used on all entry fields. All reports fully support this, although for PDF/PS you need to work with gnome-print or openoffice.

 ==Installation==

-6. What is needed to install Gramps under Linux, Solaris, or FreeBSD?
+6. What is needed to install GRAMPS under Linux, Solaris, or FreeBSD?

-Gramps is a [http://en.wikipedia.org/wiki/Gtk GTK] application. Gramps needs to have the [http://en.wikipedia.org/wiki/Pygtk pygtk] libraries installed on the system. As long as these libraries are installed, Gramps should function. It will operate under the GNOME desktop, KDE desktop, or any other desktop. If the GNOME bindings for Python are installed on the system, Gramps will have additional functionality. The Gramps project recommends version 2.8 or higher of GTK.
+GRAMPS is a [http://en.wikipedia.org/wiki/Gtk GTK] application. GRAMPS needs to have the [http://en.wikipedia.org/wiki/Pygtk pygtk] libraries installed on the system. As long as these libraries are installed, GRAMPS should function. It will operate under the GNOME desktop, KDE desktop, or any other desktop. If the GNOME bindings for Python are installed on the system, GRAMPS will have additional functionality. The GRAMPS project recommends version 2.8 or higher of GTK.


 7. Does it work with Windows (tm)?

-The Linux Genealogy CD can function as a live CD that you boot directly from. You can then run Linux and Gramps off the CD, even if your computer is entirely Windows.
+The Linux Genealogy CD can function as a live CD that you boot directly from. You can then run Linux and GRAMPS off the CD, even if your computer is entirely Windows.

 An experimental Windows installer is available, however we do not have the manpower to offer support for Windows. A windows mailing list is available however and we do do our best to solve windows related problems.


 8. Does it work with the Mac?

-The Fink project has ported some older versions of Gramps to OS X (tm). The Mac OS X port is not directly supported by the Gramps project, primarily because none of the Gramps developers have access to Mac OS X and because OS X is not Free Software.
+The Fink project has ported some older versions of GRAMPS to OS X (tm). The Mac OS X port is not directly supported by the GRAMPS project, primarily because none of the GRAMPS developers have access to Mac OS X and because OS X is not Free Software.

-This present version of Gramps (2.2.x) does not appear to have been ported by the Fink project. Please contact the Fink project for more information. However, some users had success in installing 2.2.x on Mac OSX either running in native mode or running on X11 using some of the fink packages. 
+This present version of GRAMPS (2.2.x) does not appear to have been ported by the Fink project. Please contact the Fink project for more information. However, some users had success in installing 2.2.x on Mac OSX either running in native mode or running on X11 using some of the fink packages. 


-9. What are the Minimum Specs to run Gramps?
+9. What are the Minimum Specs to run GRAMPS?

-We would recommend at least an 800x600 video display. For Gramps 2.0, the memory requirements have been reduced, and Gramps can run quite efficiently on a 256MB system, holding considerably more people. A system with 512MB should be able to hold around 200,000 people. Disk space requirements for databases are however considerably larger, with a typical database being several megabytes in size. For 120.000 people you must consider already 530Mb for the database. Pictures are stored on disk separately, so a large harddisk is necessary.
+We would recommend at least an 800x600 video display. For GRAMPS 2.0, the memory requirements have been reduced, and GRAMPS can run quite efficiently on a 256MB system, holding considerably more people. A system with 512MB should be able to hold around 200,000 people. Disk space requirements for databases are however considerably larger, with a typical database being several megabytes in size. For 120.000 people you must consider already 530Mb for the database. Pictures are stored on disk separately, so a large harddisk is necessary.


 ==Preferences==

 10. Can I change the dates in reports to 'day month year'

-Yes, change in the preferences ("Edit->Preferences") the date for Gramps to the required format (eg YYYY-MM-DD or day mont year), and make the report. Your global date preferences will be used.
+Yes, change in the preferences ("Edit->Preferences") the date for GRAMPS to the required format (eg YYYY-MM-DD or day mont year), and make the report. Your global date preferences will be used.


 ==Collaboration-Portability==

-11. Is Gramps compatible with other genealogical software?
+11. Is GRAMPS compatible with other genealogical software?

-Gramps makes every effort to maintain compatibility with GEDCOM, the general standard of recording genealogical information. We have import and export filters that enable Gramps to read and write GEDCOM files.
+GRAMPS makes every effort to maintain compatibility with GEDCOM, the general standard of recording genealogical information. We have import and export filters that enable GRAMPS to read and write GEDCOM files.

-It is important to understand that the GEDCOM standard is poorly implemented -- virtually every genealogical software has its own "flavor" of GEDCOM. As we learn about new flavor, the import/export filters can be created very quickly. However, finding out about the unknown flavors requires user feedback. Please feel free to inform us about any GEDCOM flavor not supported by Gramps, and we will do our best to support it!
+It is important to understand that the GEDCOM standard is poorly implemented -- virtually every genealogical software has its own "flavor" of GEDCOM. As we learn about new flavor, the import/export filters can be created very quickly. However, finding out about the unknown flavors requires user feedback. Please feel free to inform us about any GEDCOM flavor not supported by GRAMPS, and we will do our best to support it!


-12. Can Gramps read files created by GenApp X?
+12. Can GRAMPS read files created by GenApp X?

 See above.


-13. Can Gramps write files readable by GenApp X?
+13. Can GRAMPS write files readable by GenApp X?

 See above.


-14. What standards does Gramps support?
+14. What standards does GRAMPS support?

-The nice thing about standards is that there never is a shortage of them. Gramps is tested to support the following flavors of GEDCOM: GEDCOM5.5, Brother's Keeper, Family Origins, Family Tree Maker, Ftree, GeneWeb, Legacy, Personal Ancestral File, Pro-Gen, Reunion, and Visual Genealogie.
+The nice thing about standards is that there never is a shortage of them. GRAMPS is tested to support the following flavors of GEDCOM: GEDCOM5.5, Brother's Keeper, Family Origins, Family Tree Maker, Ftree, GeneWeb, Legacy, Personal Ancestral File, Pro-Gen, Reunion, and Visual Genealogie.


-15. How do I import data from another genealogy program into Gramps?
+15. How do I import data from another genealogy program into GRAMPS?

 The best way is to create a new gramps database file (.grdb), and select the import option in the file menu. Here you select the GEDCOM you generated with the other program, and import it. 


-16. Can I install Gramps on a Linux Web Server and use it via a web browser? This would enable my relations worldwide to access and update it.
+16. Can I install GRAMPS on a Linux Web Server and use it via a web browser? This would enable my relations worldwide to access and update it.

-While Gramps can generate web sites, it does not provide a web interface that allows for editing. If this is a requirement, then [http://geneweb.org GeneWeb] or [http://phpgedview.sourceforge.net PhpGedView] are programs more likely to meet your needs. However, you may wish to ask yourself the following questions:
+While GRAMPS can generate web sites, it does not provide a web interface that allows for editing. If this is a requirement, then [http://geneweb.org GeneWeb] or [http://phpgedview.sourceforge.net PhpGedView] are programs more likely to meet your needs. However, you may wish to ask yourself the following questions:
 * Do I really want relatives or other people to directly edit my genealogy database?
 * Do I implicitly trust, without verification, any data that people may enter?
 * Do these people have the same understanding of good genealogy practice that I have?
@@ -197,7 +204,7 @@ You may also want to consider the effects of possible downtime of your site if y

 ==Reports==

-17. Can Gramps print a genealogical tree for my family?
+17. Can GRAMPS print a genealogical tree for my family?

 Yes. Different people have different ideas of what a genealogical tree is. 
 Some think of it as a chart going from the distant ancestor and listing 
@@ -205,14 +212,14 @@ all his/her descendants and their families. Others think it should be a
 chart going from the person back in time, listing the ancestors and their 
 families. Yet other people think of a table, text report, etc. 

-Gramps can produce any of the above, and many more different charts and 
+GRAMPS can produce any of the above, and many more different charts and 
 reports. Moreover, the plugin architechture enables users (you) to create 
 their own plugins which could be new reports, charts, or research tools. 


-18. In what formats can Gramps output its reports?
+18. In what formats can GRAMPS output its reports?

-Text reports are available in HTML, PDF, ODT, LaTeX, and RTF formats. Graphical reports (charts and diagrams) are available in PostScript, PDF, SVG, ODS, and Graphviz formats.
+Text reports are available in HTML, PDF, ODT, LaTeX, and RTF formats. Graphical reports (charts and diagrams) are available in PostScript, PDF, SVG, ODS, and GraphViz formats.


 19. How can I change the default language in reports? 
@@ -220,11 +227,11 @@ Text reports are available in HTML, PDF, ODT, LaTeX, and RTF formats. Graphical
 The reports are in the language of your linux installation. You can change it by installing extra language packs, see [Howto: Change the language of reports] on wiki.


-20. Is Gramps compatible with the Internet?
+20. Is GRAMPS compatible with the Internet?

-Gramps can store web addresses and direct your browser to them. It can import
+GRAMPS can store web addresses and direct your browser to them. It can import
 data that you download from the Internet. It can export data that you could 
-send over the Internet. Gramps is familiar with the standard file formats 
+send over the Internet. GRAMPS is familiar with the standard file formats 
 widely used on the Internet (e.g. JPEG, PNG, and GIF images, MP3, OGG, and 
 WAV sound files, QuickTime, MPEG, and AVI movie files, etc). Other than that, 
 there is little that a genealogical program can do with the Internet :-) 
@@ -234,7 +241,7 @@ there is little that a genealogical program can do with the Internet :-)

 Yes. There are many levels of customization. One is creating or modifying 
 the templates used for the reports. This gives you some control over 
-the fonts, colors, and some layout of the reports. You can also use Gramps 
+the fonts, colors, and some layout of the reports. You can also use GRAMPS 
 controls in the report dialogs to tell what contents should be used for a 
 particular report. In addition to this, you have an ability to create your 
 own filters -- this is useful in selecting people based on criteria set 
@@ -246,47 +253,47 @@ knowledge of programming in Python.

 22. Why are non-latin characters displayed as garbage in PDF/PS reports?

-This is a limitation of the built-in fonts of PS and PDF formats. To print non-Latin text, use the Print... in the format selection menu of the report dialog. This will use the gnome-print backend, which supports PS and PDF creation, as well as direct printing. (Note: you might need to install gnome-print separately as it is not required for Gramps).
+This is a limitation of the built-in fonts of PS and PDF formats. To print non-Latin text, use the Print... in the format selection menu of the report dialog. This will use the gnome-print backend, which supports PS and PDF creation, as well as direct printing. (Note: you might need to install gnome-print separately as it is not required for GRAMPS).

 If you only have Latin text, the PDF option will produce a smaller PDF compared to that created by gnome-print, simply because no font information will be embedded.


-23. I would like to contribute to Gramps by writing my favorite report.
+23. I would like to contribute to GRAMPS by writing my favorite report.
    How do I do that?

-The easiest way to contribute to reports, filters, tools, etc. is to copy an existing Gramps report, filter, or tool. If you can create what you want by modifying existing code -- great! If your idea does not fit into the logic of any existing Gramps tool, you will need to write your own plugin from scratch. Help is available on the [Developers Portal] on wiki, or on the developers mailing list: gramps-devel@lists.sourceforge.net.
+The easiest way to contribute to reports, filters, tools, etc. is to copy an existing GRAMPS report, filter, or tool. If you can create what you want by modifying existing code -- great! If your idea does not fit into the logic of any existing GRAMPS tool, you will need to write your own plugin from scratch. Help is available on the [Developers Portal] on wiki, or on the developers mailing list: gramps-devel@lists.sourceforge.net.

-To test your work in progress, you may save your plugin under $HOME/.gramps/plugins directory and it should be found and imported on startup. The correctly written plugin will register itself with Gramps, create menu item, and so on.
+To test your work in progress, you may save your plugin under $HOME/.gramps/plugins directory and it should be found and imported on startup. The correctly written plugin will register itself with GRAMPS, create menu item, and so on.

-If you are happy with your plugin and would like to contribute your code back to the Gramps project, you are very welcome to do so by contacting us at gramps-devel@lists.sourceforge.net
+If you are happy with your plugin and would like to contribute your code back to the GRAMPS project, you are very welcome to do so by contacting us at gramps-devel@lists.sourceforge.net


-==Database - Gramps file formats==
+==Database - GRAMPS file formats==

-24. What is the maximum database size (bytes) Gramps can handle?
+24. What is the maximum database size (bytes) GRAMPS can handle?

-Gramps has no hard limits on the size of a database that it can handle. Starting with 2.0.0 release, Gramps no longer loads all data into memory, which allows it to work with a much larger database than before. In reality, however, there are practical limits. The main limiting factors are the available memory on the system and the cache size used for BSDDB database access. With common memory sizes these days, Gramps should have no problem using databases with tens of thousands of people.
+GRAMPS has no hard limits on the size of a database that it can handle. Starting with 2.0.0 release, GRAMPS no longer loads all data into memory, which allows it to work with a much larger database than before. In reality, however, there are practical limits. The main limiting factors are the available memory on the system and the cache size used for BSDDB database access. With common memory sizes these days, GRAMPS should have no problem using databases with tens of thousands of people.


-25. How many people can Gramps database handle? 
+25. How many people can GRAMPS database handle? 

-See above. Again, this is dependent on how much memory you have, see [Gramps Performance] on wiki.
+See above. Again, this is dependent on how much memory you have, see [GRAMPS Performance] on wiki.


 26. My database is really big. Is there a way around loading all the data into memory?

-Starting with 2.0.0 release, Gramps no longer loads all data into memory, which allows it to work with a much larger database than before. The fileformat used is .grdb which means gramps database.
+Starting with 2.0.0 release, GRAMPS no longer loads all data into memory, which allows it to work with a much larger database than before. The fileformat used is .grdb which means gramps database.


-27. Can I run Gramps from a database on a NFS share?
+27. Can I run GRAMPS from a database on a NFS share?

 Yes you can.


 28. Why is the database format not portable?

-The biggest issue with Gramps portability lies with 'transactions'. With
-Gramps 2.2, we added support for atomic transactions to protect data.
+The biggest issue with GRAMPS portability lies with 'transactions'. With
+GRAMPS 2.2, we added support for atomic transactions to protect data.
 With atomic transactions, multiple changes are committed as a single
 unit. Either all the changes make it, or none of the changes make it.
 You are never left in a situation with a partial set of changes. A side
@@ -334,25 +341,41 @@ If the above explanations seem vague, please follow this link:
 http://www.chiark.greenend.org.uk/~sgtatham/bugs.html


-30. Gramps should be a .... type of application
+30. GRAMPS should be a .... type of application

-The surest way to see it happen is to get it done by yourself. Since Gramps is free/open source, nobody prevents you from taking all of the code and continuing its development in whatever direction you see fit. In doing so, you may consider giving your new project another name to avoid confusion with the continuing Gramps development. If you would like the Gramps project to provide advice, expertise, filters, etc., we will gladly cooperate with your new project, to ensure compatibility or import/export options to your new format of a project.
+The surest way to see it happen is to get it done by yourself. Since GRAMPS is free/open source, nobody prevents you from taking all of the code and continuing its development in whatever direction you see fit. In doing so, you may consider giving your new project another name to avoid confusion with the continuing GRAMPS development. If you would like the GRAMPS project to provide advice, expertise, filters, etc., we will gladly cooperate with your new project, to ensure compatibility or import/export options to your new format of a project.

-If, however, you would like the Gramps project to adopt your strategy, you would need to convince Gramps developers that your strategy is good for Gramps and superior to the present development strategy.
+If, however, you would like the GRAMPS project to adopt your strategy, you would need to convince GRAMPS developers that your strategy is good for GRAMPS and superior to the present development strategy.
                                                                                
-HINT: if Gramps developers are still not convinced after about three
+HINT: if GRAMPS developers are still not convinced after about three
 messages sent to gramps-devel, maybe you are better off on your own
 rather than with a company of retards who can't fully realize the
 potential of your great idea :-)


-==Gramps Webhosting ==
+==GRAMPS Webhosting ==

-31. How can I publish web sites generated by Gramps?
+31. How can I publish web sites generated by GRAMPS?

-Since Gramps generates HTML pages, you can upload the pages to your personal web site. If you do not have a personal web site, and still wish to have your pages available on the internet.
+Since GRAMPS generates HTML pages, you can upload the pages to your personal web site. If you do not have a personal web site, and still wish to have your pages available on the internet, the GRAMPS project can provide space for you at the http://library.gramps-project.org, see the [webhosting article] on wiki.


-**** End of Gramps Frequently Asked Questions ****
+32. How do I submit my pages to the GRAMPS library site (http://library.gramps-project.org)?
+
+If you wish to submit pages to the GRAMPS library site, you will need to contact the GRAMPS project, typically by sending a message to the gramps-users mailing list. You will then be given a username and password that will allow you to upload your files to the site. After you upload the files (in a gzip'ed tar file), the GRAMPS project will install the pages for you on the site.
+
+
+33. After I upload my Family Web Page to library.gramps-project.org, is the password used for write privileges only or read privileges?
+
+In order to prevent abuse of the library.gramsp-project.org site, the password given allows uploads only. If you wish to have a username and password combination to restrict read access to your pages, you will need to contact the GRAMPS project, and we could set this up for you. However, the read and write accounts will be separate accounts.
+
+
+34. Do I view the Family Web Page with a url into my browser? Or through a link on a list of Family Web Pages on the GRAMPS-Project.org site?
+
+The main page on the library.gramps-project.org site will contain an index of the available family sites. However, there will be a unique URL for each site as well.
+
+
+
+**** End of GRAMPS Frequently Asked Questions ****

 $Id$
@@ -1,4 +1,3 @@
-#! /usr/bin/env python3
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
@@ -16,9 +15,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #

+# $Id$
+
 """
 This is a stub to start Gramps. It is provided for the sole reason of being
 able to run gramps from the source directory without setting PYTHONPATH
@@ -1,55 +1,50 @@
+$Id$
+
 This file contains some useful details on the installation from source code
-for Gramps. It does not cover installation of a pre-built binary package.
+for GRAMPS. It does not cover installation of a pre-built binary package.
 For that use your package manager, the rest is already done by the packager.

 Uninstall old version
 ---------------------
-If you do a source install in the same place as an existing install,
+If you do a source install in the same place of an existing install,
 you need to remove the old version first. You can delete the old
-version by deleting the installed directories. For example, if your installation prefix is /usr/local, remove the following:
-        /usr/local/share/gramps
+version by deleting the installed directories (for example,
+        /usr/share/gramps
        /usr/local/lib/pythonx.x/site-packages/gramps
-If you installed with a package manager you might instead need to remove
        /usr/local/lib/pythonx.x/dist-packages/gramps
-
-replacing pythonx.x with the python version you used, e.g. python3.4.
-Also remove any gramps .egg files that are installed along with the gramps
-directory and the file /usr/local/bin/gramps.
-
+        /usr/lib/pythonx.x/site-packages/gramps
+        /usr/lib/pythonx.x/dist-packages/gramps
+    where pythonx.x is python2.7 or whatever version you installed gramps with.
+Also remove the gramps .egg files that are installed along with the gramps
+directory.

 If you don't know the list of all files that Gramps installed, you can
 reinstall it with the --record option, and take a look at the list this
 produces (so python setup.py install --record grampsfiles.txt

-Gramps is a python application, so loading happens on reading the
+GRAMPS is a python application, so loading happens on reading the
 files, meaning that files of a previous version that are no longer
 present in the new version can still be loaded, making the new install
 unstable!

 distutils install
 -----------------
-We do not check all dependencies of Gramps, see README for a list of
-all required and optional dependencies. Missing dependencies will
-result in runtime errors.
+We do not check all dependencies of Gramps, see README for a 
+list of all required and optional dependencies. On running Gramps, errors will
+be returned if dependencies are missing.
+
+If you are building from released tarball, you should be able to just
+run 

-To build and install, whether from a tarball or git repo:
   python setup.py build
-   sudo python setup.py install
+   python setup.py install

-You can avoid using sudo for the install step by specifying a prefix to which you have write priviledge. The default is /usr/local, which is usually owned by root. You can learn of more options with
-   python setup.py --help
-
-One can use gramps from the command line without installing it by
-setting the following environment variables, but that won't provide
-things like MIME type and desktop entries.
-
-   export PYTHONPATH="/top/grampsdir/gramps:$PYTHONPATH"
-   export GRAMPS_RESOURCES="/top/grampsdir"
-
-See below for ways to invoke Gramps.
+where the last must be done as root. You can work with Gramps if you only build
+it by pointing the PYTHONPATH to the build directory, but things like MIME type
+and desktop entries will not be created then.

 Typical install directories in linux (ubuntu) are:
-  * /usr/local/lib/python3.4/dist-packages/gramps/  : the gramps python module
+  * /usr/local/lib/python2.7/dist-packages/gramps/  : the gramps python module
  * /usr/local/share/mime-info    : mime info so gramps opens files automatically
  * /usr/local/share/icons/gnome  : our icons
  * /usr/local/share/doc/gramps   : documentation, also example .gramps and .gedcom
@@ -62,35 +57,41 @@ Typical install directories in linux (ubuntu) are:
 Running Gramps
 --------------
 Gramps is python only, so no compilation is needed, you can even run gramps
-from the source directory.
+from the source directory. 

 a) You installed Gramps, then you can run it with the command

-     gramps
+     gramps 

 b) You installed Gramps, and want to start it from the PYTHONPATH. In this
    case use the command:

     python -c 'from gramps.grampsapp import main; main()'

-   The executable 'gramps' in /usr/local/bin or /usr/bin from a) does
+   The executable 'gramps' in /usr/local/bin or /usr/bin from a) does 
   this for you.

 b) You downloaded the Gramps source code to a directory, and want to run it.
-    You can start Gramps from the source code directory with
+    First, copy/rename the gramps/gen/const.py.in to gramps/gen/const.py. 
+    Edit this file if needed. Now you can start Gramps from the source code
+    directory with

     python Gramps.py

-    See gramps/gen/const.py how Gramps finds its resource directories in case
-    you encounter problems.

 Custom directory installation
 -------------------------------------
-If you would like to install Gramps without being root, or in an
+If you would like to install GRAMPS without being root, or in an 
 alternative location on windows, supply the --root argument to setup.py

 For example:
   python setup.py install --root ~/test
+   or
+   python setup.py install --root ~/test --enable-packager-mode
+
+The last option, --enable-packager-mode, is needed if you want to disable
+execution of post-install mime processing. If you don't have root/admin 
+access, this will be needed

 Packager's issues
 ------------------
@@ -99,8 +100,3 @@ To create a source distribution run:

   python setup.py sdist

-If Gramps is built outside of the source tree in a temporary location (e.g. when
-packaging for a distribution), the --resourcepath option can be used to specify
-the path to the installed location of the Gramps resources (e.g. /usr/share):
-
-   python setup.py install --resourcepath=/usr/share
@@ -1,7 +1,6 @@
 include AUTHORS
 include COPYING
 include FAQ
-include Gramps.py
 include INSTALL
 include LICENSE
 include MANIFEST.in
@@ -22,6 +21,7 @@ recursive-include windows *

 # Remove files created in the build
 exclude data/tips.xml
+#exclude gramps/gen/const.py
 exclude gramps/plugins/lib/holidays.xml
 exclude po/.intltool-merge-cache
 global-exclude *.pyc
@@ -1,350 +1,3 @@
-2015-10-12
-Version 4.2.1,
-* Support for Retina and HiDPI Display, added 24px icons
-* Fix verification tool with "Estimate missing or inexact dates"
-* Fix missing link in hourglass graph report
-* Sort custom place types in editors
-* Allow Easter calculation with python3
-* Fix crash on Descendants-detailed report
-* FanChartDescendants View should at least have 2 generations
-* Allow hyphenated gramps-id in Graphviz reports
-* Complete Individual Report fails to run
-* Fix broken wiki help links
-* Set TextOption widget to expand vertically
-* Unused Object Dialog box too small
-* Short cut keys does not work in 'Change Event Types' dialog
-* Update some Tips of the day
-* Error when extracting place names
-* Custom filters for note text repaired
-* Fix Pedigreeview crash when selecting Compact view
-* Set "visable_window" in GtkEventBox to fix transparency
-* Faster scrolling
-** cache database access for column values
-** cache do_get_path lookups
-** speed up load access on treeviews with no filters
-** new LRU size of 1k (was 250)
-** use cache in do_get_path from siblings
-* Avoid using person-centric date matching for places
-* Use place title as default name in GEDCOM import
-* Ensure place names are not empty after upgrade
-* Fix proxy to include all referenced place objects
-* Fix bug that prevented any addons being loaded onto the Mac version
-* Remove copy button from family tree manager
-* Consistency for name fields on Person Editor
-* [Geography] Place.set_name(name) requires a PlaceName()
-* [Geography] Fix and improvements on place selection
-* Limit problems with existing selection in media reference editor
-* Stability fixes on Mac port
-* Mac port localization crash with non-standard locale (e.g. en_IT).
-* Fix color on history
-* Fix countries selector for holidays
-* Fix missing markups into textual reports
-* All sidebars with Types now show custom types in combo list
-* [New] Added Places to CSV import/export
-* Some fixes on installer (setup.py)
-* Various improvements on gen.plug.utils
-* Fix graph reports [in Greek locale]
-* New date handler for Hungarian locale
-* Updated translations : cs, de, el, en_GB, fi, fr, hu, is, sv
-
-2015-08-02
-Version 4.2.0,
-* New date and language fields on place name
-* Review on GtkBuilder, fix some Gtk3 warnings and move from deprecated methods
-* Change icons and buttons handling methods
-* Enhanced Place Editor and new Place Name editor
-* New widget: use own interactive-search
-* Ability to import kml data into Geography views
-* Enhancement for removing multiple selected items from Views (action group)
-* Add drag support on more Views, Selectors and Editors
-* Add right-click "Copy all" to ListModel and all QuickTables
-* Review Alternate Place handling and edition
-* New 'Place' configuration keys set by user (settings)
-* New filter rule: is enclosed by
-* Consistency on Privacy option for reports
-* Consistency on "Name-format" options for reports
-* Add DeferredFilter class (a subclass of GenericFilter)
-* New textual Report: Links on Notes
-* Fix alphabetic index and toc bug in books
-* Enhancements on Style Editor
-* Enhancements on End Notes into textual reports
-* Changes on Individuals complete textual report
-* Changes on Ancestors Tree draw report: Include Siblings
-* Add name-format option, and deferred translation on Records report
-* Add deferred translation on Timeline draw report
-* Enable attributes gramplet on Source and Citation Views
-* New place locations gramplet
-* Optimizations around index, Flat and TreeView models
-* Enhanced samples files
-* All importers return now an ImportInfo object
-* Experimental gwplus (geneweb) import file format support
-* Remove experimental HTML renderer view
-* New test scripts
-* New Date handler for Japanese
-* Review on Slovenian and Czech Date Handlers
-* Implement both "traditional" and "simplfied" Chinese (translations and dates)
-* Serbian review
-
-2015-05-01
-Version 4.1.3, "Thou shalt not count to five", a maintenance release.
-* Fix db upgrade failure
-* GtkDialog mapped without a transient parent
-* [Gedcom} SUBN and SUBM record handling
-* [Gedcom] Import/export round trip causes lost information
-* [Gedcom] Entering a witness to an event such as marriage might be ignored
-* [Gedcom] Gramps can't import estim. date period exported by itself
-* [Gedcom] 1/4 and 1/2 ANSEL characters not supported on importing ANSEL
-* [Gedcom] Importing file containing multibyte UTF-8 characters fails
-* [Gedcom] Import fails for ANSI file under python 3
-* [Gedcom] Failure importing ANSEL encoded gedcom file.
-* [Gedcom] Characters ignored on a Gedcom encoded ANSI (cp1252 West Europe, USA)
-* [Gedcom] NameError in importer
-* [Gedcom] Event address is lost on import, i.e. disconnected from event
-* Crash on geneweb export with python3
-* GuiColorOption missing avail-changed event handler
-* Bad generation of [timeline report] ODT files since 4.0.0
-* Fix bad handle in explanation note for unknown event
-* Fix spurious generation of empty 'Alternative Name' in place.merge()
-* Support creating directories in various scenarios
-* Attempting to add a bookmark causes an error
-* Long series of "unhandled exception" popup boxes while doing a check & repair
-* Crash when trying to link existing place as an enclosing place using P0001 number
-* HTML view fails to load
-* Relationship Graph crashes
-* Python3 needs new_subpixbuf not subpixbuf
-* Regression: running gramps from crontab fails
-* tag_map is not initialized
-* Some labels now fit better on citations sidebar filter
-* Event columns in web narrative are too narrow
-* Problem by start program (launcher)
-* Translation string missing in Not Related tool for help and close button
-* Date format month/year is not well reported at editing time [in Italian]
-* Fix unknown gender relationships handler for the french locale
-* Fix a handle type bug on sidebar filter
-* Tidy up About dialog
-* Cleanup on some man files
-* Convert some remaining unicode literals
-* Fix mac menubar setting
-* Enable python3 to run po/update_po.py
-* Updated translations: cs, de, fr, is, nl
-
-2015-02-28
-Version 4.1.2, "That's no ordinary rabbit", a maintenance release.
-* Error converting python2 utf-8 strings to python3 str when loading data from database
-* Removing a parent place from a place leaves a dangling reference
-* Error during checking the database
-* Stubborn blank space in database won't be removed, fix removing rows in flat list views
-* Database upgrade fails if default media path is not set
-* Error converting database after upgrade to Gramps 4.1.1
-* Error in a single place within the places section
-* Entries from the add-or-choose selector of Place/Source/Media/Note cannot be dragged
-* Enclosing places tab should work like other similar tabs, new place reference editor
-* Association editor refuses dropped persons
-* Error on opening twice an object from clipboard
-* Incorrect spacing in export assistant file chooser
-* New Event types are saved as a disordered list
-* Always display main participants
-* Place titles can now be generated on-the-fly by a place displayer, default is still to use the place title field
-* GEDCOM import of embedded notes attached to media does not work
-* Crash on Ancestry.com .ged import; consistent.
-* Errors handling owner/submitter information in GEDCOM files.
-Only import researcher from GEDCOM or XML if the family tree was originally empty.
-* GEDCOM export does not export media attached to citations.
-* The fanchart view crashes if max generation is set to 1 away.
-* Sidebar Filters do not match placetypes in new placeview, two new filter rules (HasTitle, HasData)
-* Fix bug when family has no parents
-* Fix bad handle in explanation note for unknown event
-* Some labels now fit better on citations sidebar filter
-* Views in Geography should not always use the last option set by the user
-* Request for keyboard-controlled zoom on Geography view
-* Error geography view - Displaying main menu
-* Configure screen needs a file selector to select directory for "offline mode" files
-* Filter panel on geography view displays improperly
-* Detailed descendant report crashes, bibliography (citations)
-* Can't disable box shadow in SVG descendant tree
-* Descendant tree graphical report, syntax error in svg output
-* Regression: Complete Individual report has partially-untranslated output
-* Events Page in Narrative Report not working
-* Gramps freeze after defining a report style with German cm values
-* Various problems with docgen.TextDoc.add_media_object
-* Report event attribute name is not translated
-* Records Gramplet uses wrong text
-* Closing detached gramplet causes python to crash
-* Cannot reduce size of gramplets detached from a gramplet bar
-* Gramplets don't fill window when detached from dashboard
-* ImageMetadata doesn't show metadata
-* typo on GLib call, used by an addon only
-* Fix error setting gramplet tab label
-* Check for active person in session log gramplet
-* Spurious spaces in CLI List Family Trees, tab delimited output.
-Print statements changed to assemble the whole line before output.
-* Gtk3 warning and custom undoableentry widget, see bugzilla_id 644927
-* Warnings: deprecated Gtk properties and errors loading theme icon.
-Fix: database manager dialog is inconsistent for older gtk+3 versions.
-Warnings: deprecated Gtk properties and errors loading theme icon.
-Fix: Error loading theme icon 'gtk-apply'
-* gramps fails to start with gtk+-3.13.3
-* Places in data.gramps are not in the new Place hierarchy
-* Upgrade the version of some dependencies for Mac OS and Windows OS.
-* Keywords entry in gramps.desktop does not work
-* 'Available Gramps Updates for Addons' window not on top
-* Some text not translatable in context menu fancharts
-* Fix for Unit test
-* date inflections in _datehandler.py, update for Ukrainian, Russian, Croatian
-* Better support for Serbian and Turkish locales
-* New translation: Icelandic
-* Re-enable Turkish support after a major review. Thank you Uğur.
-* Updated translations: cs, de, eo, fi, fr, hr, hu, it, nb, nn, ru, sk, sr, sv, uk, zh_CN
-
-2014-10-24
-Version 4.1.1, "MachineThatGoes...Ping!", a maintenance release.
-* Fix custom place types in the place editor
-* Allow place type combobox to receive focus.
-* Store custom place types in the metadata table
-* Fix place type for places without a main location
-* Fix bug adding parent places to a new place
-* Prevent user creating a cycle in the place hierarchy
-* Avoid infinite loop when place cycle encountered
-* Prevent creation of a place cycle when merging
-* Fix error when no place is selected
-* Check that a place has been selected when saving.
-* Use the standard place selection widget to be consistent.
-* Add a new Top Level place through the Place Reference Editor
-* Fix backlinks code in place report
-* Backlinks for places can now also be places as well as events.
-* Fix check and repair tool for empty placerefs
-* Update location utilities to work with proxies
-* Place report does not run
-* Update place details gramplet
-* Locations are now displayed in a new separate gramplet.
-* Add check for empty handle in gramplets
-* Check DB lock on the recent opened trees list
-* Sidebarfilter gramplet does not fit well into People, Events or Media views
-* Fix new event default type considering existing events with *default* role
-* Rebuild secondary indexes after database upgrade
-* Importing gedcom files containing multibyte UTF-8 characters fails
-* Ahnentafel Report did not use Christening Date if no Birth Date
-* [Narweb:] Missing webpage for media under some circumstances
-* Fix narrated web report with gendex option enabled
-* Tweak to "default" CSS choice for the narrated web report
-* Invalid link for Merge citation Help button
-* Fix 'todo' gramplet
-* Fix path when using drag & drop to add media
-* Limit the number of generations displayed in the ancestor gramplet
-* Export of a subset of the tree failed
-* Fix issues in python3, and bytes-string mismatch with ICU
-* Fix url/uri handling with non-ascii characters under linux and mac
-* Fix name format on graphical reports
-* Fix name format on textual reports
-* Better GUI support for embeded custom attributes list on media object
-* Better keys for search under linux shells (.desktop file)
-* 'Unknown' person in detailed ancestor report can not be translated
-* Translations don't show in many labels
-* Ensure python text domain gets the right encoding.
-* Translate some punctuation marks
-* Various fixes around Geography and osmgpsmap
-* Allow gramplets to be displayed in the dashboard only
-* Update FSF address
-* Add Arabic-script, Islamic-date, Thai script, Married Name and more dates examples
-* Fix on czech date handler for calculated and estimated dates
-* Enhance Serbian date handler to handle Cyrillic dates
-* Simplify Canadian Ash Wednesday holiday
-* Re-enable Esperanto support (for non-Windows OS only) after a large review
-* New translation: Serbian
-* Various fixes in German and Czech
-* Updated translations: ar, cs, de, fi, fr, it, sv
-
-2014-06-15
-Version 4.1.0, the "Name go in book", new major release.
-* GEP 006: Better Place handling
-* New Tags support on Event, Place, Repository, Source, and Citation
-* Source/Citation Data becomes Attributes
-* Add optional support for checksum on Media object
-* New place hierarchies model
-* By default, you can choose navigator modes with a drop down.
-* New Place editor
-* Enhanced MediaReference Editor
-* Some debug tools move to new gramplets
-* Full Python 3 support
-* New functions and widgets related to Place and Media selections
-* Enhancements on to_struct()
-* New methods on Date handlers
-* Better support on translation for inflection rules
-
-2014-05-22
-Version 4.0.4, "Not the comfy chair", a maintenance release.
-* Upgrade to db version 17 fails in Python 3 due to use of iteritems
-* Database corrupted - TypeError: unhashable type: 'list'
-* Fix bug in abandon changes and quit
-* Consistency on create_id method
-* Better handling for non-ASCII characters on database-path
-* Better support for ANSEL characters
-* 'Display as' field in Name Editor reverts to Preferences default
-* Fix vcard date converter
-* View does not communicate over proxy server with autorisation
-* Enhanced Bookmark support
-* Event gramplet filter does not have field for primary role,
-* New HasDayOfWeek filter rule
-* Error when leaving a Gramps type field blank in an editor
-* Fix creation of events with same Gramps-ID
-* Crash when opening details of a person
-* Fix spacing on dialogs for some recent linux distribution
-* date editor and Date class allow e.g. Hebrew dates with newyear (Mar25)
-* Fix crash in fan chart view when scrolling
-* Poor contrast mouse on mouse over
-* Drag and drop only one data into Editors tabs
-* Enhancements and consitency on events gramplet, selector and view
-* Sometimes says 'no data exists for note' when saving
-* Enhanced Citation Editor
-* Do not always raise errors when some plugins are hidden
-* Remove hover selection from embedded lists
-* Fix update of active object after merge
-* Cleanup on warnings and messages around locale directory
-* Media Editor error if Path value was changed to a non existing file
-* Register history objects at startup
-* Avoid dumb encoding error when compiling gpr file
-* Work around Py2Cairo
-* Given Name Cloud Gramplet splits up given names into words
-* Users should not be allowed to edit and delete 'default' style into Style Editor
-* Filename Decoding Error in Graphical Reports
-* Missing closing bracket in Web_Basic-Spruce.css
-* Reorder tool: global name 'gen' is not defined
-* Fix start in East Asian language, force UTF-8 locale on Mac
-* Fix apple_collation
-* Spelling messages at random cause hang for a few seconds.
-* Media viewer list crashes during start if one try to select an entry where the media isn't available
-* 'Available Gramps Updates for Addons' window not on top
-* HTML View fails to load
-* Paper names and Styles values are now translated
-* Sort failure using glocale.sort_key
-* Improve support for collation variants
-* Translate some punctuation marks
-* Fix unit tests and python3 issues
-* Fix Relationships handler for Portuguese
-* Updated translations: ar, cs, de, fi, fr, he, it, lt, nb, nl, pl, pt_BR, ru, sv, uk
-
-2014-01-27
-Version 4.0.3, "It's tomorrow, ask me now", a maintenance release.
-* Fix copy via context menu on Views into Charts Category
-* Fix Tab sequence in Name Editor
-* Fix citations gramplet into media view
-* Fix unhandled exception when inspecting media
-* Fix Citation sidebar filter for python3
-* Fix add link to a "Html code" note
-* Fix message on backup dialog
-* Fix space for selection lists
-* Fix spell with myspell and LANG
-* Fix changes root cursor to hand
-* Recent file parser now gives the file location
-* Fix vertical overflows on check and repair-tool dialog
-* Fix custom key/value (data item) on Database difference report
-* Fix unhandled exception in media exif information under Windows OS
-* Fix person selector in searchfilter under Windows OS
-* Starting Gramps without console is now possible under Windows OS
-* Specific OS handling
-* Common fixes and changes with 3.4.7.
-* Updated translations: ca, de, fi, fr, ru
-
 2013-11-08
 Version 4.0.2, "Welcome to our humble abode", a maintenance release.
 * Citation merge works better for all objects with citations
@@ -439,7 +92,7 @@ Version 3.4.4 of Gramps! "The Ministry of Silly Names", a maintenance release.
 * Various updated translations: ca, de, fr, it, nl, pt_BR, ru, sv, uk

 2013-03-19
-Version 3.4.3 of Gramps! "Whenever life gets you down, Mrs. Brown", a maintenance release.
+Version 3.4.3 of Gramps! "'Whenever life gets you down, Mrs. Brown'", a maintenance release.
 * Sorting (both in the main display window, and particularly in Narrative Web output) now uses PyICU (if that module is available). Inclusion of PyICU is 'strongly recommended'. This resolves a number of bugs particularly related to sorting of non-Latin characters, and sorting on MS Windows and Mac OS X. Some changes have been made in Narrative Web to support contractions for alphabetic indices.
 * The automatic Addon checking and download now works once again (the location used in Gramps 3.4.2 and before had been changed, so the the automatic process was no longer working).
 * Import from Pro-Gen has been updated (at last) to take account of the change to Citations (in 3.4.0)
@@ -447,8 +100,8 @@ Version 3.4.3 of Gramps! "Whenever life gets you down, Mrs. Brown", a maintenanc
 * GEDCOM Repositories not imported correctly from FTM for Windows and Heredis.
 * Fixes to a number of errors in filtering notes.
 * Fix some errors in determining whether someone is alive (e.g. for filtering out alive people).
-* Make availability of Graphviz settings depend on output format
-* Improve the descriptions and tooltip for Graphviz aspect ratio option
+* Make availability of GraphViz settings depend on output format
+* Improve the descriptions and tooltip for GraphViz aspect ratio option
 * Fixed update problems with citation bottombar gramplet (bug #6336)
 * Fixed Open Document Text output in Book report (bug #6457)
 * A number of changes to Narrative Web:
@@ -1,21 +1,24 @@
+$Id$
+
 Please read the COPYING file first.

-Please read the INSTALL file if you intend to build from source.
+If building from source, also read the INSTALL file (at least through the
+"SUPER-SHORT VERSION") before going further.

 Requirements
 --------------------------------
 The following packages *MUST* be installed in order for Gramps to work:
-   Python 3.2 or greater
-   GTK 3.10 or greater
-   pygobject 3.12 or greater
+   Python 2.7 or greater, Python 3.2 or greater (or both python versions)
+   GTK 3.0 or greater
+   pygobject 3.3.2 or greater
   cairo, pango, pangocairo with introspection bindings (the gi packages)
   librsvg2 (svg icon view)
   xdg-utils
-   bsddb3
+   bsddb3 is required for Python 3.2 (not python 2.7)

 The following package is needed for full translation of the interface
 to your language:
-   language-pack-gnome-xx
+   language-pack-gnome-xx 
                    Translation of GTK elements to your language, with
                    xx your language code; e.g. for Dutch you need
                    language-pack-gnome-nl. The translation of the
@@ -24,13 +27,21 @@ to your language:

 The following packages are *STRONGLY RECOMMENDED* to be installed:

-   osmgpsmap        Used to show maps in the geography view.
+   osmgpsmap        Used to show maps in the geography view. 
                    It may be osmgpsmap, osm-gps-map, or python-osmgpsmap,
                    but the Python bindings for this must also be present.
                    Without this the GeoView will not be active, see
-                    https://gramps-project.org/wiki/index.php?title=Gramps_4.2_Wiki_Manual_-_Categories#Geography_Category
+                    http://gramps-project.org/wiki/index.php?title=Gramps_4.0_Wiki_Manual_-_Main_Window#Geography_Category
+                    !! PACKAGERS: unfortunately, at the moment (March 2013),
+                    the patches which gramps 4.0 needs osm-gps-map to have
+                    are not yet released (as a new osm-gps-map version). The
+                    osm-gps-map sources must be dated 6 February 2013 (or
+                    later) to have the necessary patches.  You may obtain
+                    it from: http://nzjrs.github.com/osm-gps-map/ or else
+                    http://sourceforge.net/projects/gramps/files/Dependencies
+                    (The necessary version seems to be 0.8 -- or later.)

-   Graphviz         Enable creation of graphs using Graphviz engine.
+   GraphViz         Enable creation of graphs using GraphViz engine.
                    Without this, three reports cannot be run.
                    Obtain it from: http://www.graphviz.org

@@ -42,25 +53,23 @@ The following packages are *STRONGLY RECOMMENDED* to be installed:
                    sorting is done through built-in libraries. PyICU is
                    fairly widely available through the package managers of
                    distributions. See http://pyicu.osafoundation.org/
-                    (These are Python bindings for the ICU package. 
-                    https://pypi.python.org/pypi/PyICU/)
+                    (These are Python bindings for the ICU package.)

 The following packages are optional

-   gtkspell         Enable spell checking in the notes. Gtkspell depends on
+   gtkspell         Enable spell checking in the notes. Gtkspell depends on 
                    enchant. A version of gtkspell with gobject introspection
                    is needed, so minimally version 3.0.0

   rcs              The GNU Revision Control System (RCS) can be used to manage
                    multiple revisions of your family trees. See info at
-                    https://gramps-project.org/wiki/index.php?title=Gramps_4.2_Wiki_Manual_-_Manage_Family_Trees#Archiving_a_Family_Tree
+                    http://www.gramps-project.org/wiki/index.php?title=Gramps_4.0_Wiki_Manual_-_Manage_Family_Trees#Archiving_a_Family_Tree
                    Only rcs is needed, NO python bindings are required

   PIL              Python Image Library is needed to crop
                    images and also to convert non-JPG images to
                    JPG so as to include them in LaTeX output.
-                    (For Python3 a different source may be needed,
-                    python-imaging or python-pillow or python3-pillow)
+                    (For Python3 a different source may be needed.)

   GExiv2           Enables Gramps to manage Exif metadata embedded in your
                    media. Gramps needs version 0.5 or greater.
@@ -68,12 +77,20 @@ The following packages are optional

   ttf-freefont     More font support in the reports

-   gir-webkit       Required for the (user-downloadable) HtmlView plugin
+   gir-webkit       GObject introspection data of WebKit is required for the
+                    hidden view 'Htmlview', which allows websites to be
+                    opened in Gramps. Users can unhide the view in the
+                    plugin manager.  A html renderer must be installed to
+                    use the view.
+                    !! PACKAGERS, Test if on your distribution
+                    webkit and Gramps is stable. If you obtain crashes, patch 
+                    src/plugins/view/htmlrenderer.py and
+                    src/plugins/view/geoview.gpr.py, so as to remove:
+                       from gi.repository import WebKit as webkit

-   goocanvas2       Required for the (user-downloadable) GraphView plugin
+   goocanvas2:
+                    Required for the (user-downloadable) Graphview plugin

-No longer needed in 4.1:
-   ?
 No longer needed in 4.0:
   pygoocanvas, pygtk, pyexiv2
 No longer needed in 3.3:
@@ -81,12 +98,12 @@ No longer needed in 3.3:
 No longer needed in 3.2:
   python glade bindings
 No longer needed in 3.1:
-   yelp             Gnome help browser. No offline help is shipped see Gramps website for User manual
+   yelp             Gnome help browser. At the moment no help is shipped


 Documentation
 ---------------------------------
-The User Manual is maintained on the Gramps website,
+The User Manual is now maintained on the gramps website,
 http://www.gramps-project.org/wiki/index.php?title=User_manual

 --------------------------------
@@ -1,13 +1,69 @@
-Major enhancements in Gramps 4.2.0:
+$Id$

-* GEP 36: GEPS 036: Extended Alternative Place Name Handling:
-https://gramps-project.org/wiki/index.php?title=GEPS_036:_Extended_Alternative_Place_Name_Handling
+Gramps 4.0.0, the "The Miracle of Birth", release.

-* GEP interactive search: own interactive-search box.
+This is a major release, don't upgrade before verifying your system can run it.
+As one of the very first big ($5.4 million), multi-platform (Linux, 
+Windows, Mac OS X, ...), non-Gnome GTK applications, Gramps makes the 
+jump to GTK 3. At the same time python 2.7 and python 3 are supported, 
+though the last must still be considered experimental. Gramps 4.0 
+further uses distutils for distribution, so the install sequence is changed.
+The Gramps developers have tried to make Gramps 4.0 as identical as 
+possible to 3.4, so no data changes are done, nor are there big interface 
+changes. In other words, a .gramps backup file of version 4.0 will open 
+without problems in Gramps 3.4, giving users the possibility to fully try Gramps 4.0.
+Don't be mistaken though, a huge amount of code is new and changed! 
+In order to bring this release we thank the many developers who helped 
+the GTK support on Mac, Windows and Linux forward. Note however, 
+Gramps 4.0 will only work on a top of a very recent sortware stack. 
+A Windows installer will probably not be available soon. In Linux current 
+distro's don't contain the optional packages in the form Gramps 4.0 needs. 
+All this should make clear you can safely keep using version 3.4 and wait 
+for packagers to catch up. People who cannot upgrade the required components 
+but want to use Gramps 4.0 should use it in Virtualbox.

-* Speedup on Tree and Flat Views
+Major enhancements in Gramps 4.0.0:
+
+* GEP 8: code reorganization: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_008:_File_Organization
+
+* GEP 26: Replace make: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_026:_Replace_%27make%27_for_Gramps_build
+
+* GEP 29: Gtk 3: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_Conversion
+
+* GEP 31: Python 3 support: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_031:_Python_3_support
+
+* Completely reworked localization handling
+
+Others changes in Gramps 4.0.0:
+
+* The Gramplet view has been renamed Dashboard. This to avoid an overload 
+of the word Gramplet, and to make it more clear to new users what can 
+be expected in this view
+
+* GTK 3 uses new themes, so users not on Gnome must set a nice GTK 3 
+theme to fully appreciate Gramps 4.0. Install a GTK 3 theme and set it. 
+If Gramps looks ugly, you made an error in this step.
+
+* Different sidebar navigators can be installed
+
+* New Ancestor Fan Chart View and Descendant Fan Chart View, which offer 
+a lot of insight in your family tree on a small space. Direct printing 
+is available from these views.
+
+* All wizards are reworked, so the exporter dialog, help and bug report 
+dialog are different from version 3.4, but offer the same functions
+
+* New To Do Gramplets listing all To Do Notes
+
+* More reports support output in a different language than the interface language
+
+* Narrative Web has been reworked to make it more stable.

 More info in the manual 
-http://www.gramps-project.org/wiki/index.php?title=Gramps_4.2_Wiki_Manual_-_What%27s_new%3F
+http://www.gramps-project.org/wiki/index.php?title=Gramps_4.0_Wiki_Manual_-_What%27s_new%3F

 Everybody is invited to update the manual to make it current!
@@ -1,142 +1,142 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Id$ -->
 <authors xmlns:html="http://www.w3.org/1999/xhtml">
- <author title="author">
+ <author uid="rshura" title="author">
  Alex Roitman &lt;<html:a href="mailto:shura@gramps-project.org">shura@gramps-project.org</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="asleinius" title="contributor">
  Arturas Sleinius &lt;<html:a href="mailto:asleinius@users.sourceforge.net">asleinius@users.sourceforge.net</html:a>&gt;
 </author>
- <author title="author">
+ <author uid="bmcage" title="author">
  Benny Malengier &lt;<html:a href="mailto:benny.malengier@gramps-project.org">benny.malengier@gramps-project.org</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="borilg" title="contributor">
  Boril Gourinov &lt;<html:a href="mailto:boril.gourinov@gmail.com">boril.gourinov@gmail.com</html:a>&gt;
 </author>
- <author title="author">
+ <author uid="pez4brian" title="author">
  Brian Matherly &lt;<html:a href="mailto:brian@gramps-project.org">brian@gramps-project.org</html:a>&gt;
 </author>
- <author title="author">
+ <author uid="dallingham" title="author">
  Don Allingham &lt;<html:a href="mailto:don@gramps-project.org">don@gramps-project.org</html:a>&gt;
 </author>
- <author title="author">
+ <author uid="dpeterso" title="author">
  Donald A. Peterson &lt;<html:a href="mailto:"></html:a>&gt;
 </author>
- <author title="author">
+ <author uid="dsblank" title="author">
  Doug Blank &lt;<html:a href="mailto:doug.blank@gmail.com">doug.blank@gmail.com</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="eerot" title="contributor">
  Eero Tamminen &lt;<html:a href="mailto:eerot@users.sourceforge.net">eerot@users.sourceforge.net</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="erikdrgm" title="contributor">
  Erik De Richter &lt;<html:a href="mailto:erikdrgm@users.sourceforge.net">erikdrgm@users.sourceforge.net</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="espenbe" title="contributor">
  Espen Berg &lt;<html:a href="mailto:espenbe@gmail.com">espenbe@gmail.com</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="gburto01" title="contributor">
  Gary Burton &lt;<html:a href="mailto:gary.burton@zen.co.uk">gary.burton@zen.co.uk</html:a>&gt;
 </author>
 <author uid="gbritton" title="contributor">
  Gerald Britton &lt;<html:a href="mailto:gerald.britton@gmail.com">gerald.britton@gmail.com</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="jgsack" title="contributor">
  James G Sack &lt;<html:a href="mailto:jgsack@san.rr.com">jgsack@san.rr.com</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="has_no_svn_access" title="contributor">
  Janne Kovesjärvi &lt;<html:a href="mailto:janne.kovesjarvi@gmail.com">janne.kovesjarvi@gmail.com</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="has_no_svn_access" title="contributor">
  Jason Simanek &lt;<html:a href="mailto:jsimanek@gmail.com">jsimanek@gmail.com</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="romjerome" title="contributor">
  Jérôme Rapinat &lt;<html:a href="mailto:romjerome@yahoo.fr">romjerome@yahoo.fr</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="jcreus" title="contributor">
  Joan Creus &lt;<html:a href="mailto:joan.creus@gmail.com">joan.creus@gmail.com</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="josip" title="contributor">
  Josip Pisoj &lt;<html:a href="mailto:josip@pisoj.com">josip@pisoj.com</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="jsanchez" title="contributor">
  Julio Sánchez &lt;<html:a href="mailto:julio.sanchez@gmail.com">julio.sanchez@gmail.com</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="keesb" title="contributor">
  Kees Bakker &lt;<html:a href="mailto:kees.bakker@xs4all.nl">kees.bakker@xs4all.nl</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="kdorichev" title="contributor">
  Konstantin Dorichev &lt;<html:a href="mailto:kdorichev@gmail.com">kdorichev@gmail.com</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="has_no_svn_access" title="contributor">
  Lubo Vasko &lt;<html:a href="mailto:pgval@inMail.sk">pgval@inMail.sk</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="ltosky" title="contributor">
  Luigi Toscano &lt;<html:a href="mailto:luigi.toscano@tiscali.it">luigi.toscano@tiscali.it</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="has_no_svn_access" title="contributor">
  Luiz Gonzaga dos Santos Filho &lt;<html:a href="mailto:lfilho@gmail.com">lfilho@gmail.com</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="has_no_svn_access" title="contributor">
  Łukasz Rymarczyk &lt;<html:a href="mailto:yenidai@poczta.onet.pl">yenidai@poczta.onet.pl</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="m_d_n" title="contributor">
  Michiel Nauta &lt;<html:a href="mailto:m.d.nauta@hetnet.nl">m.d.nauta@hetnet.nl</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="leonhaeuser" title="contributor">
  Mirko Leonhäuser &lt;<html:a href="mailto:mirko@leonhaeuser.de">mirko@leonhaeuser.de</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="has_no_svn_access" title="contributor">
  Morten Bo Johansen &lt;<html:a href="mailto:mbj@spamcop.net">mbj@spamcop.net</html:a>&gt;
 </author>
- <author title="author">
+ <author uid="loshawlos" title="author">
  Martin Hawlisch &lt;<html:a href="mailto:martin.hawlisch@gmx.de">martin.hawlisch@gmx.de</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="nick-h" title="contributor">
  Nick Hall &lt;<html:a href="mailto:nick__hall@hotmail.com">nick__hall@hotmail.com</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="ldnp" title="contributor">
  Peter Landgren &lt;<html:a href="mailto:peter.talken@telia.com">peter.talken@telia.com</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="acraphae" title="contributor">
  Raphael Ackermann &lt;<html:a href="mailto:raphael.ackermann@gmail.com">raphael.ackermann@gmail.com</html:a>&gt;
 </author>
- <author title="author">
+ <author uid="hippy" title="author">
  Richard Taylor &lt;<html:a href="mailto:rjt-gramps@thegrindstone.me.uk">rjt-gramps@thegrindstone.me.uk</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="noirauds" title="contributor">
  Serge Noiraud &lt;<html:a href="mailto:Serge.Noiraud@free.fr">Serge.Noiraud@free.fr</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="has_no_svn_access" title="contributor">
  Sigmund Lorentsen &lt;<html:a href="mailto:sigmund.lorentsen@tele2.no">sigmund.lorentsen@tele2.no</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="betula" title="contributor">
  Stefan Bjork &lt;<html:a href="mailto:betula@users.sourceforge.net">betula@users.sourceforge.net</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="s_charette" title="contributor">
  Stéphane Charette &lt;<html:a href="mailto:stephanecharette@gmail.com">stephanecharette@gmail.com</html:a>&gt;
 </author>
- <author title="author">
+ <author uid="twaugh" title="author">
  Tim Waugh &lt;<html:a href="mailto:twaugh@redhat.com">twaugh@redhat.com</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="vassilii" title="contributor">
  Vassilii Khachaturov &lt;<html:a href="mailto:vassilii@tarunz.org">vassilii@tarunz.org</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="matlas" title="contributor">
  Zdeněk Hataš &lt;<html:a href="mailto:zdenek.hatas@gmail.com">zdenek.hatas@gmail.com</html:a>&gt;
 </author>
-<author title="author">
+<author uid="robhealey1" title="author">
  Rob G. Healey &lt;<html:a href="mailto:robhealey1@gmail.com">robhealey1@gmail.com</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="zfoldvar" title="contributor">
  Zsolt Foldvari &lt;<html:a href="mailto:zfoldvar@users.sourceforge.net">zfoldvar@users.sourceforge.net</html:a>&gt;
 </author>
- <author title="contributor">
+ <author uid="ander882" title="contributor">
  Craig J. Anderson &lt;<html:a href="mailto:ander882@hotmail.com">ander882@hotmail.com</html:a>&gt;
 </author>
- <author title="author">
+ <author uid="kulath" title="author">
  Tim G L Lyons &lt;<html:a href="mailto:tim.g.lyons@gmail.com">tim.g.lyons@gmail.com</html:a>&gt;
 </author>
- <author title="author">
+ <author uid="jralls" title="author">
  John Ralls &lt;<html:a href="mailto:jralls@ceridwen.us">jralls@ceridwen.us</html:a>&gt;
 </author>
 </authors>
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #

 ----------------------------------------------------------------------------
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # $Id: Web_Basic-Blue.css 15540 2010-06-07 16:32:00Z robhealey1 $
 #
@@ -248,14 +248,6 @@ table.primobjlist tr.BeginLetter td, table.primobjlist tr.BeginSurname td {
 td.ColumnLetter, td.ColumnRowLabel {
    font-weight: bold;
 }
-/* bug #8213 testing by Stephane, 2014-12-6 */
-td.ColumnEvent, td.ColumnDate {
-    white-space: nowrap;
-}
-td.ColumnPlace, td.ColumnDescription {
-    width: 20%
-}
-/* end of customizations by Stephane */
 td.ColumnBirth, td.ColumnDeath, td.ColumnPartner, td.ColumnParents {
    font-size: 90%;
 }
@@ -514,7 +514,6 @@ i + div.grampsstylednote p {
 }
 div.grampsstylednote p {
    margin-bottom: 0.5em;
-}

 /* Subsection : Family Map
 ----------------------------------------------------- */
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #

 ******************************************************
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # $Id$
 #
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # $Id$
 #
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #

 ******************************************************
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #

 **************************************************************************************************
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #

 **************************************************************************************************
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # $Id: $
 #
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #

 **************************************************************************************************
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # $Id$
 #
@@ -3,9 +3,10 @@
 <id type="desktop">gramps.desktop</id>
 <licence>CC0</licence>
 <description>
-<_p>Gramps is a genealogy program that is both intuitive for hobbyists and feature-complete for professional genealogists.</_p>
-<_p>It gives you the ability to record the many details of the life of an individual as well as the complex relationships between various people, places and events.</_p>
-<_p>All of your research is kept organized, searchable and as precise as you need it to be.</_p>
+<_p>Gramps is a genealogy program that is both intuitive for hobbyists and feature-complete for professional genealogists.
+It gives you the ability to record the many details of the life of an individual as well as the complex relationships between various people, places and events.
+All of your research is kept organized, searchable and as precise as you need it to be.
+</_p>
 </description>
 <url type="homepage">http://gramps-project.org/</url>
 <screenshots>
@@ -8,6 +8,5 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Office;
-_Keywords=Genealogy;Family History;Research;Family Tree;GEDCOM;
 MimeType=application/x-gramps;application/x-gedcom;application/x-gramps-package;application/x-gramps-xml;
 Exec=gramps %F
@@ -16,7 +16,7 @@

 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


 $Id$
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2001       Graham J. Williams
 # Copyright (C) 2000-2007  Donald N. Allingham
-# Copyright (C) 2010-2014  Nick Hall
+# Copyright (C) 2010-2011  Nick Hall
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,21 +19,21 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 # $Id$
 -->

 <!--
-    This is the Document Type Definition file for v1.7.1
+    This is the Document Type Definition file for v1.5.1
    of the GRAMPS XML genealogy data format.
    Please use the following formal public identifier to identify it:

-    "-//GRAMPS//DTD GRAMPS XML V1.7.1//EN"
+    "-//GRAMPS//DTD GRAMPS XML V1.5.1//EN"

    For example:
-        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.7.1//EN"
-                "http://gramps-project.org/xml/1.7.1/grampsxml.dtd"
+        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.5.1//EN"
+                "http://gramps-project.org/xml/1.5.1/grampsxml.dtd"
                [...]>
 -->

@@ -62,7 +62,7 @@ DATABASE
 <!ELEMENT database (header, name-formats?, tags?, events?, people?, families?,
                    citations?, sources?, places?, objects?, repositories?,
                    notes?, bookmarks?, namemaps?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.7.1/">
+<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.5.1/">


 <!--    ************************************************************
@@ -122,7 +122,6 @@ GENDER has values of M, F, or U.

 <!ELEMENT name    (first?, call?, surname*, suffix?, title?, nick?, familynick?, group?,
                  (daterange|datespan|dateval|datestr)?, noteref*, citationref*)>
-<!-- (Unknown|Also Know As|Birth Name|Married Name|Other Name) -->
 <!ATTLIST name    
        alt       (0|1) #IMPLIED
        type      CDATA #IMPLIED
@@ -139,8 +138,6 @@ GENDER has values of M, F, or U.
 <!ELEMENT familynick (#PCDATA)>
 <!ELEMENT group      (#PCDATA)>
 <!ELEMENT surname    (#PCDATA)>
-<!-- (Unknown|Inherited|Given|Taken|Patronymic|Matronymic|Feudal|
-Pseudonym|Patrilineal|Matrilineal|Occupation|Location) -->
 <!ATTLIST surname
        prefix      CDATA #IMPLIED
        prim        (1|0) #IMPLIED
@@ -199,13 +196,12 @@ FAMILY
 <!ELEMENT mother EMPTY>
 <!ATTLIST mother hlink IDREF #REQUIRED>

-<!-- (None|Birth|Adopted|Stepchild|Sponsored|Foster|Other|Unknown) -->
 <!ELEMENT childref (citationref*,noteref*)>
 <!ATTLIST childref
        hlink IDREF #REQUIRED
        priv  (0|1) #IMPLIED
-        mrel  CDATA #IMPLIED
-        frel  CDATA #IMPLIED
+        mrel  (None|Birth|Adopted|Stepchild|Sponsored|Foster|Other|Unknown) #IMPLIED
+        frel  (None|Birth|Adopted|Stepchild|Sponsored|Foster|Other|Unknown) #IMPLIED
 >

 <!ELEMENT type (#PCDATA)>
@@ -219,8 +215,7 @@ EVENT
 <!ELEMENT events (event)*>

 <!ELEMENT event (type?, (daterange|datespan|dateval|datestr)?, place?, cause?,
-                 description?, attribute*, noteref*, citationref*, objref*,
-                 tagref*)>
+                 description?, attribute*, noteref*, citationref*, objref*)>
 <!ATTLIST event 
        id        CDATA #IMPLIED
        handle    ID    #REQUIRED
@@ -234,7 +229,7 @@ SOURCES

 <!ELEMENT sources (source)*>
 <!ELEMENT source (stitle?, sauthor?, spubinfo?, sabbrev?,
-                  noteref*, objref*, srcattribute*, reporef*, tagref*)>
+                  noteref*, objref*, data_item*, reporef*)>
 <!ATTLIST source
        id        CDATA #IMPLIED
        handle    ID    #REQUIRED
@@ -252,25 +247,16 @@ PLACES

 <!ELEMENT places (placeobj)*>

-<!ELEMENT placeobj (ptitle?, pname+, code?, coord?, placeref*, location*,
-                    objref*, url*, noteref*, citationref*, tagref*)>
+<!ELEMENT placeobj (ptitle?, coord?, location*, objref*, url*, noteref*,
+                    citationref*)>
 <!ATTLIST placeobj
        id        CDATA #IMPLIED
        handle    ID    #REQUIRED
        priv      (0|1) #IMPLIED
        change    CDATA #REQUIRED
-        type      CDATA #REQUIRED
->
-
-<!ELEMENT pname (daterange|datespan|dateval|datestr)?>
-
-<!ATTLIST pname
-        lang CDATA #IMPLIED
-        value CDATA #REQUIRED
 >

 <!ELEMENT ptitle (#PCDATA)>
-<!ELEMENT code (#PCDATA)>

 <!ELEMENT coord EMPTY>
 <!ATTLIST coord
@@ -310,7 +296,6 @@ OBJECTS
 <!ATTLIST file
        src         CDATA #REQUIRED
        mime        CDATA #REQUIRED
-        checksum    CDATA #IMPLIED
        description CDATA #REQUIRED
 >

@@ -320,7 +305,7 @@ REPOSITORIES

 <!ELEMENT repositories (repository)*>

-<!ELEMENT repository (rname, type, address*, url*, noteref*, tagref*)>
+<!ELEMENT repository (rname, type, address*, url*, noteref*)>
 <!ATTLIST repository
        id        CDATA #IMPLIED
        handle    ID    #REQUIRED
@@ -383,7 +368,7 @@ CITATIONS
 <!ELEMENT citations (citation)*>

 <!ELEMENT citation ((daterange|datespan|dateval|datestr)?, page?, confidence,
-                    noteref*, objref*, srcattribute*, sourceref, tagref*)>
+                    noteref*, objref*, data_item*, sourceref)>
 <!ATTLIST citation
        id        CDATA #IMPLIED
        handle    ID    #REQUIRED
@@ -508,13 +493,6 @@ SHARED ELEMENTS
        value   CDATA   #REQUIRED
 >

-<!ELEMENT srcattribute EMPTY>
-<!ATTLIST srcattribute
-        priv    (0|1)   #IMPLIED
-        type    CDATA   #REQUIRED
-        value   CDATA   #REQUIRED
->
-
 <!ELEMENT place EMPTY>
 <!ATTLIST place hlink IDREF #REQUIRED>

@@ -535,11 +513,6 @@ SHARED ELEMENTS
        priv (0|1)  #IMPLIED
 >

-<!ELEMENT placeref ((daterange|datespan|dateval|datestr)?)>
-<!ATTLIST placeref
-        hlink IDREF #REQUIRED
->
-
 <!ELEMENT region EMPTY>
 <!ATTLIST region
        corner1_x  CDATA #REQUIRED
@@ -4,7 +4,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2005-2007  Donald N. Allingham
-# Copyright (C) 2010-2014  Nick Hall
+# Copyright (C) 2010-2011  Nick Hall
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,10 +18,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 # Written by Alex Roitman

+# $Id$
 -->

 <!--
@@ -31,7 +32,7 @@

 <grammar
  datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"  
-  ns="http://gramps-project.org/xml/1.7.1/"
+  ns="http://gramps-project.org/xml/1.5.1/"
  xmlns="http://relaxng.org/ns/structure/1.0">

  <start><element name="database">
@@ -210,7 +211,16 @@
  </define>

  <define name="child-rel">
-    <text/>
+    <choice>
+      <value>Birth</value>
+      <value>Adopted</value>
+      <value>Stepchild</value>
+      <value>Sponsored</value>
+      <value>Foster</value>
+      <value>None</value>
+      <value>Other</value>
+      <value>Unknown</value>
+    </choice>
  </define>

  <define name="name-content">
@@ -221,7 +231,13 @@
    <optional><attribute name="priv">
        <ref name="priv-content"/>
    </attribute></optional>
-    <optional><attribute name="type"><text/></attribute></optional>
+    <optional><attribute name="type"><choice>
+        <value>Unknown</value>
+        <value>Also Known As</value>
+        <value>Birth Name</value>
+        <value>Married Name</value>
+        <value>Other Name</value>
+    </choice></attribute></optional>
    <optional><attribute name="sort"><text/></attribute></optional>
    <optional><attribute name="display"><text/></attribute></optional>
    <optional><element name="first"><text/></element></optional>
@@ -250,7 +266,20 @@
    <value>1</value>
    <value>0</value>
    </choice></attribute></optional>
-    <optional><attribute name="derivation"><text/></attribute></optional>
+    <optional><attribute name="derivation"><choice>
+    <value>Unknown</value>
+    <value>Inherited</value>
+    <value>Given</value>
+    <value>Taken</value>
+    <value>Patronymic</value>
+    <value>Matronymic</value>
+    <value>Feudal</value>
+    <value>Pseudonym</value>
+    <value>Patrilineal</value>
+    <value>Matrilineal</value>
+    <value>Occupation</value>
+    <value>Location</value>
+    </choice></attribute></optional>
    <optional><attribute name="connector"><text/></attribute></optional>
  </define>

@@ -399,9 +428,6 @@
    <zeroOrMore><element name="objref">
        <ref name="objref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
  </define>

  <define name="citation-content">
@@ -415,15 +441,13 @@
    <zeroOrMore><element name="objref">
        <ref name="objref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="srcattribute">
-        <ref name="srcattribute-content"/>
+    <zeroOrMore><element name="data_item">
+        <attribute name="key"><text/></attribute>
+        <attribute name="value"><text/></attribute>
    </element></zeroOrMore>
    <element name="sourceref">
        <ref name="sourceref-content"/>
    </element>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
  </define>

  <define name="source-content">
@@ -438,32 +462,22 @@
    <zeroOrMore><element name="objref">
        <ref name="objref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="srcattribute">
-        <ref name="srcattribute-content"/>
+    <zeroOrMore><element name="data_item">
+        <attribute name="key"><text/></attribute>
+        <attribute name="value"><text/></attribute>
    </element></zeroOrMore>
    <zeroOrMore><element name="reporef">
        <ref name="reporef-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
  </define>

  <define name="place-content">
    <ref name="primary-object"/>
-    <attribute name="type"><text/></attribute>
    <optional><element name="ptitle"><text/></element></optional>
-    <oneOrMore><element name="pname">
-        <ref name="placename-content"/>
-    </element></oneOrMore>
-    <optional><element name="code"><text/></element></optional>
    <optional><element name="coord">
        <attribute name="long"><text/></attribute>
        <attribute name="lat"><text/></attribute>
    </element></optional>
-    <zeroOrMore><element name="placeref">
-        <ref name="placeref-content"/>
-    </element></zeroOrMore>
    <zeroOrMore><element name="location">
        <optional><attribute name="street"><text/></attribute></optional>
        <optional><attribute name="locality"><text/></attribute></optional>
@@ -487,9 +501,6 @@
    <zeroOrMore><element name="citationref">
        <ref name="citationref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
  </define>

  <define name="object-content">
@@ -497,8 +508,7 @@
    <element name="file">
        <attribute name="src"><text/></attribute>
        <attribute name="mime"><text/></attribute>
-        <optional><attribute name="checksum"><text/></attribute></optional>
-        <optional><attribute name="description"><text/></attribute></optional>
+        <attribute name="description"><text/></attribute>
    </element>
    <zeroOrMore><element name="attribute">
        <ref name="attribute-content"/>
@@ -528,9 +538,6 @@
    <zeroOrMore><element name="noteref">
        <ref name="noteref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
  </define>

  <define name="bookmark-content">
@@ -673,14 +680,6 @@
        <ref name="noteref-content"/>
    </element></zeroOrMore>
  </define>
-  
-  <define name="srcattribute-content">
-    <optional><attribute name="priv">
-        <ref name="priv-content"/>
-    </attribute></optional>
-    <attribute name="type"><text/></attribute>
-    <attribute name="value"><text/></attribute>
-  </define>

  <define name="url-content">
      <optional><attribute name="priv">
@@ -745,17 +744,6 @@
    <text/>
  </define>

-  <define name="placename-content">
-    <attribute name="value"><text/></attribute>
-    <optional><attribute name="lang"><text/></attribute></optional>
-    <optional><ref name="date-content"/></optional>
-  </define>
-
-  <define name="placeref-content">
-    <attribute name="hlink"><data type="IDREF"/></attribute>
-    <optional><ref name="date-content"/></optional>
-  </define>
-
  <define name="tagref-content">
    <attribute name="hlink"><data type="IDREF"/></attribute>
  </define>
@@ -41,16 +41,16 @@ master_doc = 'index'

 # General information about the project.
 project = u'Gramps'
-copyright = u'2015, Gramps project'
+copyright = u'2012, Gramps project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '4.2'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.2.0'
+release = '4.0.0-alpha2'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -41,16 +41,16 @@ master_doc = 'cs'

 # General information about the project.
 project = u'Gramps'
-copyright = u'2015, Gramps project'
+copyright = u'2012, Gramps project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '4.2'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.2.0'
+release = '4.0.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -82,9 +82,9 @@ gramps(1)                @VERSION@               gramps(1)


       **-i** , **--import=** *FILE*
-          Import data from *FILE* . If you haven't specified a database, then
-          an empty database is created for you called Family Tree x
-          (where x is an incrementing number).
+          Import data from *FILE* . If you haven't specified a database then
+          a  temporary database is used; this is deleted when you exit
+          gramps.

          When more than one input file is given, each has to be preceded
          by **-i** flag. The files are imported in the specified order, i.e.
@@ -41,16 +41,16 @@ master_doc = 'fr'

 # General information about the project.
 project = u'Gramps'
-copyright = u'2015, Gramps project'
+copyright = u'2012, Gramps project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '4.2'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.2.0'
+release = '4.0.0-alpha2'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -82,8 +82,8 @@ gramps(1)                @VERSION@               gramps(1)

       **-i** , **--import=** *FICHIER*
          Importer des données depuis un *FICHIER* . Si vous n'avez pas
-          spécifié de base de données, alors une base de données vide
-          est utilisée.
+          spécifié de base de données alors une base de données temporaire
+          est utilisée; elle sera effacée quand vous quitterez gramps.

          Quand plus d'un fichier doit être importé, chacun doit être
          précédé par la commande **-i** . Ces fichiers sont importés dans le
@@ -152,7 +152,7 @@ gramps(1)                @VERSION@               gramps(1)


 **Opération**
-       Si le premie argument de la ligne de commande ne commence pas par un
+       Si le premier argument de la ligne de commande ne commence pas par un
       tiret (i.e. pas d'instruction), gramps va essayer d'ouvrir la base de
       données avec le nom donné par le premier argument et démarrer une ses‐
       sion interactive, en ignorant le reste de la ligne de commande.
@@ -1,4 +1,4 @@
-.TH "GRAMPS" "1" "09 March 2015" "4.2" "Gramps"
+.TH "GRAMPS" "1" "28 December 2012" "4.0" "Gramps"
 .SH NAME
 gramps \- Gramps Documentation
 .
@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.\" Man page generated from reStructeredText.
+.\" Man page generated from reStructuredText.
 .
 .sp
 gramps(1)                @VERSION@               gramps(1)
@@ -106,8 +106,8 @@ sources, vous devez utiliser l\(aqoption d\(aqimport.
 .TP
 .B \fB\-i\fP , \fB\-\-import=\fP \fIFICHIER\fP
 Importer des données depuis un \fIFICHIER\fP . Si vous n\(aqavez pas
-spécifié de base de données, alors une base de données vide
-est utilisée.
+spécifié de base de données alors une base de données temporaire
+est utilisée; elle sera effacée quand vous quitterez gramps.
 .sp
 Quand plus d\(aqun fichier doit être importé, chacun doit être
 précédé par la commande \fB\-i\fP . Ces fichiers sont importés dans le
@@ -172,7 +172,7 @@ Imprime le numéro de version pour gramps puis quitte.
 .UNINDENT
 .TP
 .B \fBOpération\fP
-Si le premie argument de la ligne de commande ne commence pas par un
+Si le premier argument de la ligne de commande ne commence pas par un
 tiret (i.e. pas d\(aqinstruction), gramps va essayer d\(aqouvrir la base de
 données avec le nom donné par le premier argument et démarrer une ses‐
 sion interactive, en ignorant le reste de la ligne de commande.
@@ -312,15 +312,15 @@ besoins
 .INDENT 0.0
 .TP
 .B \fBAUTEURS\fP
-Donald Allingham <\fI\%don@gramps\-project.org\fP>
-\fI\%http://gramps\-project.org/\fP
+Donald Allingham <\fI\%don@gramps-project.org\fP>
+\fI\%http://gramps-project.org/\fP
 .sp
 Cette page man a d\(aqabord été écrite par :
 Brandon L. Griffith <\fI\%brandon@debian.org\fP>
 pour Debian GNU/Linux système.
 .sp
 Cette page man est maintenue par :
-Gramps project <\fI\%xxx@gramps\-project.org\fP>
+Gramps project <\fI\%xxx@gramps-project.org\fP>
 .sp
 La traduction française :
 Jérôme Rapinat <\fI\%romjerome@yahoo.fr\fP>
@@ -330,14 +330,13 @@ La documentation\-utilisateur est disponible par un navigateur
 standard sous la forme du manuel Gramps.
 .sp
 La documentation pour développeur est disponible sur le site
-\fI\%http://www.gramps\-project.org/wiki/index.php?title=Portal:Developers\fP .
+\fI\%http://www.gramps-project.org/wiki/index.php?title=Portal:Developers\fP .
 .UNINDENT
 .sp
 gramps(1)                 @VERSION@               gramps(1)
 .SH AUTHOR
 Jerome Rapinat
 .SH COPYRIGHT
-2015, Gramps project
+2012, Gramps project
 .\" Generated by docutils manpage writer.
-.\" 
 .
@@ -104,7 +104,7 @@ If no action, import or export options are given on the command line then an int

 .TP 
 .BI \-i,\-\^\-import= " FILE"
-Import data from \fIFILE\fR. If you haven't specified a database, then an empty database is created for you called Family Tree x (where x is an incrementing number).
+Import data from \fIFILE\fR. If you haven't specified a database then a temporary database is used; this is deleted when you exit gramps.
 .br

 When more than one input file is given, each has to be preceded by \fB\-i\fR 
@@ -41,16 +41,16 @@ master_doc = 'nl'

 # General information about the project.
 project = u'Gramps'
-copyright = u'2015, Gramps project'
+copyright = u'2012, Gramps project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '4.2'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.2.0'
+release = '4.0.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -41,16 +41,16 @@ master_doc = 'pl'

 # General information about the project.
 project = u'Gramps'
-copyright = u'2015, Gramps project'
+copyright = u'2012, Gramps project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '4.2'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.2.0'
+release = '4.0.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -41,16 +41,16 @@ master_doc = 'pt_BR'

 # General information about the project.
 project = u'Gramps'
-copyright = u'2015, Gramps project'
+copyright = u'2012, Gramps project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '4.2'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.2.0'
+release = '4.0.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -41,16 +41,16 @@ master_doc = 'sv'

 # General information about the project.
 project = u'Gramps'
-copyright = u'2015, Gramps project'
+copyright = u'2012, Gramps project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '4.2'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.2.0'
+release = '4.0.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -19,7 +19,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 """
 update_man.py for command line documentation.
@@ -43,7 +43,7 @@ except:
    DOCUTILS = False

 LANGUAGES = ['sv', 'nl', 'pl', 'cs', 'pt_BR', 'fr']
-VERSION = '4.2.0'
+VERSION = '4.0.0'
 DATE = ''

 # You can set these variables from the command line.
@@ -1,10 +1,10 @@
 {% extends "admin/base.html" %}
 {% load i18n %}

-{% block title %}{{ title }} | Adminstration{% endblock %}
+{% block title %}{{ title }} | My New Title{% endblock %}

 {% block branding %}
-<h1 id="site-name">Administration</h1>
+<h1 id="site-name">My new title for the Admin site!</h1>
 {% endblock %}

 {% block nav-global %}
@@ -13,8 +13,9 @@
        .ml {margin:0 10px 10px;display:block;float:left}
    </style>

-    <a href="/" clas="ml">Home</a>  
-    <a href="/admin/" class="ml">Administration home</a>
+    <a href="/" clas="ml">Website home</a>  
+    <a href="/admin/" class="ml">Admin home</a>
+    <a href="/admin/members/invoice/" class="ml">Invoices</a>
    <a href="/admin/auth/user/?is_active__exact=0" class="ml">New Users</a>
    <a href="/admin/auth/user/" class="ml">All Users</a>
    {% endif %}
@@ -390,7 +390,7 @@ function buttonOut(button) {
    <p id="createdate">
      <a href="http://www.gramps-project.org/wiki/index.php?title=Gramps-Connect">Gramps-Connect, version {{gramps_version}}</a>.
    </p>
-    <p id="copyright">&copy; 2009-2015 <a href="http://www.gramps-project.org/">www.gramps-project.org</a> 
+    <p id="copyright">&copy; 2009-2012 <a href="http://www.gramps-project.org/">www.gramps-project.org</a> 
    </p>
    {% endblock %}
   </div>
@@ -73,34 +73,6 @@
 </table>
 </div>
 </div>
-
-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/event/%s" event.handle args %}
-    <input type="hidden" id="place_return" name="place_return" value=""/>
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/event/" args %}
-      <input type="hidden" id="place_return" name="place_return" value=""/>
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
-      {% make_button "+Add Event" "/event/add" args %}
-      {% make_button "?Edit Event" "/event/%s/edit" event.handle args %}
-      {% make_button "-Delete Event" "/event/%s/delete" event.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->

 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -132,6 +104,32 @@
  </div>
 </div>

+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/event/%s" event.handle args %}
+    <input type="hidden" id="place_return" name="place_return" value=""/>
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/event/" args %}
+      <input type="hidden" id="place_return" name="place_return" value=""/>
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
+      {% make_button "+Add Event" "/event/add" args %}
+      {% make_button "?Edit Event" "/event/%s/edit" event.handle args %}
+      {% make_button "-Delete Event" "/event/%s/delete" event.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}

@@ -131,35 +131,6 @@
 </div>
 </div>

-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/family/%s" family.handle args %}
-    <input type="hidden" id="father_return" name="father_return" value=""/>
-    <input type="hidden" id="mother_return" name="mother_return" value=""/>
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/family/" args %}
-      <input type="hidden" id="father_return" name="father_return" value=""/>
-      <input type="hidden" id="mother_return" name="mother_return" value=""/>
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
-      {% make_button "+Add Family" "/family/add" args %}
-      {% make_button "?Edit Family" "/family/%s/edit" family.handle args %}
-      {% make_button "-Delete Family" "/family/%s/delete" family.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->

 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -200,6 +171,34 @@
  </div>
 </div>

+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/family/%s" family.handle args %}
+    <input type="hidden" id="father_return" name="father_return" value=""/>
+    <input type="hidden" id="mother_return" name="mother_return" value=""/>
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/family/" args %}
+      <input type="hidden" id="father_return" name="father_return" value=""/>
+      <input type="hidden" id="mother_return" name="mother_return" value=""/>
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
+      {% make_button "+Add Family" "/family/add" args %}
+      {% make_button "?Edit Family" "/family/%s/edit" family.handle args %}
+      {% make_button "-Delete Family" "/family/%s/delete" family.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}

@@ -53,31 +53,6 @@
 </tr>
 </table>

-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/media/%s" media.handle args %}
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/media/" args %}
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
-      {% make_button "+Add Media" "/media/add" args %}
-      {% make_button "?Edit Media" "/media/%s/edit" media.handle args %}
-      {% make_button "-Delete Media" "/media/%s/delete" media.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->

 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -105,6 +80,30 @@
  </div>
 </div>

+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/media/%s" media.handle args %}
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/media/" args %}
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
+      {% make_button "+Add Media" "/media/add" args %}
+      {% make_button "?Edit Media" "/media/%s/edit" media.handle args %}
+      {% make_button "-Delete Media" "/media/%s/delete" media.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}

@@ -70,6 +70,23 @@
 </tr>
 </table>

+<!-- Tabs -->
+
+<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
+  <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
+    <li class="ui-corner-top ui-state-default"><a class="tab-references" href="#tab-references">Reference</a></li>
+    <li class="ui-corner-top ui-state-default"><a class="tab-history" href="#tab-history">History</a></li>
+  </ul>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-references" style="background-color: #f4f0ec;"> 
+    {% note_reference_table note user action %}
+  </div>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-history" style="background-color: #f4f0ec;"> 
+    {% history_table note user action %}
+  </div>
+</div>
+</div>
+</div>
+
 {% if user.is_superuser %}
  {% if action == "edit" %}
    {% make_button "Cancel" "/note/%s" note.handle args %}
@@ -94,24 +111,6 @@
  {% endif %}
 {% else %}
 {% endif %}
-
-<!-- Tabs -->
-
-<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
-  <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
-    <li class="ui-corner-top ui-state-default"><a class="tab-references" href="#tab-references">Reference</a></li>
-    <li class="ui-corner-top ui-state-default"><a class="tab-history" href="#tab-history">History</a></li>
-  </ul>
-  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-references" style="background-color: #f4f0ec;"> 
-    {% note_reference_table note user action %}
-  </div>
-  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-history" style="background-color: #f4f0ec;"> 
-    {% history_table note user action %}
-  </div>
-</div>
-</div>
-</div>
-
 </form>
 {% endblock %}

@@ -81,38 +81,6 @@

 </div>
 </div>
-
-{% if logform %}
-  <table>
-    {{logform.as_table}}
-  </table>
-{% endif %}
-
-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/person/%s" person.handle args %}
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/person/" args %}
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
-      {% make_button "+Add Person" "/person/add" args %}
-      {% make_button "?Edit Person" "/person/%s/edit" person.handle args %}
-      {% make_button "-Delete Person" "/person/%s/delete" person.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->

 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -170,6 +138,36 @@
  </div>
 </div>

+{% if logform %}
+  <table>
+    {{logform.as_table}}
+  </table>
+{% endif %}
+
+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/person/%s" person.handle args %}
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/person/" args %}
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
+      {% make_button "+Add Person" "/person/add" args %}
+      {% make_button "?Edit Person" "/person/%s/edit" person.handle args %}
+      {% make_button "-Delete Person" "/person/%s/delete" person.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}

@@ -44,31 +44,6 @@
 </tr>
 </table>

-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/repository/%s" repository.handle args %}
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/repository/" args %}
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px">
-      {% make_button "+Add Repository" "/repository/add" args %}
-      {% make_button "?Edit Repository" "/repository/%s/edit" repository.handle args %}
-      {% make_button "-Delete Repository" "/repository/%s/delete" repository.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->

 <div class="ui-tab ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -96,6 +71,30 @@
  </div>
 </div>

+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/repository/%s" repository.handle args %}
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/repository/" args %}
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px">
+      {% make_button "+Add Repository" "/repository/add" args %}
+      {% make_button "?Edit Repository" "/repository/%s/edit" repository.handle args %}
+      {% make_button "-Delete Repository" "/repository/%s/delete" repository.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}

@@ -49,31 +49,6 @@
 </div>
 </div>

-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/source/%s" source.handle args %}
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/source/" args %}
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
-      {% make_button "+Add Source" "/source/add" args %}
-      {% make_button "?Edit Source" "/source/%s/edit" source.handle args %}
-      {% make_button "-Delete Source" "/source/%s/delete" source.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->

 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -105,5 +80,29 @@
  </div>
 </div>

+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/source/%s" source.handle args %}
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/source/" args %}
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
+      {% make_button "+Add Source" "/source/add" args %}
+      {% make_button "?Edit Source" "/source/%s/edit" source.handle args %}
+      {% make_button "-Delete Source" "/source/%s/delete" source.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}
@@ -42,6 +42,15 @@
 </tr>
 </table>

+<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
+  <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
+    <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a class="tab-references" href="#tab-references" style=":hover {color: black;}">Reference</a></li>
+  </ul>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tab-references" style="background-color: #f4f0ec;"> 
+    {% tag_reference_table tag user action %}
+  </div>
+</div>
+
 {% if user.is_superuser %}
  {% if action == "edit" %}
    {% make_button "Cancel" "/tag/%s" tag.handle args %}
@@ -66,16 +75,6 @@
  {% endif %}
 {% else %}
 {% endif %}
-
-<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
-  <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
-    <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a class="tab-references" href="#tab-references" style=":hover {color: black;}">Reference</a></li>
-  </ul>
-  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tab-references" style="background-color: #f4f0ec;"> 
-    {% tag_reference_table tag user action %}
-  </div>
-</div>
-
 </form>
 {% endblock %}

@@ -27,7 +27,7 @@

 <_tip number="14"><b>Calculating Relationships</b><br/>To check if two people in the database are related (by blood, not marriage) try the tool under &quot;Tools &gt; Utilities &gt; Relationship Calculator...&quot;. The exact relationship as well as all common ancestors are reported.</_tip>

-<_tip number="15"><b>SoundEx can help with family research</b><br/>SoundEx solves a long standing problem in genealogy, how to handle spelling variations. The SoundEx Gramplet takes a surname and generates a simplified form that is equivalent for similar sounding names. Knowing the SoundEx Code for a surname is very helpful for researching Census Data files (microfiche) at a library or other research facility. To view the SoundEx codes for surnames in your database, add the SoundEx Gramplet.</_tip>
+<_tip number="15"><b>SoundEx can help with family research</b><br/>SoundEx solves a long standing problem in genealogy, how to handle spelling variations. The SoundEx utility takes a surname and generates a simplified form that is equivalent for similar sounding names. Knowing the SoundEx Code for a surname is very helpful for researching Census Data files (microfiche) at a library or other research facility. To get the SoundEx codes for surnames in your database, go to &quot;Tools &gt; Utilities &gt; Generate SoundEx Codes...&quot;.</_tip>

 <_tip number="16"><b>Setting Your Preferences</b><br/>&quot;Edit &gt; Preferences...&quot; lets you modify a number of settings, such as the path to your media files, and allows you to adjust many aspects of the Gramps presentation to your needs. Each separate view can also be configured under &quot;View &gt; Configure View...&quot;</_tip>

@@ -45,7 +45,7 @@

 <_tip number="23"><b>Organising the Views</b><br/>Many of the views can present your data as either a hierarchical tree or as a simple list. Each view can also be configured to the way you like it. Have a look to the right of the top toolbar or under the &quot;View&quot; menu.</_tip>

-<_tip number="24"><b>Navigating Back and Forward</b><br/>Gramps maintains a list of previous active objects such as People and Events. You can move forward and backward through the list using &quot;Go &gt; Forward&quot; and &quot;Go &gt; Back&quot; or the arrow buttons.</_tip>
+<_tip number="24"><b>Navigating Back and Forward</b><br/>Gramps maintains a list of previous active objects such as People, Events and . You can move forward and backward through the list using &quot;Go &gt; Forward&quot; and &quot;Go &gt; Back&quot; or the arrow buttons.</_tip>

 <_tip number="25"><b>Keyboard Shortcuts</b><br/>Tired of having to take your hand off the keyboard to use the mouse? Many functions in Gramps have keyboard shortcuts. If one exists for a function it is displayed on the right side of the menu.</_tip>

@@ -67,11 +67,11 @@

 <_tip number="36"><b>Bookmarking Individuals</b><br/>The Bookmarks menu is a convenient place to store the names of frequently used individuals. Selecting a bookmark will make that person the Active Person. To bookmark someone make them the Active Person then go to &quot;Bookmarks &gt; Add Bookmark&quot; or press Ctrl+D. You can also bookmark most of the other objects.</_tip>

-<_tip number="37"><b>Incorrect Dates</b><br/>Everyone occasionally enters dates with an invalid format. Incorrect date formats will show up in Gramps with a either a reddish background or a red dot on the right edge of the field. You can fix the date using the Date Selection dialog which can be opened by clicking on the date button. The format of the date is set under &quot;Edit &gt; Preferences &gt; Display&quot;.</_tip>
+<_tip number="37"><b>Incorrect Dates</b><br/>Everyone occasionally enters dates with an invalid format. Incorrect date formats will show up in Gramps with a reddish background. You can fix the date using the Date Selection dialog which can be opened by clicking on the date button. The format of the date is set under &quot;Edit &gt; Preferences &gt; Display&quot;.</_tip>

 <_tip number="38"><b>Listing Events</b><br/>Events are added using the editor opened with &quot;Person &gt; Edit Person &gt; Events&quot;. There is a long list of preset event types. You can add your own event types by typing in the text field, they will be added to the available events, but not translated.</_tip>

-<_tip number="39"><b>Managing Names</b><br/>It is easy to manage people with several names in Gramps. In the Person Editor select the Names tab. You can add names of different types and set the preferred name by dragging it to the Preferred Name section.</_tip>
+<_tip number="39"><b>Managing Names</b><br/>It is easy to manage people with several names in Gramps. In the Person Editor select the Names tab. You can add names of different types and set the prefered name by dragging it to the Prefered Name section.</_tip>

 <_tip number="40"><b>Ancestor View</b><br/>The Ancestry View displays a traditional pedigree chart. Hold the mouse over an individual to see more information about them or right click on an individual to access other family members and settings. Play with the settings to see the different options.</_tip>

@@ -89,7 +89,7 @@

 <_tip number="48"><b>Web Family Tree Format</b><br/>Gramps can export data to the Web Family Tree (WFT) format. This format allows a family tree to be displayed online using a single file, instead of many html files.</_tip>

-<_tip number="49"><b>Making a Genealogy Website</b><br/>You can easily export your family tree to a web page. Select the entire database, family lines or selected individuals to a collection of web pages ready for upload to the World Wide Web.</_tip>
+<_tip number="49"><b>Making a Genealogy Website</b><br/>You can easily export your family tree to a web page. Select the entire database, family lines or selected individuals to a collection of web pages ready for upload to the World Wide Web. The Gramps project provides free hosting of websites made with Gramps.</_tip>

 <_tip number="50"><b>Reporting Bugs in Gramps</b><br/>The best way to report a bug in Gramps is to use the Gramps bug tracking system at http://bugs.gramps-project.org</_tip>

@@ -111,7 +111,7 @@

 <_tip number="62"><b>The 'How and Why' of Your Genealogy</b><br/> Genealogy isn't only about dates and names. It is about people. Be descriptive. Include why things happened, and how descendants might have been shaped by the events they went through. Narratives go a long way in making your family history come alive.</_tip>

-<_tip number="63"><b>Don't speak English?</b><br/>Volunteers have translated Gramps into more than 40 languages. If Gramps supports your language and it is not being displayed, set the default language in your operating system and restart Gramps.</_tip>
+<_tip number="63"><b>Don't speak English?</b><br/>Volunteers have translated Gramps into more than 20 languages. If Gramps supports your language and it is not being displayed, set the default language in your operating system and restart Gramps.</_tip>

 <_tip number="64"><b>Gramps Translators</b><br/>Gramps has been designed so that new translations can easily be added with little development effort. If you are interested in participating please email gramps-devel@lists.sf.net</_tip>

@@ -1,18 +1,18 @@
-Gramps for Debian
+gramps for Debian
 ----------------------

-This is the Debian package of the 4.0 series of GRAMPS.
+This is the Debian package of GRAMPS.

-It is a major update of Gramps to upgrade to GTK 3. A switch was also made to distutils from autotools.
+Regarding the extra dependencies:

-The 4.0 series of Gramps is being packaged for the experimental distribution until all dependencies are available
-and it proves stable.
-
-Webkit - gir1.2-webkit-3.0 crashes. Gramps has been patched disable the hidden
-HTML view instead until a solution is found.
-
-Goocanvas2 - The latest Goocanvas is not available in Debian yet. If you miss
-the Graphview plugin, you could try installing the gir1.2-goocanvas-2.0-9 which
-is available in Ubuntu.
-
- -- Ross Gammon <rossgammon@mail.dk>  Sat, 25 Jan 2014 18:00:00 +0100
+Recommends: graphviz
+  Enable creation of graphs 
+Recommends: python-gtkmozembed
+Recommends: python-webkit
+  Enable html rendering for Geographic view and Web view. If both
+  are installed webkit will be used. python-gtkmozembed may be more
+  stable.
+Suggests: ttf-freefont
+  Allows more fonts in reports
+Suggests: python-gtkspell python-enchant
+  allows spell checking in the notes. Both need to be installed.
@@ -1,15 +1,3 @@
-gramps (4.0.3) precise; urgency=low
-
-  * - 4.0.4-git.f08e40 Experimental stream gramps.git
-
- -- Jérôme Rapinat <romjerome@yahoo.fr>  Tue, 04 Feb 2014 19:49:32 +0100
- 
-gramps (4.0.2) precise; urgency=low
-
-  * experimental .deb for gramps 4.0.2
-  
-- Jérôme Rapinat <romjerome@yahoo.fr>  Wed, 04 Dec 2013 10:23:36 +0100
-
 gramps (4.0.1-2) precise; urgency=low

  * bug 6918: make package more compliant according to Debian policy
@@ -1 +1 @@
-9
+7
@@ -1,50 +1,17 @@
 Source: gramps
+Maintainer: Gramps Development Team <gramps-devel@lists.sourceforge.net>
 Section: python
 Priority: optional
-Maintainer: Ross Gammon <rossgammon@mail.dk>
-Build-Depends-Indep:
- dh-linktree,
- gettext,
- intltool,
- libxml-parser-perl,
- python3-all,
- python3-setuptools
-Build-Depends:
- dh-python,
- debhelper (>= 9.0.0)
-Standards-Version: 3.9.5
-Vcs-Git: git://anonscm.debian.org/collab-maint/gramps.git
-Vcs-browser: http://anonscm.debian.org/gitweb/?p=collab-maint/gramps.git
+Build-Depends-Indep: libxml-parser-perl, gettext, intltool
+Build-Depends: python-all (>= 2.7.0), debhelper (>= 7.4.3)
+Standards-Version: 3.9.1
 Homepage: http://www.gramps-project.org/
-X-Python-Version: >= 3.2

-Package: python3-gramps
+Package: gramps
 Architecture: all
-Depends:
- gir1.2-gtk-3.0 (>= 3.10.0),
- librsvg2-2,
- python3-gi,
- python3-gi-cairo,
- python3-bsddb3,
- xdg-utils,
- ${misc:Depends},
- ${python3:Depends}
-Recommends:
- graphviz,
- libosmgpsmap-1.0-0,
- gir1.2-osmgpsmap-1.0,
- python3-pyicu
-Suggests:
- fonts-freefont-ttf,
- gir1.2-gexiv2-0.10,
- gir1.2-gtkspell3-3.0,
- python3-pil,
- rcs
-Description: Genealogical research program
- Gramps is an Open Source genealogy program written in Python, using
- the GTK/GNOME interface. It is an extremely flexible program fitting
- the needs for both the amateur genealogist and serious genealogical
- researcher.
- Gramps has the ability to import GEDCOM files exported from many
- proprietary genealogy programs and can produce a large number of
- reports in many popular formats.
+Depends: ${misc:Depends}, ${python:Depends}, python-gobject (>= 3.3.2), librsvg2-2
+Recommends: python-pyicu, python-osmgpsmap,  graphviz, xdg-utils
+Suggests: ttf-freefont, python-gtkspell, libgexiv2-1, rcs, python-imaging, python-pygoocanvas
+Description: (Genealogical Research and Analysis Management
+ Programming System) is a full featured genealogy program supporting
+ a Python based plugin system.
@@ -1,314 +1,251 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Gramps
-Source: http://gramps-project.org
+This package was originally debianized by Brandon L. Griffith
+<brandon@debian.org> on Sat, 19 May 2001 13:37:24 -0400.

-Files: *
-Copyright: 2000-2007, Alex Roitman
-           2000-2002, Bruce J. DeGrasse
-           2000-2008, Donald N. Allingham
-           2000-2007, Martin Hawlisch
-           2001, Andrés Sepúlveda
-           2001, David R. Hampton
-           2001-2013, Free Software Foundation, Inc.
-           2001, Graham J. Williams
-           2001, Jesper Zedlitz
-           2001-2013, The Gramps Project
-           2002, Gary Shao
-           2003-2006, Josiah Carlson
-           2004-2006, Eero Tamminen
-           2004-2013, Julio Sánchez
-           2004, Toshio Kuratomi
-           2005-2011, Serge Noiraud
-           2006-2011, Brian G. Matherly
-           2006, 2008-2011, Kees Bakker           
-           2006-2008, Steve Hall
-           2007-2012, Benny Malengier
-           2007-2012, Douglas S. Blank
-           2007-2012, Gary Burton
-           2007-2011, Jerome Rapinat
-           2007, Johan Gronqvist
-           2007, Robert Cawley
-           2007-2009, Stephane Charette
-           2007, Thom Sturgill
-           2007-2008, Zsolt Foldvari
-           2008-2010, 2012, Craig J. Anderson
-           2008-2009, James Friedmann
-           2008-2009, Jason Simanek
-           2008, Lukasz Rymarczyk
-           2008-2010, Peter G. Landgren
-           2008, 2010, Raphael Ackermann
-           2008-2011, Reinhard Mueller
-           2008, 2011, Robert Cheramy
-           2008-2012, Rob G. Healey
-           2008, Stefan Siegel
-           2008-2010, Stephen George
-           2009-2010, Andrew I Baznikin
-           2009, 2011, The Dojo Foundation
-           2009, Florian Heinle
-           2009, Gerald W. Britton
-           2009, Igal Shapira
-           2009, 2011, John Resig
-           2009-2013, Nick Hall
-           2009, Pander Musubi
-           2009, Robert Ham
-           2009, Swoon on bug tracker
-           2009, Yevgeny Zegzda
-           2010, Gramps
-           2010, Jakim Friant
-           2010, Josip
-           2010, lcc & Robert Jerome
-           2010-2012, Michiel D. Nauta
-           2010-2013, Tim G L Lyons
-           2010-2011, Vlada Perić
-           2011, Adam Stein
-           2011-2012,  Harald Rosemann
-           2011, 2013, Heinz Brinker
-           2011, Helge Herz
-           2011, 2013 John Ralls
-           2011, Matt Keenan
-           2011-2013, Paul Franklin
-           2012, Mathieu MD
-           2012, Nicolas Adenis-Lamarre
-           2013, Fedir Zinchuk
-           2013, Oleh Petrivk
-           2013, Vassilii Khachaturov
-           2013, Zissis Papadopoulos
-License: GPL-2+
+The current Debian maintainer is James A. Treacy <treacy@debian.org>

-Files: data/javascript/jquery-1.3.2.min.js
-Copyright: 2009, John Resig
-License: MIT and GPL
+It was downloaded from http://gramps-project.org

-Files: data/javascript/jquery-1.7.1.js
-Copyright: 2011, John Resig
-           2011, The Dojo Foundation
-License: BSD and MIT and GPL-2
+Upstream Authors:
+   Donald N. Allingham, Alexander Roitman, Martin Hawlisch, Richard Taylor,
+   Brian Matherly, Tim Waugh, Donald A. Peterson, David Hampton

-Files: data/javascript/jquery-ui-1.7.2.custom.min.js
-Copyright: 2009, jQuery UI Team (http://jqueryui.com/about/)
-License: MIT and GPL-2
+========================================================
+Copyright: 2001-2006 Donald N. Allingham
+  This program is free software; you can redistribute it and/or modify
+  it 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.

-Files: data/javascript/jquery.flexbox*
-Copyright: 2008-2010, Noah Heldman and Fairway Technologies
-License: Ms-PL
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.

-Files: data/jhtmlarea/Readme.txt
-Copyright: 2009, Chris Pietschmann
-License: Ms-RL
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA

-Files: data/jhtmlarea/scripts/jHtmlArea*
-Copyright: 2009, Chris Pietschmann
-License: Ms-RL
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL

-Files: data/jhtmlarea/scripts/jquery-1.3.2*
-Copyright: 2009, John Resig
-           2009, The Dojo Foundation
-License: MIT
+========================================================
+The files in help/C directory are Copyright 2006  Alexander Roitman
+  This documentation is free software; you can redistribute it and/or modify
+  it 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.

-Files: data/jhtmlarea/scripts/jquery-ui-*
-Copyright: 2009, jQuery UI Team (http://jqueryui.com/about)
-License: MIT and GPL
+  This documentation is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.

-Files: debian/*
-Copyright: 2001-2002, Brandon L. Griffith
-           2002, Alex Roitman
-           2002-2012, James A. Treacy
-           2013, Ross Gammon
-License: GPL-2+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA 02111-1307 USA

-Files: gramps/webapp/grampsdb/view/png.py
-Copyright: 2006, Johann C. Rocholl
-           2009, David Jones
-           2006, Nicko van Someren
-License: MIT
+========================================================
+The files in help/fr directory are Copyright 2003-2006  Jerome Rapinat
+  This documentation is free software; you can redistribute it and/or modify
+  it 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.

-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  * Neither the name of the <organization> nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY John Resig ''AS IS'' AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  This documentation is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.

-License: GPL
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 1 only of the License.
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA 02111-1307 USA

-License: GPL-2
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 only of the License.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
+========================================================
+The data/grampsxml.dtd file is Copyright 2001 Graham J. William
+                           and Copyright 2000-2006  Donald N. Allingham

-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it 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.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
+  This program is free software; you can redistribute it and/or modify
+  it 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.

-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.

-License: Ms-PL
- This license governs use of the accompanying software. If you use the
- software, you accept this license. If you do not accept the license, do not
- use the software.
- .
- 1. Definitions
- .
- The terms "reproduce," "reproduction," "derivative works," and "distribution"
- have the same meaning here as under U.S. copyright law.
- .
- A "contribution" is the original software, or any additions or changes to the
- software.
- .
- A "contributor" is any person that distributes its contribution under this
- license.
- .
- "Licensed patents" are a contributor's patent claims that read directly on its
- contribution.
- .
- 2. Grant of Rights
- .
- (A) Copyright Grant- Subject to the terms of this license, including the
- license conditions and limitations in section 3, each contributor grants you a
- non-exclusive, worldwide, royalty-free copyright license to reproduce its
- contribution, prepare derivative works of its contribution, and distribute its
- contribution or any derivative works that you create.
- .
- (B) Patent Grant- Subject to the terms of this license, including the license
- conditions and limitations in section 3, each contributor grants you a
- non-exclusive, worldwide, royalty-free license under its licensed patents to
- make, have made, use, sell, offer for sale, import, and/or otherwise dispose of
- its contribution in the software or derivative works of the contribution in the
- software.
- .
- 3. Conditions and Limitations
- .
- (A) No Trademark License- This license does not grant you rights to use any
- contributors' name, logo, or trademarks.
- .
- (B) If you bring a patent claim against any contributor over patents that you
- claim are infringed by the software, your patent license from such contributor
- to the software ends automatically.
- .
- (C) If you distribute any portion of the software, you must retain all copyright,
- patent, trademark, and attribution notices that are present in the software.
- .
- (D) If you distribute any portion of the software in source code form, you may do
- so only under this license by including a complete copy of this license with your
- distribution. If you distribute any portion of the software in compiled or object
- code form, you may only do so under a license that complies with this license.
- .
- (E) The software is licensed "as-is." You bear the risk of using it. The
- contributors give no express warranties, guarantees or conditions. You may have
- additional consumer rights under your local laws which this license cannot change.
- To the extent permitted under your local laws, the contributors exclude the
- implied warranties of merchantability, fitness for a particular purpose and
- non-infringement.
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA

-License: Ms-RL
- This license governs use of the accompanying software. If you use the software,
- you accept this license. If you do not accept the license, do not use the software.
- .
- 1. Definitions
- The terms "reproduce," "reproduction," "derivative works," and "distribution" have
- the same meaning here as under U.S. copyright law.
- A "contribution" is the original software, or any additions or changes to the
- software.
- A "contributor" is any person that distributes its contribution under this license.
- "Licensed patents" are a contributor's patent claims that read directly on its
- contribution.
- .
- 2. Grant of Rights
- (A) Copyright Grant- Subject to the terms of this license, including the license
- conditions and limitations in section 3, each contributor grants you a
- non-exclusive, worldwide, royalty-free copyright license to reproduce its
- contribution, prepare derivative works of its contribution, and distribute its
- contribution or any derivative works that you create.
- (B) Patent Grant- Subject to the terms of this license, including the license
- conditions and limitations in section 3, each contributor grants you a
- non-exclusive, worldwide, royalty-free license under its licensed patents to make,
- have made, use, sell, offer for sale, import, and/or otherwise dispose of its
- contribution in the software or derivative works of the contribution in the software.
- .
- 3. Conditions and Limitations
- (A) Reciprocal Grants- For any file you distribute that contains code from the
- software (in source code or binary format), you must provide recipients the source
- code to that file along with a copy of this license, which license will govern that
- file. You may license other files that are entirely your own work and do not contain
- code from the software under any terms you choose.
- (B) No Trademark License- This license does not grant you rights to use any
- contributors' name, logo, or trademarks.
- (C) If you bring a patent claim against any contributor over patents that you claim
- are infringed by the software, your patent license from such contributor to the
- software ends automatically.
- (D) If you distribute any portion of the software, you must retain all copyright,
- patent, trademark, and attribution notices that are present in the software.
- (E) If you distribute any portion of the software in source code form, you may do so
- only under this license by including a complete copy of this license with your
- distribution. If you distribute any portion of the software in compiled or object code
- form, you may only do so under a license that complies with this license.
- (F) The software is licensed "as-is." You bear the risk of using it. The contributors
- give no express warranties, guarantees or conditions. You may have additional consumer
- rights under your local laws which this license cannot change. To the extent permitted
- under your local laws, the contributors exclude the implied warranties of
- merchantability, fitness for a particular purpose and non-infringement.
+========================================================
+The src/TreeTips.py file is Copyright 2004 Toshio Kuratomi
+
+  This program is free software; you can redistribute it and/or modify
+  it 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.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+
+========================================================
+The src/data/fdl.txt file is Copyright 2000,2001,2002 
+                             Free Software Foundation, Inc.
+                             59 Temple Place, Suite 330,
+                             Boston, MA  02111-1307  USA
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+
+========================================================
+The file src/docgen/ODFDoc.py file is Copyright 2005-2006 Serge Noiraud
+                                  and Copyright 2005-2006 Donald N. Allingham
+  This program is free software; you can redistribute it and/or modify
+  it 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.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+
+========================================================
+The file src/Mime/_WinMime.py file is Copyright 2006 Brian Matherly
+                                  and Copyright 2006 Donald N. Allingham
+  This program is free software; you can redistribute it and/or modify
+  it 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.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+
+========================================================
+The src/plugins/Ancestors.py file is Copyright 2003 Tim Waugh
+                                 and Copyright 2003-2006  Donald N. Allingham
+
+  This program is free software; you can redistribute it and/or modify
+  it 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.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+
+========================================================
+The src/plugins/CountAncestors.py file is Copyright 2001  Jesper Zedlitz
+                             and Copyright 2001-2006 Donald N. Allingham
+  This program is free software; you can redistribute it and/or modify
+  it 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.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+
+========================================================
+The files:
+   src/plugins/DetAncestralReport.py
+   src/plugins/DetDescendantReport.py
+are Copyright 2000-2002 Bruce J. DeGrasse
+and Copyright 2002-2006 Donald N. Allingham
+  This program is free software; you can redistribute it and/or modify
+  it 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.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+
+========================================================
+The files:
+   src/date_test.py
+   src/DataViews/_PedigreeView.py
+   src/plugins/DumpGenderStats.py
+   src/plugins/ExportVCalendar.py
+   src/plugins/ExportVCard.py
+   src/plugins/ImportGeneWeb.py
+   src/plugins/ImportvCard.py
+   src/plugins/TestcaseGenerator.py
+   src/plugins/WriteGeneWeb.py
+are Copyright 2001-2006 Martin Hawlisch, Donald N. Allingham
+  This program is free software; you can redistribute it and/or modify
+  it 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.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+
+========================================================
+The files:
+   src/ReportBase/__init__.py
+   src/ReportBase/_Report.py
+are Copyright 2001 David R. Hampton
+and Copyright 2001-2006 Donald N. Allingham
+  This program is free software; you can redistribute it and/or modify
+  it 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.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
@@ -0,0 +1,2 @@
+NEWS
+README
@@ -0,0 +1,2 @@
+usr/share/pixmaps
+usr/share/mime/packages
@@ -0,0 +1,5 @@
+AUTHORS
+FAQ
+NEWS
+README
+TODO
@@ -0,0 +1,3 @@
+/usr/bin/
+/usr/share/
+/etc
@@ -1,2 +0,0 @@
-# Install icon to the correct place
-debian/gramps.xpm usr/share/pixmaps/
@@ -0,0 +1 @@
+data/man/gramps.1.in
@@ -0,0 +1,3 @@
+?package(gramps):needs="X11" section="Applications/Office"\
+  title="gramps" command="/usr/bin/gramps"\
+  icon="/usr/share/pixmaps/gramps.xpm"
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+#DEBHELPER#
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+#DEBHELPER#
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+set -e
+
+# This was added by stdeb to workaround Debian #479852. In a nutshell,
+# pycentral does not remove normally remove its symlinks on an
+# upgrade. Since we're using python-support, however, those symlinks
+# will be broken. This tells python-central to clean up any symlinks.
+if [ -e /var/lib/dpkg/info/gramps.list ] && which pycentral >/dev/null 2>&1
+then
+    pycentral pkgremove gramps
+fi
+
+#DEBHELPER#
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+# #DEBHELPER#
@@ -0,0 +1 @@
+2
@@ -1,36 +1,9 @@
 #!/usr/bin/make -f

-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-export DH_OPTIONS=-v
+# This file was automatically generated by stdeb 0.6.0+git at
+# Sun, 31 Mar 2013 16:54:38 +0200

 %:
-	dh $@ --with python3 --buildsystem=pybuild
+	dh $@ --with python2 --buildsystem=python_distutils

-# Override auto test because upstream do not use the standard unittest discover
-override_dh_auto_test:

-# Override of auto_build
-override_dh_auto_build:
-	python3 setup.py build
-
-# Override of auto_install to remove information from package
-override_dh_auto_install:
-	#dh_auto_install
-	python3 setup.py install --resourcepath=/usr/share --root=debian/python3-gramps --install-layout=deb
-	# Remove duplicate copyright information
-	rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/COPYING
-	# Remove install file as it is not needed by package users
-	rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/INSTALL
-	# Remove duplicate license information
-	rm $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/LICENSE
-	ln -s /usr/share/common-licenses/GPL-2 $(CURDIR)/debian/python3-gramps/usr/share/doc/gramps/COPYING
-
-# Make css style sheets and png icons non-executable
-override_dh_fixperms:
-	dh_fixperms
-	chmod a-x $(CURDIR)/debian/python3-gramps/usr/share/gramps/css/Web_*.css
-
-# Avoid compressing COPYING file so that it can appear in the "About" dialog
-override_dh_compress:
-	dh_compress -X COPYING
@@ -1 +0,0 @@
-1.8
@@ -0,0 +1,2 @@
+shlibs:Depends=libbonobo2-0 (>= 2.4.3), libc6 (>= 2.3.2.ds1-4), libglib2.0-0 (>= 2.2.3), libgnomevfs2-0 (>= 2.4.1), libgnomevfs2-common (>= 2.4.1), liborbit2 (>= 1:2.8.0)
+python:Depends=python (>= 2.3), python (<< 2.4)
@@ -3,7 +3,7 @@

 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = GRAMPS_RESOURCES=$$PWD/.. sphinx-build
+SPHINXBUILD   = sphinx-build
 PAPER         =

 # Internal variables.
@@ -3,9 +3,7 @@ Installation and building the docs

 You need to install sphinx. Assuming you have installed the python setuptools, just do:

-  sudo easy_install sphinx
-or
-  sudo pip install sphinx
+  sudo easy_install sphinx 

 Once installed, go to the docs directory, and do:

@@ -19,7 +17,7 @@ Documentation Guidelines

 Doc strings in python files should be written in reStructured text: http://docutils.sourceforge.net/docs/user/rst/quickref.html

-The typical docstring for Gramps should look like this:
+The typical docstring for GRAMPS should look like this: 

 """Brief synopsis

@@ -71,4 +69,4 @@ Change in many files something:
 perl -pi -w -e "s/L{PersonRef}/:class:\`\~gen.lib.personref.PersonRef\`/g;" *.py 

 here L{PersonRef} is changed in :class:`~gen.lib.personref.PersonRef
-`
+`
@@ -2,7 +2,7 @@
 Code Documentation
 ##################

-*Gramps* provides several general API. The most important is the *gen* module, providing access to all code that can be of interest outside of the Gramps program.
+*GRAMPS* provides several general API. The most important is the *gen* module, providing access to all code that can be of interest outside of the GRAMPS program.

 The :mod:`gen` Module
 =======================
@@ -22,7 +22,7 @@ Contents:
   gen/gen_proxy
   gen/gen_utils

-The Gramps Application
+The GRAMPS Application
 ========================

 Contents:
@@ -32,12 +32,11 @@ Contents:

   corecli/cli
   coregui/gui
-   coregui/gui_widgets
   date
   relationship
   simple

-Useful snippets
+Usefull snippets
 ===================

 Contents:
@@ -25,7 +25,7 @@ sys.path.append(os.path.abspath(os.pardir))

 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.viewcode']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage']

 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -41,16 +41,16 @@ master_doc = 'index'

 # General information about the project.
 project = u'Gramps'
-copyright = u'2015, The Gramps Project'
+copyright = u'2013, The Gramps Project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '4.2.0'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.2.0-master'
+release = '4.0.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -89,8 +89,6 @@ pygments_style = 'sphinx'
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []

-# If true, todo entries will be included in the output.
-todo_include_todos = True

 # -- Options for HTML output ---------------------------------------------------

@@ -153,6 +153,23 @@ Filter Editor
   :undoc-members:
   :show-inheritance:

+*****************************
+Gramps Bar
+*****************************
+.. automodule:: gramps.gui.widgets.grampletbar
+.. autoclass::  DetachedWindow
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass::  GrampletBar
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass::  TabGramplet
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 *****************************
 Navigator
 *****************************
@@ -163,7 +180,7 @@ Navigator
   :show-inheritance:

 *****************************
-Plugin Manager
+Plugins Manager
 *****************************
 .. automodule:: gramps.gui.pluginmanager
 .. autoclass::  GuiPluginManager
@@ -198,7 +215,7 @@ Utils
   :show-inheritance:

 *****************************
-View Manager
+Views Manager
 *****************************
 .. automodule:: gramps.gui.viewmanager
 .. autoclass:: ViewManager
@@ -1,433 +0,0 @@
-####################################
-The :mod:`gramps.gui.widgets` Module
-####################################
-
-.. automodule:: gramps.gui.widgets
-
-*****************************
-Basic Entry
-*****************************
-.. automodule:: gramps.gui.widgets.basicentry
-.. autoclass:: BasicEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Buttons
-*****************************
-.. automodule:: gramps.gui.widgets.buttons
-.. autoclass:: IconButton
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: WarnButton
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: SimpleButton
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: PrivacyButton
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Date Entry
-*****************************
-.. automodule:: gramps.gui.widgets.dateentry
-.. autoclass:: DateEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Expand Collapse Arrow
-*****************************
-.. automodule:: gramps.gui.widgets.expandcollapsearrow
-.. autoclass:: ExpandCollapseArrow
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Fanchart
-*****************************
-.. automodule:: gramps.gui.widgets.fanchart
-.. autoclass:: FanChartBaseWidget
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: FanChartWidget
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: FanChartGrampsGUI
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Fanchart Descendant
-*****************************
-.. automodule:: gramps.gui.widgets.fanchartdesc
-.. autoclass:: FanChartDescWidget
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: FanChartDescGrampsGUI
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Gramplet Bar
-*****************************
-.. automodule:: gramps.gui.widgets.grampletbar
-.. autoclass::  DetachedWindow
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass::  GrampletBar
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass::  TabGramplet
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Gramplet Pane
-*****************************
-.. automodule:: gramps.gui.widgets.grampletpane
-.. autoclass:: LinkTag
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GrampletWindow
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GuiGramplet
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GridGramplet
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GrampletPane
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: Configuration
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Labels
-*****************************
-.. automodule:: gramps.gui.widgets.labels
-.. autoclass:: LinkLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: EditLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: BasicLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GenderLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MarkupLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: DualMarkupLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Link Box
-*****************************
-.. automodule:: gramps.gui.widgets.linkbox
-.. autoclass:: LinkBox
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Menu Item
-*****************************
-.. automodule:: gramps.gui.widgets.menuitem
-.. autoclass:: MenuItemWithData
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Monitored Widgets
-*****************************
-.. automodule:: gramps.gui.widgets.monitoredwidgets
-.. autoclass:: MonitoredCheckbox
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredEntryIndicator
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredSpinButton
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredText
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredType
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredDataType
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredMenu
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredStrMenu
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredDate
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredComboSelectedEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredTagList
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Multi Tree View
-*****************************
-.. automodule:: gramps.gui.widgets.multitreeview
-.. autoclass:: MultiTreeView
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Photo
-*****************************
-.. automodule:: gramps.gui.widgets.photo
-.. autoclass:: Photo
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Progress Dialog
-*****************************
-.. automodule:: gramps.gui.widgets.progressdialog
-.. autoclass:: LongOpStatus
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: ProgressMonitor
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GtkProgressDialog
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Shortlist ComboEntry
-*****************************
-.. automodule:: gramps.gui.widgets.shortlistcomboentry
-.. autoclass:: ShortlistComboEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Spring Separator
-*****************************
-.. automodule:: gramps.gui.widgets.springseparator
-.. autoclass:: SpringSeparatorToolItem
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: SpringSeparatorAction
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Statusbar
-*****************************
-.. automodule:: gramps.gui.widgets.statusbar
-.. autoclass:: Statusbar
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Styled Text Buffer
-*****************************
-.. automodule:: gramps.gui.widgets.styledtextbuffer
-.. autoclass:: LinkTag
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GtkSpellState
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: StyledTextBuffer
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Styled Text Editor
-*****************************
-.. automodule:: gramps.gui.widgets.styledtexteditor
-.. autoclass:: StyledTextEditor
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Tool ComboEntry
-*****************************
-.. automodule:: gramps.gui.widgets.toolcomboentry
-.. autoclass:: ToolComboEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Undoable Buffer
-*****************************
-.. automodule:: gramps.gui.widgets.undoablebuffer
-.. autoclass:: Stack
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableInsert
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableDelete
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableBuffer
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Undoable Entry
-*****************************
-.. automodule:: gramps.gui.widgets.undoableentry
-.. autoclass:: UndoableInsertEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableDeleteEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Undoable Styled Buffer
-*****************************
-.. automodule:: gramps.gui.widgets.undoablestyledbuffer
-.. autoclass:: UndoableInsertStyled
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableDeleteStyled
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableApplyStyle
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableStyledBuffer
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Validated Combo Entry
-*****************************
-.. automodule:: gramps.gui.widgets.validatedcomboentry
-.. autoclass:: ValidatedComboEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Validated Masked Entry
-*****************************
-.. automodule:: gramps.gui.widgets.validatedmaskedentry
-.. autoclass:: FadeOut
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MaskedEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: ValidatableMaskedEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Value Action
-*****************************
-.. automodule:: gramps.gui.widgets.valueaction
-.. autoclass:: ValueAction
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Value Tool Item
-*****************************
-.. automodule:: gramps.gui.widgets.valuetoolitem
-.. autoclass:: ValueToolItem
-   :members:
-   :undoc-members:
-   :show-inheritance:
@@ -10,13 +10,6 @@ DateParser
   :undoc-members:
   :show-inheritance:

-DateStrings
-===========
-.. automodule:: gramps.gen.datehandler._datestrings
-.. autoclass:: DateStrings
-   :members:
-   :show-inheritance:
-
 DateDisplay
 ====================================
 .. automodule:: gramps.gen.datehandler._datedisplay
@@ -1,4 +1,4 @@
 Developer Guide
 ===============

-Please consult the API documentation, and the development section of `our wiki <https://gramps-project.org/wiki/index.php?title=Portal:Developers>`_\ .
+Please consult the API documentation, and the development part of `our wiki <http://gramps-project.org>`_\ .
@@ -24,28 +24,14 @@ AddressBase
   :undoc-members:
   :show-inheritance:

-AttributeRootBase
-====================================
-.. automodule:: gramps.gen.lib.attrbase
-.. autoclass:: AttributeRootBase
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 AttributeBase
 ====================================
+.. automodule:: gramps.gen.lib.attrbase
 .. autoclass:: AttributeBase
   :members:
   :undoc-members:
   :show-inheritance:

-SrcAttributeBase
-====================================
-.. autoclass:: SrcAttributeBase
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 CitationBase
 ====================================
 .. automodule:: gramps.gen.lib.citationbase
@@ -54,13 +40,6 @@ CitationBase
   :undoc-members:
   :show-inheritance:
   
-IndirectCitationBase
-====================================
-.. autoclass:: IndirectCitationBase
-   :members:
-   :undoc-members:
-   :show-inheritance:
-   
 DateBase
 ====================================
 .. automodule:: gramps.gen.lib.datebase
@@ -268,13 +247,6 @@ Attribute
   :undoc-members:
   :show-inheritance:

-AttributeRoot
-====================================
-.. autoclass:: AttributeRoot
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 LdsOrd
 ====================================
 .. automodule:: gramps.gen.lib.ldsord
@@ -351,14 +323,6 @@ PersonRef
   :undoc-members:
   :show-inheritance:

-PlaceRef
-====================================
-.. automodule:: gramps.gen.lib.placeref
-.. autoclass:: PlaceRef
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 RepoRef
 ====================================
 .. automodule:: gramps.gen.lib.reporef
@@ -368,7 +332,7 @@ RepoRef
   :show-inheritance:
   
 *****************************
-Table objects
+Table object
 *****************************

 Table object
@@ -378,14 +342,6 @@ Table object
   :undoc-members:
   :show-inheritance:

-Tag
-====================================
-.. automodule:: gramps.gen.lib.tag
-.. autoclass:: Tag
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 *****************************
 Date objects
 *****************************
@@ -530,13 +486,6 @@ NoteType
   :undoc-members:
   :show-inheritance:

-PlaceType
-=========
-.. automodule:: gramps.gen.lib.placetype
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 RepositoryType
 ==============
 .. automodule:: gramps.gen.lib.repotype
@@ -570,7 +519,7 @@ Privacy
 *****************************

 PrivateSourceNote
-=================
+============

 .. automodule:: gramps.gen.lib.privsrcnote
 .. autoclass:: PrivateSourceNote
@@ -4,12 +4,12 @@ The :mod:`gramps.gen.utils` Module

 .. automodule:: gramps.gen.utils

-**********************************
-Utilities
-**********************************
-
-Callback
+Utils
 ====================================
+.. automodule:: gramps.gen.utils.alive
+   :members:
+   :undoc-members:
+   :show-inheritance:
 .. automodule:: gramps.gen.utils.callback
   :members:
   :undoc-members:
@@ -18,10 +18,7 @@ Callback
   :members:
   :undoc-members:
   :show-inheritance:
-
-Configuration
-====================================
-.. automodule:: gramps.gen.utils.configmanager
+.. automodule:: gramps.gen.utils.cast
   :members:
   :undoc-members:
   :show-inheritance:
@@ -29,10 +26,7 @@ Configuration
   :members:
   :undoc-members:
   :show-inheritance:
-
-Database
-====================================
-.. automodule:: gramps.gen.utils.alive
+.. automodule:: gramps.gen.utils.configmanager
   :members:
   :undoc-members:
   :show-inheritance:
@@ -40,62 +34,45 @@ Database
   :members:
   :undoc-members:
   :show-inheritance:
+.. automodule:: gramps.gen.utils.file
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.grampslocale
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.id
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.image
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.keyword
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.lds
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.maclocale
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.place
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.string
+   :members:
+   :undoc-members:
+   :show-inheritance:
 .. automodule:: gramps.gen.utils.unknown
   :members:
   :undoc-members:
   :show-inheritance:

-File
-====================================
-.. automodule:: gramps.gen.utils.file
-   :members:
-   :undoc-members:
-   :show-inheritance:

-Image
-====================================
-.. automodule:: gramps.gen.utils.image
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Locale
-====================================
-.. automodule:: gramps.gen.utils.grampslocale
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.maclocale
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.keyword
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Place
-====================================
-.. automodule:: gramps.gen.utils.place
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Other
-====================================
-.. automodule:: gramps.gen.utils.cast
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.id
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.lds
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.string
-   :members:
-   :undoc-members:
-   :show-inheritance:
@@ -19,7 +19,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 """
 update_doc.py for Gramps API(s) documentation.
@@ -1,4 +1,4 @@
 User Guide
 ==========

-Please consult the manual which you find on `our wiki <https://gramps-project.org/wiki/index.php?title=User_manual>`_\ .
+Please consult the manual which you find on `our wiki <http://www.gramps-project.org/wiki/index.php?title=User_manual>`_\ .
@@ -1,7 +0,0 @@
-person,surname,given
-a,"CSV Surname","Given 1"
-b,"CSV Surname","Given 2"
-
-marriage,mother,father
-1,a,b
-
@@ -25,7 +25,7 @@
 1 BIRT
 2 TYPE Birth of Anna Hansdotter
 2 DATE 2 OCT 1864
-2 PLAC Löderup, Malmöhus Län, Sweden
+2 PLAC Loderup, Malmous Lan, Sweden
 1 DEAT
 2 TYPE Death of Anna Hansdotter
 2 DATE 29 SEP 1945
@@ -55,7 +55,7 @@
 1 BIRT
 2 TYPE Birth of Hans Peter Smith
 2 DATE 17 APR 1904
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Hans Peter Smith
 2 DATE 29 JAN 1977
@@ -74,7 +74,7 @@
 1 BIRT
 2 TYPE Birth of Hanna Smith
 2 DATE 29 JAN 1821
-2 PLAC Gladsax, Kristianstad Län, Sweden
+2 PLAC Gladsax, Kristianstad Lan, Sweden
 1 FAMC @F0@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -87,7 +87,7 @@
 1 BIRT
 2 TYPE Birth of Herman Julius Nielsen
 2 DATE 31 AUG 1889
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Herman Julius Nielsen
 2 DATE 1945
@@ -128,7 +128,7 @@
 1 BIRT
 2 TYPE Birth of Gus Smith
 2 DATE 11 SEP 1897
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Gus Smith
 2 DATE 21 OCT 1963
@@ -146,7 +146,7 @@
 1 BIRT
 2 TYPE Birth of Jennifer Anderson
 2 DATE 5 NOV 1907
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Jennifer Anderson
 2 DATE 29 MAY 1985
@@ -163,7 +163,7 @@
 1 BIRT
 2 TYPE Birth of Lillie Harriet Jones
 2 DATE 2 MAY 1910
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Lillie Harriet Jones
 2 DATE 26 JUN 1990
@@ -227,7 +227,7 @@
 1 BIRT
 2 TYPE Birth of Carl Emil Smith
 2 DATE 20 DEC 1899
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Carl Emil Smith
 2 DATE 28 JAN 1959
@@ -245,11 +245,11 @@
 1 BIRT
 2 TYPE Birth of Hjalmar Smith
 2 DATE 31 JAN 1893
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Hjalmar Smith
 2 DATE 25 SEP 1894
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 FAMC @F3@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -262,7 +262,7 @@
 1 BIRT
 2 TYPE Birth of Martin Smith
 2 DATE 19 NOV 1830
-2 PLAC Gladsax, Kristianstad Län, Sweden
+2 PLAC Gladsax, Kristianstad Lan, Sweden
 1 DEAT
 2 TYPE Death of Martin Smith
 2 DATE BET 1899 AND 1905
@@ -270,7 +270,7 @@
 1 BAPM
 2 TYPE Baptism of Martin Smith
 2 DATE 23 NOV 1830
-2 PLAC Gladsax, Kristianstad Län, Sweden
+2 PLAC Gladsax, Kristianstad Lan, Sweden
 1 FAMC @F0@
 1 FAMS @F2@
 1 NOTE @N0002@
@@ -285,7 +285,7 @@
 1 BIRT
 2 TYPE Birth of Astrid Shermanna Augusta Smith
 2 DATE 31 JAN 1889
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Astrid Shermanna Augusta Smith
 2 DATE 21 DEC 1963
@@ -304,7 +304,7 @@
 1 BIRT
 2 TYPE Birth of Gustaf Smith, Sr.
 2 DATE 28 NOV 1862
-2 PLAC Grostorp, Kristianstad Län, Sweden
+2 PLAC Grostorp, Kristianstad Lan, Sweden
 1 DEAT
 2 TYPE Death of Gustaf Smith, Sr.
 2 DATE BEF 23 JUL 1930
@@ -316,7 +316,7 @@
 1 CHR
 2 TYPE Christening of Gustaf Smith, Sr.
 2 DATE 7 DEC 1862
-2 PLAC Gladsax, Kristianstad Län, Sweden
+2 PLAC Gladsax, Kristianstad Lan, Sweden
 1 FAMC @F2@
 1 FAMS @F3@
 1 CHAN
@@ -343,7 +343,7 @@
 1 BIRT
 2 TYPE Birth of Kirsti Marie Smith
 2 DATE 15 DEC 1886
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Kirsti Marie Smith
 2 DATE 18 JUL 1966
@@ -378,7 +378,7 @@
 1 DEAT
 2 TYPE Death of Anna Streiffert
 2 DATE 2 FEB 1927
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 FAMS @F11@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -407,11 +407,11 @@
 1 BIRT
 2 TYPE Birth of Magnes Smith
 2 DATE 6 OCT 1858
-2 PLAC Simrishamn, Kristianstad Län, Sweden
+2 PLAC Simrishamn, Kristianstad Lan, Sweden
 1 DEAT
 2 TYPE Death of Magnes Smith
 2 DATE 20 FEB 1910
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 FAMC @F2@
 1 FAMS @F11@
 1 CHAN
@@ -515,14 +515,14 @@
 1 BIRT
 2 TYPE Birth of Elna Jefferson
 2 DATE 14 SEP 1800
-2 PLAC Gladsax, Kristianstad Län, Sweden
+2 PLAC Gladsax, Kristianstad Lan, Sweden
 1 DEAT
 2 TYPE Death of Elna Jefferson
 2 PLAC Sweden
 1 CHR
 2 TYPE Christening of Elna Jefferson
 2 DATE 16 SEP 1800
-2 PLAC Gladsax, Kristianstad Län, Sweden
+2 PLAC Gladsax, Kristianstad Lan, Sweden
 1 FAMS @F0@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -560,7 +560,7 @@
 1 BIRT
 2 TYPE Birth of Kerstina Hansdotter
 2 DATE 29 NOV 1832
-2 PLAC Smestorp, Kristianstad Län, Sweden
+2 PLAC Smestorp, Kristianstad Lan, Sweden
 1 DEAT
 2 TYPE Death of Kerstina Hansdotter
 2 DATE BEF 1908
@@ -577,7 +577,7 @@
 1 BIRT
 2 TYPE Birth of Martin Smith
 2 DATE BET 1794 AND 1796
-2 PLAC Tommarp, Kristianstad Län, Sweden
+2 PLAC Tommarp, Kristianstad Lan, Sweden
 1 DEAT
 2 TYPE Death of Martin Smith
 2 PLAC Sweden
@@ -594,7 +594,7 @@
 1 BIRT
 2 TYPE Birth of Ingeman Smith
 2 DATE 29 JAN 1826
-2 PLAC Gladsax, Kristianstad Län, Sweden
+2 PLAC Gladsax, Kristianstad Lan, Sweden
 1 FAMC @F0@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -661,7 +661,7 @@
 1 BIRT
 2 TYPE Birth of Ingar Smith
 2 DATE AFT 1823
-2 PLAC Gladsax, Kristianstad Län, Sweden
+2 PLAC Gladsax, Kristianstad Lan, Sweden
 1 FAMC @F0@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -674,7 +674,7 @@
 1 BIRT
 2 TYPE Birth of Hjalmar Smith
 2 DATE 7 APR 1895
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 DEAT
 2 TYPE Death of Hjalmar Smith
 2 DATE 26 JUN 1975
@@ -682,7 +682,7 @@
 1 BAPM
 2 TYPE Baptism of Hjalmar Smith
 2 DATE 3 JUN 1895
-2 PLAC Rønne Bornholm, Denmark
+2 PLAC Ronne Bornholm, Denmark
 1 EVEN
 2 TYPE Immi
 2 DATE 14 NOV 1912
@@ -701,7 +701,7 @@
 1 BIRT
 2 TYPE Birth of Emil Smith
 2 DATE 27 SEP 1860
-2 PLAC Simrishamn, Kristianstad Län, Sweden
+2 PLAC Simrishamn, Kristianstad Lan, Sweden
 1 FAMC @F2@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -712,7 +712,7 @@
 1 MARR
 2 TYPE Marriage of Martin Smith and Elna Jefferson
 2 DATE ABT 1816
-2 PLAC Gladsax, Kristianstad Län, Sweden
+2 PLAC Gladsax, Kristianstad Lan, Sweden
 1 CHIL @I11@
 1 CHIL @I7@
 1 CHIL @I4@
@@ -748,7 +748,7 @@
 1 MARR
 2 TYPE Marriage of Magnes Smith and Anna Streiffert
 2 DATE 24 AUG 1884
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
@@ -805,7 +805,7 @@
 1 MARR
 2 TYPE Marriage of Gustaf Smith, Sr. and Anna Hansdotter
 2 DATE 27 NOV 1885
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 CHIL @I26@
 1 CHIL @I23@
 1 CHIL @I21@
@@ -831,7 +831,7 @@
 1 MARR
 2 TYPE Marriage of Herman Julius Nielsen and Astrid Shermanna Augusta Smith
 2 DATE 30 NOV 1912
-2 PLAC Rønne, Bornholm, Denmark
+2 PLAC Ronne, Bornholm, Denmark
 1 CHAN
 2 DATE 21 DEC 2007
 3 TIME 01:35:26
@@ -1,782 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE database PUBLIC "-//Gramps//DTD Gramps XML 1.5.0//EN"
-"http://gramps-project.org/xml/1.5.0/grampsxml.dtd">
-<database xmlns="http://gramps-project.org/xml/1.5.0/">
-  <header>
-    <created date="2015-05-14" version="3.4.0"/>
-    <researcher>
-    </researcher>
-  </header>
-  <events>
-    <event handle="_cde77b2c30c13ea85db" change="1426803047" id="E0000">
-      <type>Birth</type>
-      <dateval val="1823" type="before"/>
-    </event>
-    <event handle="_cde77b7eff96ae8455f" change="1426803072" id="E0001">
-      <type>Birth</type>
-      <dateval val="1823-03" type="before"/>
-    </event>
-    <event handle="_cde77be2a67401f7b16" change="1426803096" id="E0002">
-      <type>Birth</type>
-      <dateval val="1823-03-13" type="before"/>
-    </event>
-    <event handle="_cde7b70d22b30f00b14" change="1426802975" id="E0003">
-      <type>Birth</type>
-      <dateval val="1822" type="after"/>
-    </event>
-    <event handle="_cde7b8eb90e0a8792a9" change="1426802998" id="E0004">
-      <type>Birth</type>
-      <dateval val="1822-02" type="after"/>
-    </event>
-    <event handle="_cde7b95cb7e40432538" change="1426803021" id="E0005">
-      <type>Birth</type>
-      <dateval val="1822-02-13" type="after"/>
-    </event>
-    <event handle="_cde7b9b2b00713c42af" change="1426802885" id="E0006">
-      <type>Birth</type>
-      <dateval val="1821" type="about"/>
-    </event>
-    <event handle="_cde7b9f0da51d2ff10a" change="1426802925" id="E0007">
-      <type>Birth</type>
-      <dateval val="1821-01" type="about"/>
-    </event>
-    <event handle="_cde7ba310240e18a0ea" change="1426802949" id="E0008">
-      <type>Birth</type>
-      <dateval val="1821-01-13" type="about"/>
-    </event>
-    <event handle="_ce00f22be3443f0c30b" change="1426803671" id="E0009">
-      <type>Birth</type>
-      <dateval val="1851"/>
-    </event>
-    <event handle="_ce00f2ab83911df5354" change="1426803701" id="E0010">
-      <type>Birth</type>
-      <dateval val="1852-02"/>
-    </event>
-    <event handle="_ce00f2eb2f86d94ece0" change="1426803729" id="E0011">
-      <type>Birth</type>
-      <dateval val="1853-03-04"/>
-    </event>
-    <event handle="_cfa02e904f161e652da" change="1426793018" id="E0014">
-      <type>Birth</type>
-      <dateval val="1801-01"/>
-    </event>
-    <event handle="_cfa02efc75b0eb05cfa" change="1426793062" id="E0015">
-      <type>Birth</type>
-      <dateval val="1801-01-13"/>
-    </event>
-    <event handle="_cfa02f60fbe55ad36f7" change="1426793103" id="E0016">
-      <type>Birth</type>
-      <dateval val="1802-02"/>
-    </event>
-    <event handle="_cfa02fd93615614dc94" change="1426793153" id="E0017">
-      <type>Birth</type>
-      <dateval val="1802-02-13"/>
-    </event>
-    <event handle="_cfa030376d1228fb29b" change="1426793191" id="E0018">
-      <type>Birth</type>
-      <dateval val="1803-03"/>
-    </event>
-    <event handle="_cfa0308a9e766a18a5a" change="1426793225" id="E0019">
-      <type>Birth</type>
-      <dateval val="1803-03-13"/>
-    </event>
-    <event handle="_cfa0311ff9474a33dad" change="1426793404" id="E0020">
-      <type>Birth</type>
-      <dateval val="1804-04"/>
-    </event>
-    <event handle="_cfa0314208a175c695f" change="1426793300" id="E0021">
-      <type>Birth</type>
-      <dateval val="1804-04-13"/>
-    </event>
-    <event handle="_cfa031df6bb2f50f9c5" change="1426793365" id="E0022">
-      <type>Birth</type>
-      <dateval val="1805-05"/>
-    </event>
-    <event handle="_cfa0335efcf6eeb6bf6" change="1426793522" id="E0024">
-      <type>Birth</type>
-      <dateval val="1805-05-13"/>
-    </event>
-    <event handle="_cfa0342171e10e9a0c8" change="1426793602" id="E0025">
-      <type>Birth</type>
-      <dateval val="1806-06"/>
-    </event>
-    <event handle="_cfa03468bc76cf7a295" change="1426793631" id="E0026">
-      <type>Birth</type>
-      <dateval val="1807-07"/>
-    </event>
-    <event handle="_cfa034b07c9408b12cc" change="1426793660" id="E0027">
-      <type>Birth</type>
-      <dateval val="1808-08"/>
-    </event>
-    <event handle="_cfa034f8da44738c323" change="1426793690" id="E0028">
-      <type>Birth</type>
-      <dateval val="1809-09"/>
-    </event>
-    <event handle="_cfa03547c3765017895" change="1426793722" id="E0029">
-      <type>Birth</type>
-      <dateval val="1810-10"/>
-    </event>
-    <event handle="_cfa035965a02da81147" change="1426793754" id="E0030">
-      <type>Birth</type>
-      <dateval val="1811-11"/>
-    </event>
-    <event handle="_cfa035ee99b03f59cbc" change="1426793790" id="E0031">
-      <type>Birth</type>
-      <dateval val="1812-12"/>
-    </event>
-    <event handle="_cfa038cce441e73b1c5" change="1426794091" id="E0032">
-      <type>Birth</type>
-      <dateval val="1806-06-13"/>
-    </event>
-    <event handle="_cfa039308b34bf173be" change="1426794132" id="E0033">
-      <type>Birth</type>
-      <dateval val="1807-07-13"/>
-    </event>
-    <event handle="_cfa0399114e40ffcadf" change="1426794172" id="E0034">
-      <type>Birth</type>
-      <dateval val="1808-08-13"/>
-    </event>
-    <event handle="_cfa039f6e510c198300" change="1426794213" id="E0035">
-      <type>Birth</type>
-      <dateval val="1809-09-13"/>
-    </event>
-    <event handle="_cfa03a5c2fe4ce6e75d" change="1426794255" id="E0036">
-      <type>Birth</type>
-      <dateval val="1810-10-13"/>
-    </event>
-    <event handle="_cfa03aabe141219bb22" change="1426794287" id="E0037">
-      <type>Birth</type>
-      <dateval val="1811-11-13"/>
-    </event>
-    <event handle="_cfa03afa2ac4d140d9d" change="1426794319" id="E0038">
-      <type>Birth</type>
-      <dateval val="1812-12-13"/>
-    </event>
-    <event handle="_cfa0424ffcb19aed9f7" change="1426804001" id="E0039">
-      <type>Birth</type>
-      <datespan start="1876" stop="1877"/>
-    </event>
-    <event handle="_cfa042e5a0d52e9c63f" change="1426804044" id="E0040">
-      <type>Birth</type>
-      <datespan start="1876-06" stop="1877-07"/>
-    </event>
-    <event handle="_cfa0436b49b7746d225" change="1426804087" id="E0041">
-      <type>Birth</type>
-      <datespan start="1876-06-13" stop="1877-07-13"/>
-    </event>
-    <event handle="_cfa044b58de7b9a9759" change="1426803857" id="E0042">
-      <type>Birth</type>
-      <daterange start="1864" stop="1865"/>
-    </event>
-    <event handle="_cfa0454785d7f7fe074" change="1426803895" id="E0043">
-      <type>Birth</type>
-      <daterange start="1864-04" stop="1865-05"/>
-    </event>
-    <event handle="_cfa045f559074cd25a6" change="1426803934" id="E0044">
-      <type>Birth</type>
-      <daterange start="1864-04-13" stop="1865-05-13"/>
-    </event>
-    <event handle="_cfa05eab109493097d1" change="1426803468" id="E0045">
-      <type>Birth</type>
-      <dateval val="1849" quality="estimated"/>
-    </event>
-    <event handle="_cfa05fb82182cf228bc" change="1426803506" id="E0046">
-      <type>Birth</type>
-      <dateval val="1849-09" quality="estimated"/>
-    </event>
-    <event handle="_cfa0604633236ff9d43" change="1426803535" id="E0047">
-      <type>Birth</type>
-      <dateval val="1849-09-13" quality="estimated"/>
-    </event>
-    <event handle="_cfa060d09d433ae6313" change="1426803223" id="E0048">
-      <type>Birth</type>
-      <dateval val="1835" quality="calculated"/>
-    </event>
-    <event handle="_cfa062751af6a105a82" change="1426803248" id="E0049">
-      <type>Birth</type>
-      <dateval val="1835-05" quality="calculated"/>
-    </event>
-    <event handle="_cfa062e50d3096da9a5" change="1426803275" id="E0050">
-      <type>Birth</type>
-      <dateval val="1835-05-13" quality="calculated"/>
-    </event>
-    <event handle="_cfa063e88800cb80b33" change="1426803138" id="E0051">
-      <type>Birth</type>
-      <dateval val="1834" type="before" quality="calculated"/>
-    </event>
-    <event handle="_cfa064a6da37f0563f5" change="1426803166" id="E0052">
-      <type>Birth</type>
-      <dateval val="1834-04" type="before" quality="calculated"/>
-    </event>
-    <event handle="_cfa0654060124488afa" change="1426803189" id="E0053">
-      <type>Birth</type>
-      <dateval val="1834-04-13" type="before" quality="calculated"/>
-    </event>
-    <event handle="_cfa0670f11e1049f07b" change="1426803306" id="E0054">
-      <type>Birth</type>
-      <dateval val="1846" type="about" quality="estimated"/>
-    </event>
-    <event handle="_cfa067a8bbe2900a40c" change="1426803330" id="E0055">
-      <type>Birth</type>
-      <dateval val="1846-06" type="about" quality="estimated"/>
-    </event>
-    <event handle="_cfa0681c5085ac5e9e0" change="1426803354" id="E0056">
-      <type>Birth</type>
-      <dateval val="1846-06-13" type="about" quality="estimated"/>
-    </event>
-    <event handle="_cfa069a50b23f6b87fa" change="1426803388" id="E0057">
-      <type>Birth</type>
-      <daterange start="1848" stop="1849" quality="estimated"/>
-    </event>
-    <event handle="_cfa086bc43c31bcd49b" change="1426803415" id="E0058">
-      <type>Birth</type>
-      <daterange start="1848-08" stop="1849-09" quality="estimated"/>
-    </event>
-    <event handle="_cfa0873e5170a315aea" change="1426803439" id="E0059">
-      <type>Birth</type>
-      <daterange start="1848-08-13" stop="1849-09-13" quality="estimated"/>
-    </event>
-    <event handle="_cfa087488800cb80b33" change="1426803138" id="E0060">
-      <type>Birth</type>
-      <dateval val="1847" type="after" quality="estimated"/>
-    </event>
-    <event handle="_cfa08756da37f0563f5" change="1426803166" id="E0061">
-      <type>Birth</type>
-      <dateval val="1847-07" type="after" quality="estimated"/>
-    </event>
-    <event handle="_cfa0876060124488afa" change="1426803189" id="E0062">
-      <type>Birth</type>
-      <dateval val="1847-07-13" type="after" quality="estimated"/>
-    </event>
-    <event handle="_cfa0877ffcb19aed9f7" change="1426804001" id="E0063">
-      <type>Birth</type>
-      <datespan start="1878" stop="1879" quality="estimated"/>
-    </event>
-    <event handle="_cfa08785a0d52e9c63f" change="1426804044" id="E0064">
-      <type>Birth</type>
-      <datespan start="1878-08" stop="1879-09" quality="estimated"/>
-    </event>
-    <event handle="_cfa0879b49b7746d225" change="1426804087" id="E0065">
-      <type>Birth</type>
-      <datespan start="1878-08-13" stop="1879-09-13" quality="estimated"/>
-    </event>
-    <event handle="_d0545e83fa37336070a" change="1431629910" id="E0066">
-      <type>Birth</type>
-      <dateval val="1800-00-13"/>
-    </event>
-  </events>
-  <people home="_ce00f22fdb926a87cdd">
-    <person handle="_cde77b359d42a7abeb8" change="1426803052" id="I0000">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Before-Person</surname>
-      </name>
-      <eventref hlink="_cde77b2c30c13ea85db" role="Primary"/>
-    </person>
-    <person handle="_cde77b89083519bcf0b" change="1426803077" id="I0001">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Before-Person</surname>
-      </name>
-      <eventref hlink="_cde77b7eff96ae8455f" role="Primary"/>
-    </person>
-    <person handle="_cde77be591457afcffb" change="1426803099" id="I0002">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Before-Person</surname>
-      </name>
-      <eventref hlink="_cde77be2a67401f7b16" role="Primary"/>
-    </person>
-    <person handle="_cde7b70f31a17456a2e" change="1426802978" id="I0003">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>After-Person</surname>
-      </name>
-      <eventref hlink="_cde7b70d22b30f00b14" role="Primary"/>
-    </person>
-    <person handle="_cde7b8ed6cd11b5562e" change="1426803002" id="I0004">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>After-Person</surname>
-      </name>
-      <eventref hlink="_cde7b8eb90e0a8792a9" role="Primary"/>
-    </person>
-    <person handle="_cde7b95ec952bc2b12d" change="1426803025" id="I0005">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>After-Person</surname>
-      </name>
-      <eventref hlink="_cde7b95cb7e40432538" role="Primary"/>
-    </person>
-    <person handle="_cde7b9b4e9e5e81800d" change="1426802890" id="I0006">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>About-Person</surname>
-      </name>
-      <eventref hlink="_cde7b9b2b00713c42af" role="Primary"/>
-    </person>
-    <person handle="_cde7b9f2d2e633055b9" change="1426802928" id="I0007">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>About-Person</surname>
-      </name>
-      <eventref hlink="_cde7b9f0da51d2ff10a" role="Primary"/>
-    </person>
-    <person handle="_cde7ba324d85d019053" change="1426802954" id="I0008">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>About-Person</surname>
-      </name>
-      <eventref hlink="_cde7ba310240e18a0ea" role="Primary"/>
-    </person>
-    <person handle="_ce00f22fdb926a87cdd" change="1426803678" id="I0009">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Normal-Person</surname>
-      </name>
-      <eventref hlink="_ce00f22be3443f0c30b" role="Primary"/>
-    </person>
-    <person handle="_ce00f2aeb776bb53be5" change="1426803705" id="I0010">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Normal-Person</surname>
-      </name>
-      <eventref hlink="_ce00f2ab83911df5354" role="Primary"/>
-    </person>
-    <person handle="_ce00f2eda384642791d" change="1426803733" id="I0011">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Normal-Person</surname>
-      </name>
-      <eventref hlink="_ce00f2eb2f86d94ece0" role="Primary"/>
-    </person>
-    <person handle="_cfa02ea21cf2c08d6e2" change="1426793828" id="I0014">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B01</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa02e904f161e652da" role="Primary"/>
-    </person>
-    <person handle="_cfa02f060870eef1f71" change="1426793996" id="I0015">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C01</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa02efc75b0eb05cfa" role="Primary"/>
-    </person>
-    <person handle="_cfa02f6db513f4e1c14" change="1426793845" id="I0016">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B02</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa02f60fbe55ad36f7" role="Primary"/>
-    </person>
-    <person handle="_cfa02fe4e8d3cad65e6" change="1426794012" id="I0017">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C02</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa02fd93615614dc94" role="Primary"/>
-    </person>
-    <person handle="_cfa03042b93635f71a0" change="1426793861" id="I0018">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B03</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa030376d1228fb29b" role="Primary"/>
-    </person>
-    <person handle="_cfa03092fb610f772ba" change="1426794027" id="I0019">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C03</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa0308a9e766a18a5a" role="Primary"/>
-    </person>
-    <person handle="_cfa0314a7de1852f830" change="1426794043" id="I0021">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C04</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa0314208a175c695f" role="Primary"/>
-    </person>
-    <person handle="_cfa031e7f6333a37f87" change="1426793893" id="I0022">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B05</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa031df6bb2f50f9c5" role="Primary"/>
-    </person>
-    <person handle="_cfa03248bae711cb306" change="1426793877" id="I0023">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B04</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa0311ff9474a33dad" role="Primary"/>
-    </person>
-    <person handle="_cfa033674d813cb83fb" change="1426794060" id="I0024">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C05</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa0335efcf6eeb6bf6" role="Primary"/>
-    </person>
-    <person handle="_cfa03429a3506b90a17" change="1426793911" id="I0025">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B06</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa0342171e10e9a0c8" role="Primary"/>
-    </person>
-    <person handle="_cfa03471249305e11a3" change="1426793926" id="I0026">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B07</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa03468bc76cf7a295" role="Primary"/>
-    </person>
-    <person handle="_cfa034ba95d55bbb30d" change="1426793947" id="I0027">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B08</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa034b07c9408b12cc" role="Primary"/>
-    </person>
-    <person handle="_cfa035043d730daedcc" change="1426793965" id="I0028">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B09</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa034f8da44738c323" role="Primary"/>
-    </person>
-    <person handle="_cfa03553f6327fb3aa3" change="1426793727" id="I0029">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B10</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa03547c3765017895" role="Primary"/>
-    </person>
-    <person handle="_cfa035a31fd38ced89e" change="1426793759" id="I0030">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B11</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa035965a02da81147" role="Primary"/>
-    </person>
-    <person handle="_cfa035f87450688702b" change="1426793794" id="I0031">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B12</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa035ee99b03f59cbc" role="Primary"/>
-    </person>
-    <person handle="_cfa038d6790220eb6a0" change="1426794095" id="I0032">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C06</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa038cce441e73b1c5" role="Primary"/>
-    </person>
-    <person handle="_cfa039412cf2c81aaa6" change="1426794139" id="I0033">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C07</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa039308b34bf173be" role="Primary"/>
-    </person>
-    <person handle="_cfa0399d5b4296c09ed" change="1426794177" id="I0034">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C08</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa0399114e40ffcadf" role="Primary"/>
-    </person>
-    <person handle="_cfa03a00ae7431e3c10" change="1426794217" id="I0035">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C09</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa039f6e510c198300" role="Primary"/>
-    </person>
-    <person handle="_cfa03a68a5e1f70d524" change="1426794260" id="I0036">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C10</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa03a5c2fe4ce6e75d" role="Primary"/>
-    </person>
-    <person handle="_cfa03ab437d05844dc3" change="1426794291" id="I0037">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C11</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa03aabe141219bb22" role="Primary"/>
-    </person>
-    <person handle="_cfa03b0c1635ed179a5" change="1426794327" id="I0038">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C12</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_cfa03afa2ac4d140d9d" role="Primary"/>
-    </person>
-    <person handle="_cfa0425f40e5bd7f546" change="1426804005" id="I0039">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>SpanFrom-Person</surname>
-      </name>
-      <eventref hlink="_cfa0424ffcb19aed9f7" role="Primary"/>
-    </person>
-    <person handle="_cfa0431254247adca83" change="1426804048" id="I0040">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>SpanFrom-Person</surname>
-      </name>
-      <eventref hlink="_cfa042e5a0d52e9c63f" role="Primary"/>
-    </person>
-    <person handle="_cfa0439de437d741e80" change="1426804091" id="I0041">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>SpanFrom-Person</surname>
-      </name>
-      <eventref hlink="_cfa0436b49b7746d225" role="Primary"/>
-    </person>
-    <person handle="_cfa044c262e1e5c8503" change="1426803860" id="I0042">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>RangeBetween-Person</surname>
-      </name>
-      <eventref hlink="_cfa044b58de7b9a9759" role="Primary"/>
-    </person>
-    <person handle="_cfa04565ce470dcd2f8" change="1426803898" id="I0043">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>RangeBetween-Person</surname>
-      </name>
-      <eventref hlink="_cfa0454785d7f7fe074" role="Primary"/>
-    </person>
-    <person handle="_cfa0460050935c9a427" change="1426803937" id="I0044">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>RangeBetween-Person</surname>
-      </name>
-      <eventref hlink="_cfa045f559074cd25a6" role="Primary"/>
-    </person>
-    <person handle="_cfa05ec0033766aaf99" change="1426803473" id="I0045">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Estimated-Person</surname>
-      </name>
-      <eventref hlink="_cfa05eab109493097d1" role="Primary"/>
-    </person>
-    <person handle="_cfa05fccf2c4051824b" change="1426803510" id="I0046">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Estimated-Person</surname>
-      </name>
-      <eventref hlink="_cfa05fb82182cf228bc" role="Primary"/>
-    </person>
-    <person handle="_cfa060511337394614d" change="1426803539" id="I0047">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Estimated-Person</surname>
-      </name>
-      <eventref hlink="_cfa0604633236ff9d43" role="Primary"/>
-    </person>
-    <person handle="_cfa060e177361c262d1" change="1426803227" id="I0048">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Calculated-Person</surname>
-      </name>
-      <eventref hlink="_cfa060d09d433ae6313" role="Primary"/>
-    </person>
-    <person handle="_cfa0627d4346f5a6156" change="1426803252" id="I0049">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Calculated-Person</surname>
-      </name>
-      <eventref hlink="_cfa062751af6a105a82" role="Primary"/>
-    </person>
-    <person handle="_cfa062f0f6d6be03ddb" change="1426803278" id="I0050">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Calculated-Person</surname>
-      </name>
-      <eventref hlink="_cfa062e50d3096da9a5" role="Primary"/>
-    </person>
-    <person handle="_cfa063f5677702eaa46" change="1426803142" id="I0051">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Calculated-Before-Person</surname>
-      </name>
-      <eventref hlink="_cfa063e88800cb80b33" role="Primary"/>
-    </person>
-    <person handle="_cfa064bb7630e608798" change="1426803169" id="I0052">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Calculated-Before-Person</surname>
-      </name>
-      <eventref hlink="_cfa064a6da37f0563f5" role="Primary"/>
-    </person>
-    <person handle="_cfa0654ca9f46930cc4" change="1426803193" id="I0053">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Calculated-Before-Person</surname>
-      </name>
-      <eventref hlink="_cfa0654060124488afa" role="Primary"/>
-    </person>
-    <person handle="_cfa06717fb57c27f756" change="1426803310" id="I0054">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Estimated-About-Person</surname>
-      </name>
-      <eventref hlink="_cfa0670f11e1049f07b" role="Primary"/>
-    </person>
-    <person handle="_cfa067b2e020880caf3" change="1426803333" id="I0055">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Estimated-About-Person</surname>
-      </name>
-      <eventref hlink="_cfa067a8bbe2900a40c" role="Primary"/>
-    </person>
-    <person handle="_cfa068250bc3c821f3c" change="1426803357" id="I0056">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Estimated-About-Person</surname>
-      </name>
-      <eventref hlink="_cfa0681c5085ac5e9e0" role="Primary"/>
-    </person>
-    <person handle="_cfa069b80556bceaf0b" change="1426803392" id="I0057">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Estimated-RangeBetween-Person</surname>
-      </name>
-      <eventref hlink="_cfa069a50b23f6b87fa" role="Primary"/>
-    </person>
-    <person handle="_cfa086c6e4e248b4ac6" change="1426803418" id="I0058">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Estimated-RangeBetween-Person</surname>
-      </name>
-      <eventref hlink="_cfa086bc43c31bcd49b" role="Primary"/>
-    </person>
-    <person handle="_cfa0874684b42b63ab7" change="1426803443" id="I0059">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Estimated-RangeBetween-Person</surname>
-      </name>
-      <eventref hlink="_cfa0873e5170a315aea" role="Primary"/>
-    </person>
-    <person handle="_cfa087580556bceaf0b" change="1426803392" id="I0060">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Estimated-After-Person</surname>
-      </name>
-      <eventref hlink="_cfa087488800cb80b33" role="Primary"/>
-    </person>
-    <person handle="_cfa08766e4e248b4ac6" change="1426803418" id="I0061">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Estimated-After-Person</surname>
-      </name>
-      <eventref hlink="_cfa08756da37f0563f5" role="Primary"/>
-    </person>
-    <person handle="_cfa0877684b42b63ab7" change="1426803443" id="I0062">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Estimated-After-Person</surname>
-      </name>
-      <eventref hlink="_cfa0876060124488afa" role="Primary"/>
-    </person>
-    <person handle="_cfa087780556bceaf0b" change="1426803392" id="I0063">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>A</first>
-        <surname>Estimated-SpanFrom-Person</surname>
-      </name>
-      <eventref hlink="_cfa0877ffcb19aed9f7" role="Primary"/>
-    </person>
-    <person handle="_cfa08786e4e248b4ac6" change="1426803418" id="I0064">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>B</first>
-        <surname>Estimated-SpanFrom-Person</surname>
-      </name>
-      <eventref hlink="_cfa08785a0d52e9c63f" role="Primary"/>
-    </person>
-    <person handle="_cfa0879684b42b63ab7" change="1426803443" id="I0065">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>C</first>
-        <surname>Estimated-SpanFrom-Person</surname>
-      </name>
-      <eventref hlink="_cfa0879b49b7746d225" role="Primary"/>
-    </person>
-    <person handle="_d0545e25fed7da2d864" change="1431629912" id="I0066">
-      <gender>M</gender>
-      <name type="Birth Name">
-        <first>Zero-Month</first>
-        <surname>Month-Person</surname>
-      </name>
-      <eventref hlink="_d0545e83fa37336070a" role="Primary"/>
-    </person>
-  </people>
-</database>
@@ -15,14 +15,16 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # gen/__init__.py
+# $Id$
+#

 """
-The core gramps modules that provide the different packages
+The core gramps module provides the different packages

-Plugins are loaded dynamically, so that plugin directory is not included
+Plugins are loaded dynamically, so they the plugin directory is not included
 """

 __all__ = ["gen", "cli", "gui"]
@@ -14,9 +14,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #

+# $Id$
+
 """
 Package init for the cli package.
 """
@@ -22,11 +22,13 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #

+# $Id$
+
 """
-Module responsible for handling the command line arguments for Gramps.
+Module responsible for handling the command line arguments for GRAMPS.
 """

 #-------------------------------------------------------------------------
@@ -34,6 +36,7 @@ Module responsible for handling the command line arguments for Gramps.
 # Standard python modules
 #
 #-------------------------------------------------------------------------
+from __future__ import print_function
 import os
 import sys

@@ -43,7 +46,8 @@ import sys
 #
 #-------------------------------------------------------------------------
 from gramps.gen.recentfiles import recent_files
-from gramps.gen.utils.file import rm_tempdir, get_empty_tempdir
+from gramps.gen.utils.file import (rm_tempdir, get_empty_tempdir, 
+                                   get_unicode_path_from_env_var)
 from gramps.gen.db import DbBsddb
 from .clidbman import CLIDbManager, NAME_FILE, find_locker_name

@@ -52,7 +56,6 @@ from gramps.gen.plug.report import CATEGORY_BOOK, CATEGORY_CODE, BookList
 from .plug import cl_report, cl_book
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.gettext
-from gramps.gen.constfunc import conv_to_unicode

 #-------------------------------------------------------------------------
 #
@@ -64,31 +67,24 @@ def _split_options(options_str):
    Split the options for the action.
    
    Rules:
-
-    * Entries in the list of options are separated by commas without
-      spaces between entries
-    * List values must be inclosed in brackets ("[" and "]")
-    * Entries within a list value are separated by commas
-    * Text values (as a value or as entries in a list) do not have to be
-      enclosed in quotes unless they include commas or quotation marks.
-    * Text containing double quotes must be contained in single quotes
-    * Text containing single quotes must be contained in double quotes
-    * Text cannot include both single and double quotes
+        * Entries in the list of options are separated by commas without
+          spaces between entries
+        * List values must be inclosed in brackets ("[" and "]")
+        * Entries within a list value are separated by commas
+        * Text values (as a value or as entries in a list) do not have to be
+          enclosed in quotes unless they include commas or quotation marks.
+        * Text containing double quotes must be contained in single quotes
+        * Text containing single quotes must be contained in double quotes
+        * Text cannot include both single and double quotes
    
    Examples:
-
-    Multiple options specified::
-
-        report -p 'name=ancestor_chart,father_disp=["$n born $b"]'
-
-    Using text with commas and quotes::
-
-        title="This is some text with ,s and 's"
-        title='This is some text with ,s and "s'
-
-    Using a list of text::
-
-        textlist=[row1,row2,"row3 with ' and ,"]
+        * Multiple options specified:
+            report -p 'name=ancestor_chart,father_disp=["$n born $b"]'
+        * Using text with commas and quotes:
+            title="This is some text with ,s and 's"
+            title='This is some text with ,s and "s'
+        * Using a list of text
+            textlist=[row1,row2,"row3 with ' and ,"]
    """
    name = ""
    value = ""
@@ -151,16 +147,20 @@ class ArgHandler(object):
    """
    This class is responsible for the non GUI handling of commands.
    The handler is passed a parser object, sanitizes it, and can execute the 
-    actions requested working on a :class:`.DbState`.
+    actions requested working on a DbState.
    """

    def __init__(self, dbstate, parser, sessionmanager, 
                        errorfunc=None, gui=False):
+        from .user import User
+
        self.dbstate = dbstate
        self.sm = sessionmanager
        self.errorfunc = errorfunc
        self.gui = gui
-        self.user = sessionmanager.user
+        self.user = User(error=self.__error, 
+                auto_accept=parser.auto_accept,
+                quiet=parser.quiet)
        if self.gui:
            self.actions = []
            self.list = False
@@ -213,7 +213,7 @@ class ArgHandler(object):
        """
        if value is None:
            return None
-        value = conv_to_unicode(value, sys.stdin.encoding)
+        value = get_unicode_path_from_env_var(value)
        db_path = self.__deduce_db_path(value)

        if db_path:
@@ -233,7 +233,7 @@ class ArgHandler(object):
        else:
            self.__error( _('Error: Input Family Tree "%s" does not exist.\n'
                            "If GEDCOM, Gramps-xml or grdb, use the -i option "
-                            "to import into a Family Tree instead.") % value)
+                            "to import into a family tree instead.") % value)
            sys.exit(0)

    def __handle_import_option(self, value, family_tree_format):
@@ -243,7 +243,8 @@ class ArgHandler(object):
        """
        # Need to convert path/filename to unicode before opening
        # For non latin characters in Windows path/file/user names
-        fname = conv_to_unicode(value, sys.stdin.encoding)
+        value = get_unicode_path_from_env_var(value)
+        fname = value
        fullpath = os.path.abspath(os.path.expanduser(fname))
        if fname != '-' and not os.path.exists(fullpath):
            self.__error(_('Error: Import file %s not found.') % fname)
@@ -272,15 +273,15 @@ class ArgHandler(object):
            
    def __handle_export_option(self, value, family_tree_format):
        """
-        Handle the "-e" or "--export" option.
-
-        .. note:: this can only happen in the CLI version.
+        Handle the "-e" or "--export" option.  
+        Note: this can only happen in the CLI version.                    
        """
        if self.gui:
            return
        # Need to convert path/filename to unicode before opening
        # For non latin characters in Windows path/file/user names
-        fname = conv_to_unicode(value, sys.stdin.encoding)
+        value = get_unicode_path_from_env_var(value)
+        fname = value
        if fname == '-':
            fullpath = '-'
        else:
@@ -320,8 +321,8 @@ class ArgHandler(object):
        """
        Attempt to find a database path for the given parameter.
        
-        :returns: The path to a Gramps DB or None if a database can not be
-                  deduced.
+        @return: The path to a Gramps DB
+                 or None if a database can not be deduced.
        """
        # First, check if this is the name of a family tree
        db_path = self.dbman.get_family_tree_path(db_name_or_path)
@@ -344,16 +345,15 @@ class ArgHandler(object):
    #-------------------------------------------------------------------------
    def handle_args_gui(self):
        """
-        Method to handle the arguments that can be given for a GUI session.
-
-        :returns: the filename of the family tree that should be opened if 
-                  user just passed a famtree or a filename.
-                  
-        1. no options: a family tree can be given, if so, this name is tested
-           and returned. If a filename, it is imported in a new db and name of
-           new db returned
-        2. an open and/or import option can have been given, if so, this is
-           handled, and None is returned
+        method to handle the arguments that can be given for a GUI session.
+        Returns the filename of the family tree that should be opened if 
+        user just passed a famtree or a filename
+            1/no options: a family tree can be given, if so, this name is
+                        tested and returned. If a filename, it is imported
+                        in a new db and name of new db returned
+            2/an open and/or import option can have been given, if so, this 
+                is handled, and None is returned
+            
        """
        if self.open_gui:
            # First check if a Gramps database was provided
@@ -391,10 +391,10 @@ class ArgHandler(object):
        Depending on the given arguments, import or open data, launch
        session, write files, and/or perform actions.
        
-        :param: climan: the manager of a CLI session
-        :type: :class:`.CLIManager` object
+        @param: climan: the manager of a CLI session
+        @type: CLIManager object
        """
-        # Handle the "-l" List Family Trees option.  
+
        if self.list:
            print(_('List of known Family Trees in your database path\n'))

@@ -405,7 +405,6 @@ class ArgHandler(object):
                              % {'full_DB_path' : dirname, 'f_t_name' : name})
            sys.exit(0)

-        # Handle the "-L" List Family Trees in detail option.  
        if self.list_more:
            print(_('Gramps Family Trees:'))
            summary_list = self.dbman.family_tree_summary()
@@ -414,33 +413,26 @@ class ArgHandler(object):
                print(_("Family Tree \"%s\":") % summary[_("Family Tree")])
                for item in sorted(summary):
                    if item != "Family Tree":
-                        # translators: needed for French, ignore otherwise
-                        print(_("   %(item)s: %(summary)s") % {
-                                        'item' : item,
-                                        'summary' : summary[item] } )
+                        print("   %s: %s" % (item, summary[item]))
            sys.exit(0)
           
-        # Handle the "-t" List Family Trees, tab delimited option.  
        if self.list_table:
            print(_('Gramps Family Trees:'))
            summary_list = self.dbman.family_tree_summary()
-            if not summary_list:
-                sys.exit(0)
-            # We have to construct the line elements together, to avoid
-            # insertion of blank spaces when print on the same line is used
-            line_list = [_("Family Tree")]
+            print(_("Family Tree"), end="")
            for key in sorted(summary_list[0]):
-                if key !=  _("Family Tree"):
-                    line_list += [key]
-            print("\t".join(line_list))
+                if key !=  "Family Tree":
+                    print("\t ", end="")
+                    print(key, end="")
+            print()
            for summary in sorted(summary_list,
                                  key=lambda sum: sum[_("Family Tree")].lower()):
-                line_list = [(_('"%s"') % summary[_("Family Tree")])]
+                print('"%s"' % summary[_("Family Tree")], end="")
                for item in sorted(summary):
                    if item != _("Family Tree"):
-                        # translators: ignore unless your quotation marks differ
-                        line_list += [(_('"%s"') % summary[item])]
-                print("\t".join(line_list))
+                        print("\t ", end="")
+                        print('"%s"' % summary[item], end="")
+                print()
            sys.exit(0)

        self.__open_action()
@@ -473,10 +465,8 @@ class ArgHandler(object):

    def __import_action(self):
        """
-        Take action for all given import files.
-        
-        .. note:: Family trees are not supported.
-
+        Take action for all given import files. Note: Family trees are
+            not supported.
        If a family tree is open, the import happens on top of it. If not
        open, a new family tree is created, and the import done. If this
        is CLI, the created tree is deleted at the end (as some action will
@@ -559,6 +549,12 @@ class ArgHandler(object):
            if family_tree_format == plugin.get_extension():
                import_function = plugin.get_import_function()
                import_function(self.dbstate.db, filename, self.user)
+        
+        if not self.cl:
+            if self.imp_db_path:
+                return self.sm.open_activate(self.imp_db_path)
+            else:
+                return self.sm.open_activate(self.open)

    #-------------------------------------------------------------------------
    #
@@ -654,14 +650,8 @@ class ArgHandler(object):
                        category = pdata.category
                        tool_class = eval('mod.' + pdata.toolclass)
                        options_class = eval('mod.' + pdata.optionclass)
-                        tool.cli_tool(
-                                dbstate=self.dbstate, 
-                                name=name, 
-                                category=category, 
-                                tool_class=tool_class,
-                                options_class=options_class, 
-                                options_str_dict=options_str_dict,
-                                user=self.user)
+                        tool.cli_tool(self.dbstate, name, category, tool_class,
+                                      options_class, options_str_dict)
                        return
                msg = _("Unknown tool name.")
            else:
@@ -22,11 +22,13 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #

+# $Id$
+
 """
-Module responsible for handling the command line arguments for Gramps.
+Module responsible for handling the command line arguments for GRAMPS.
 """

 #-------------------------------------------------------------------------
@@ -34,6 +36,7 @@ Module responsible for handling the command line arguments for Gramps.
 # Standard python modules
 #
 #-------------------------------------------------------------------------
+from __future__ import print_function
 import sys
 import getopt
 import logging
@@ -46,9 +49,9 @@ import logging
 from gramps.gen.const import LONGOPTS, SHORTOPTS
 from gramps.gen.config import config
 from gramps.gen.utils.cast import get_type_converter
+from gramps.gen.utils.file import get_unicode_path_from_env_var
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.gettext
-from gramps.gen.constfunc import conv_to_unicode

 _HELP = _("""
 Usage: gramps.py [OPTION...]
@@ -130,58 +133,35 @@ class ArgParser(object):
    """
    This class is responsible for parsing the command line arguments (if any)
    given to gramps, and determining if a GUI or a CLI session must be started.
-    A filename and/or options may be specified as arguments.
+    The valid arguments are:

-    The valid options are:
-
-    -O, --open=FAMILY_TREE          Open Family Tree
-    -C, --create=FAMILY_TREE        Create on open if new Family Tree
-    -i, --import=FILENAME           Import file
-    -e, --export=FILENAME           Export file
-    -f, --format=FORMAT             Specify Family Tree format
-    -a, --action=ACTION             Specify action
-    -p, --options=OPTIONS_STRING    Specify options
-    -d, --debug=LOGGER_NAME         Enable debug logs
-    -l                              List Family Trees
-    -L                              List Family Trees in Detail
-    -t                              List Family Trees, tab delimited
-    -u, --force-unlock              Force unlock of Family Tree
-    -s, --show                      Show config settings
-    -c, --config=SETTINGS           Set config setting(s) and start Gramps
-    -y, --yes                       Don't ask to confirm dangerous actions
-    -q, --quiet                     Suppress progress indication output
-    -v, --version                   Show versions
-    -h, --help                      Display the help
-    --usage                         Display usage information
-
-    If the filename (no options) is specified, the interactive session is 
-    launched using data from filename.  In this mode (filename, no options), the 
-    rest of the arguments are ignored.  This is a mode suitable by default for
-    GUI launchers, mime type handlers, and the like.
+    Possible: 
+        1/ FAMTREE : Just the family tree (name or database dir)
+        2/ -O, --open=FAMTREE, Open of a family tree
+        3/ -i, --import=FILE, Import a family tree of any format understood 
+                 by an importer, optionally provide -f to indicate format
+        4/ -e, --export=FILE, export a family tree in required format,
+                 optionally provide -f to indicate format
+        5/ -f, --format=FORMAT : format after a -i or -e option
+        6/ -a, --action: An action (possible: 'report', 'tool')
+        7/ -p, --options=OPTIONS_STRING : specify options
+        8/ -u, --force-unlock: A locked database can be unlocked by giving
+                 this argument when opening it
+    
+    If the filename (no flags) is specified, the interactive session is 
+    launched using data from filename. 
+    In this mode (filename, no flags), the rest of the arguments is ignored.
+    This is a mode suitable by default for GUI launchers, mime type handlers,
+    and the like
    
    If no filename or -i option is given, a new interactive session (empty
    database) is launched, since no data is given anyway.
    
    If -O or -i option is given, but no -e or -a options are given, an
-    interactive session is launched with the ``FILENAME`` (specified with -i). 
+    interactive session is launched with the FILE (specified with -i). 
    
    If both input (-O or -i) and processing (-e or -a) options are given,
-    interactive session will not be launched.
-    
-    When using import ot export options (-i or -e), the -f option may be
-    specified to indicate the family tree format.
-    
-    Possible values for ``ACTION`` are:  'report', 'book' and 'tool'.
-    
-    Configuration ``SETTINGS`` may be specified using the -c option.  The
-    settings are of the form config.setting[:value].  If used without a value,
-    the setting is shown. 
-    
-    If the -y option is given, the user's acceptance of any CLI prompt is 
-    assumed. (see :meth:`.cli.user.User.prompt`)
-    
-    If the -q option is given, extra noise on sys.stderr, such as progress
-    indicators, is suppressed.
+    interactive session will not be launched. 
    """

    def __init__(self, args):
@@ -218,6 +198,25 @@ class ArgParser(object):
        Fill in lists with open, exports, imports, and actions options.

        Any errors are added to self.errors
+        
+        Possible: 
+        1/ Just the family tree (name or database dir)
+        2/ -O --open:   Open of a family tree
+        3/ -i --import: Import a family tree of any format understood by
+                 an importer, optionally provide -f to indicate format
+        4/ -e --export: export a family tree in required format, optionally
+                 provide -f to indicate format
+        5/ -f --format=FORMAT : format after a -i or -e option
+        6/ -a --action: An action (possible: 'report', 'tool')
+        7/ -p --options=OPTIONS_STRING : specify options
+        8/ -u --force-unlock: A locked database can be unlocked by giving
+                 this argument when opening it
+        9/ -s  --show : Show config settings
+        10/ -c --config=config.setting:value : Set config.setting and start
+                 Gramps without :value, the actual config.setting is shown
+        11/ -y --yes: assume user's acceptance of any CLI prompt (see cli.user.User.prompt)
+        12/ -q --quiet: suppress extra noise on sys.stderr, such as progress indicators
+                            
        """
        try:
            # Convert arguments to unicode, otherwise getopt will not work
@@ -226,8 +225,7 @@ class ArgParser(object):
            # -Ärik is '-\xc3\x84rik' and getopt will respond :
            # option -\xc3 not recognized
            for arg in range(len(self.args) - 1):
-                self.args[arg+1] = conv_to_unicode(self.args[arg + 1],
-                                                   sys.stdin.encoding)
+                self.args[arg+1] = get_unicode_path_from_env_var(self.args[arg + 1])
            options, leftargs = getopt.getopt(self.args[1:],
                                             SHORTOPTS, LONGOPTS)
        except getopt.GetoptError as msg:
@@ -323,11 +321,9 @@ class ArgParser(object):
                        set_value = True
                    if config.has_default(setting_name):
                        setting_value = config.get(setting_name)
-                        print(_("Current Gramps config setting: "
-                                "%(name)s:%(value)s")
-                                    % {'name' : setting_name,
-                                       'value' : repr(setting_value)},
-                              file=sys.stderr)
+                        print(_("Current Gramps config setting: %s:%s")
+                                      % (setting_name, repr(setting_value)),
+                                      file=sys.stderr)
                        if set_value:
                            # does a user want the default config value?
                            if new_value in ("DEFAULT", _("DEFAULT")):
@@ -337,12 +333,10 @@ class ArgParser(object):
                                new_value = converter(new_value)
                            config.set(setting_name, new_value)
                            # translators: indent "New" to match "Current"
-                            print(_("    New Gramps config setting: "
-                                    "%(name)s:%(value)s") %
-                                        {'name' : setting_name,
-                                         'value' : repr(
-                                                 config.get(setting_name))},
-                                  file=sys.stderr)
+                            print(_("    New Gramps config setting: %s:%s")
+                                          % (setting_name,
+                                             repr(config.get(setting_name))),
+                                          file=sys.stderr)
                        else:
                            need_to_quit = True
                    else:
@@ -377,8 +371,7 @@ class ArgParser(object):
            # but not for non-latin characters in list elements
            cliargs = "[ "
            for arg in range(len(self.args) - 1):
-                cliargs += conv_to_unicode(self.args[arg + 1],
-                                           sys.stdin.encoding) + ' '
+                cliargs += get_unicode_path_from_env_var(self.args[arg + 1]) + " "
            cliargs += "]"
            self.errors += [(_('Error parsing the arguments'),
                             _("Error parsing the arguments: %s \n"
@@ -17,9 +17,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #

+# $Id$
+
 """
 Provide the management of databases from CLI. This includes opening, renaming,
 creating, and deleting of databases.
@@ -30,12 +32,17 @@ creating, and deleting of databases.
 # Standard python modules
 #
 #-------------------------------------------------------------------------
+from __future__ import print_function
+
 import os
 import sys
 import time
-import io
-from urllib.parse import urlparse
-from urllib.request import urlopen, url2pathname
+if sys.version_info[0] < 3:
+    from urlparse import urlparse
+    from urllib2 import urlopen, url2pathname
+else:
+    from urllib.parse import urlparse
+    from urllib.request import urlopen, url2pathname
 import tempfile
 #-------------------------------------------------------------------------
 #
@@ -127,8 +134,7 @@ class CLIDbManager(object):
            self._populate_cli()

    def empty(self, val):
-        """
-        Callback that does nothing
+        """Callback that does nothing
        """
        pass

@@ -138,7 +144,10 @@ class CLIDbManager(object):
        current DB.
        Returns ("Unknown", "Unknown", "Unknown") if invalid DB or other error.
        """
-        from bsddb3 import dbshelve, db
+        if config.get('preferences.use-bsddb3') or sys.version_info[0] >= 3:
+            from bsddb3 import dbshelve, db
+        else:
+            from bsddb import dbshelve, db

        from gramps.gen.db import META, PERSON_TBL
        from  gramps.gen.db.dbconst import BDBVERSFN
@@ -208,7 +217,10 @@ class CLIDbManager(object):
                retval[_("Locked?")] = _("no")
            retval[_("Bsddb version")] = bsddb_version
            retval[_("Schema version")] = schema_version
-            retval[_("Family Tree")] = name
+            if sys.version_info[0] < 3:
+                retval[_("Family Tree")] = name.encode(glocale.getfilesystemencoding())
+            else:
+                retval[_("Family Tree")] = name
            retval[_("Path")] = dirpath
            retval[_("Last accessed")] = time.strftime('%x %X', 
                                                    time.localtime(tval))
@@ -216,11 +228,12 @@ class CLIDbManager(object):
        return summary_list

    def _populate_cli(self):
-        """
-        Get the list of current names in the database dir
+        """ Get the list of current names in the database dir
        """
        # make the default directory if it does not exist
        dbdir = os.path.expanduser(config.get('behavior.database-path'))
+        if sys.version_info[0] < 3:
+            dbdir = dbdir.encode(glocale.getfilesystemencoding())
        db_ok = make_dbdir(dbdir)

        self.current_names = []
@@ -229,7 +242,7 @@ class CLIDbManager(object):
                dirpath = os.path.join(dbdir, dpath)
                path_name = os.path.join(dirpath, NAME_FILE)
                if os.path.isfile(path_name):
-                    file = io.open(path_name, 'r', encoding='utf8')
+                    file = open(path_name)
                    name = file.readline().strip()
                    file.close()

@@ -257,8 +270,7 @@ class CLIDbManager(object):
        return None

    def family_tree_list(self):
-        """
-        Return a list of name, dirname of the known family trees
+        """Return a list of name, dirname of the known family trees
        """
        lst = [(x[0], x[1]) for x in self.current_names]
        return lst
@@ -275,7 +287,7 @@ class CLIDbManager(object):
        """
        print(_('Import finished...'))

-    def create_new_db_cli(self, title=None, create_db=True):
+    def create_new_db_cli(self, title=None):
        """
        Create a new database.
        """
@@ -287,15 +299,14 @@ class CLIDbManager(object):
        if title is None:
            name_list = [ name[0] for name in self.current_names ]
            title = find_next_db_name(name_list)
-
-        name_file = io.open(path_name, "w", encoding='utf8')
+        
+        name_file = open(path_name, "w")
        name_file.write(title)
        name_file.close()

-        if create_db:
-            # write the version number into metadata
-            newdb = DbBsddb()
-            newdb.write_version(new_path)
+        # write the version number into metadata
+        newdb = DbBsddb()
+        newdb.write_version(new_path)

        (tval, last) = time_val(new_path)
        
@@ -315,14 +326,14 @@ class CLIDbManager(object):
        A new database will only be created if an appropriate importer was 
        found.

-        :param filename: a fully-qualified path, filename, and
-                         extension to open.
+        @param filename: a fully-qualified path, filename, and
+        extension to open.

-        :param user: a :class:`.cli.user.User` or :class:`.gui.user.User`
-                     instance for managing user interaction.
+        @param user: a cli.User or gui.User instance for managing user
+        interaction.
        
-        :returns: A tuple of (new_path, name) for the new database
-                  or (None, None) if no import was performed.
+        @return: A tuple of (new_path, name) for the new database
+                 or (None, None) if no import was performed.
        """
        pmgr = BasePluginManager.get_instance()
        # check to see if it isn't a filename directly:
@@ -376,7 +387,7 @@ class CLIDbManager(object):

    def is_locked(self, dbpath):
        """
-        Returns True if there is a lock file in the dirpath
+        returns True if there is a lock file in the dirpath
        """
        if os.path.isfile(os.path.join(dbpath,"lock")):
            return True
@@ -384,7 +395,7 @@ class CLIDbManager(object):

    def needs_recovery(self, dbpath):
        """
-        Returns True if the database in dirpath needs recovery
+        returns True if the database in dirpath needs recovery
        """
        if os.path.isfile(os.path.join(dbpath,"need_recover")):
            return True
@@ -396,12 +407,10 @@ class CLIDbManager(object):
        Returns old_name, new_name if success, None, None if no success
        """
        try:
-            filepath = conv_to_unicode(filepath, 'utf8')
-            new_text = conv_to_unicode(new_text, 'utf8')
-            name_file = io.open(filepath, "r", encoding='utf8')
+            name_file = open(filepath, "r")
            old_text=name_file.read()
            name_file.close()
-            name_file = io.open(filepath, "w", encoding='utf8')
+            name_file = open(filepath, "w")
            name_file.write(new_text)
            name_file.close()
        except (OSError, IOError) as msg:
@@ -439,6 +448,7 @@ def make_dbdir(dbdir):
        if not os.path.isdir(dbdir):
            os.makedirs(dbdir)
    except (IOError, OSError) as msg:
+        msg = conv_to_unicode(str(msg), glocale.getfilesystemencoding())
        LOG.error(_("\nERROR: Wrong database path in Edit Menu->Preferences.\n"
                    "Open preferences and set correct database path.\n\n"
                    "Details: Could not make database directory:\n    %s\n\n") % msg)
@@ -454,7 +464,7 @@ def find_next_db_name(name_list):
    while True:
        title = "%s %d" % (DEFAULT_TITLE, i)
        if title not in name_list:
-            return conv_to_unicode(title)
+            return title
        i += 1

 def find_next_db_dir():
@@ -466,6 +476,8 @@ def find_next_db_dir():
    while True:
        base = "%x" % int(time.time())
        dbdir = os.path.expanduser(config.get('behavior.database-path'))
+        if sys.version_info[0] < 3:
+            dbdir = dbdir.encode(glocale.getfilesystemencoding())
        new_path = os.path.join(dbdir, base)
        if not os.path.isdir(new_path):
            break
@@ -503,11 +515,15 @@ def find_locker_name(dirpath):
    """
    try:
        fname = os.path.join(dirpath, "lock")
-        ifile = io.open(fname, 'r', encoding='utf8')
+        ifile = open(fname, 'rb')
        username = ifile.read().strip()
+        # Convert username to unicode according to system encoding
+        # Otherwise problems with non ASCII characters in
+        # username in Windows
+        username = conv_to_unicode(username, glocale.getfilesystemencoding())
        # feature request 2356: avoid genitive form
        last = _("Locked by %s") % username
        ifile.close()
-    except (OSError, IOError, UnicodeDecodeError):
+    except (OSError, IOError):
        last = _("Unknown")
    return last
@@ -16,14 +16,16 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #

+# $Id$
+
 """
 Provides the startcli function, which the main program calls for CLI
-execution of Gramps.
+execution of GRAMPS.

-Provides also two small base classes: :class:`CLIDbLoader`, :class:`CLIManager`
+Provides also two small base classes: CLIDbLoader, CLIManager
 """

 #-------------------------------------------------------------------------
@@ -31,6 +33,8 @@ Provides also two small base classes: :class:`CLIDbLoader`, :class:`CLIManager`
 # Python modules
 #
 #-------------------------------------------------------------------------
+from __future__ import print_function
+
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.gettext
 import os
@@ -69,8 +73,8 @@ from gramps.gen.recentfiles import recent_files
 #-------------------------------------------------------------------------
 class CLIDbLoader(object):
    """
-    Base class for Db loading action inside a :class:`.DbState`. Only the
-    minimum is present needed for CLI handling
+    Base class for Db loading action inside a dbstate. Only the minimum is 
+    present needed for CLI handling
    """
    def __init__(self, dbstate):
        self.dbstate = dbstate
@@ -92,11 +96,9 @@ class CLIDbLoader(object):
    def _dberrordialog(self, msg):
        """
        Show a database error. 
-
-        :param msg: an error message
-        :type msg : string
-
-        .. note:: Inherit for GUI action
+        @param: msg : an error message
+        @type: string
+        @note: Inherit for GUI action
        """
        self._errordialog( '', _("Low level database corruption detected") 
            + '\n' +
@@ -206,12 +208,12 @@ class CLIDbLoader(object):

 class CLIManager(object):
    """
-    Sessionmanager for Gramps. This is in effect a reduced :class:`.ViewManager` 
+    Sessionmanager for GRAMPS. This is in effect a reduced viewmanager 
    instance (see gui/viewmanager), suitable for CLI actions. 
    Aim is to manage a dbstate on which to work (load, unload), and interact
    with the plugin session
    """
-    def __init__(self, dbstate, setloader, user):
+    def __init__(self, dbstate, setloader):
        self.dbstate = dbstate
        if setloader:
            self.db_loader = CLIDbLoader(self.dbstate)
@@ -219,7 +221,6 @@ class CLIManager(object):
            self.db_loader = None
        self.file_loaded = False
        self._pmgr = BasePluginManager.get_instance()
-        self.user = user

    def open_activate(self, path):
        """
@@ -247,13 +248,6 @@ class CLIManager(object):
                    _("Family Tree does not exist, as it has been deleted."))
            return

-        if os.path.isfile(os.path.join(filename, "lock")):
-            self._errordialog(
-                    _("The database is locked."),
-                    _("Use the --force-unlock option if you are sure "
-                      "that the database is not in use."))
-            return
-
        if self.db_loader.read_file(filename):
            # Attempt to figure out the database title
            path = os.path.join(filename, "name.txt")
@@ -295,10 +289,7 @@ class CLIManager(object):
        # apply preferred researcher if loaded file has none
        res = self.dbstate.db.get_researcher()
        owner = get_researcher()
-        # If the DB Owner Info is empty and
-        # [default] Researcher is not empty and
-        # database is empty, then copy default researcher to DB owner
-        if res.is_empty() and not owner.is_empty() and self.dbstate.db.is_empty():
+        if res.get_name() == "" and owner.get_name() != "":
            self.dbstate.db.set_researcher(owner)
        
        name_displayer.set_name_format(self.dbstate.db.name_formats)
@@ -322,10 +313,9 @@ class CLIManager(object):

 def startcli(errors, argparser):
    """
-    Starts a cli session of Gramps.
-
-    :param errors: errors already encountered
-    :param argparser: :class:`.ArgParser` instance
+    Starts a cli session of GRAMPS. 
+    errors    : errors already encountered 
+    argparser : ArgParser instance
    """
    if errors:
        #already errors encountered. Show first one on terminal and exit
@@ -345,13 +335,8 @@ def startcli(errors, argparser):
    
    #we need to keep track of the db state
    dbstate = DbState()
-
    #we need a manager for the CLI session
-    from .user import User
-    user=User(auto_accept=argparser.auto_accept,
-            quiet=argparser.quiet)
-    climanager = CLIManager(dbstate, setloader=True, user=user)
-
+    climanager = CLIManager(dbstate, True)
    #load the plugins
    climanager.do_reg_plugins(dbstate, uistate=None)
    # handle the arguments
@@ -20,11 +20,12 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #
 # cli.plug.__init__
 #
+# $Id$


 #-------------------------------------------------------------------------
@@ -32,6 +33,7 @@
 # Python modules
 #
 #-------------------------------------------------------------------------
+from __future__ import print_function
 import traceback
 import os
 import sys
@@ -59,6 +61,7 @@ from gramps.gen.plug.report import (CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK,
 from gramps.gen.plug.report._paper import paper_sizes
 from gramps.gen.const import USER_HOME
 from gramps.gen.dbstate import DbState
+from gramps.gen.constfunc import STRTYPE, conv_to_unicode_direct
 from ..grampscli import CLIManager
 from ..user import User
 from gramps.gen.const import GRAMPS_LOCALE as glocale
@@ -76,13 +79,13 @@ def _convert_str_to_match_type(str_val, type_val):
    str_val = str_val.strip()
    ret_type = type(type_val)
    
-    if isinstance(type_val, str):
+    if isinstance(type_val, STRTYPE):
        if ( str_val.startswith("'") and str_val.endswith("'") ) or \
           ( str_val.startswith('"') and str_val.endswith('"') ):
            # Remove enclosing quotes
-            return str(str_val[1:-1])
+            return conv_to_unicode_direct(str_val[1:-1])
        else:
-            return str(str_val)
+            return conv_to_unicode_direct(str_val)
        
    elif ret_type == int:
        if str_val.isdigit():
@@ -225,7 +228,7 @@ class CommandLineReport(object):
        self.raw_name = name
        self.option_class = option_class(name, database)
        if category == CATEGORY_GRAPHVIZ:
-            # Need to include Graphviz options
+            # Need to include GraphViz options
            self.__gvoptions = graphdoc.GVOptions()
            menu = self.option_class.menu
            self.__gvoptions.add_menu_options(menu)
@@ -306,7 +309,7 @@ class CommandLineReport(object):

        self.options_help['papers'][2] = \
            [ paper.get_name() for paper in paper_sizes 
-                        if paper.get_name() != 'Custom Size' ]
+                        if paper.get_name() != _("Custom Size") ]

        self.options_help['papero'][2] = [
            "%d\tPortrait" % PAPER_PORTRAIT,
@@ -688,7 +691,7 @@ def run_report(db, name, **options_str_dict):
       filename in clr.option_class.get_output()
    """
    dbstate = DbState()
-    climanager = CLIManager(dbstate, setloader=False, user=User()) # don't load db
+    climanager = CLIManager(dbstate, False) # don't load db
    climanager.do_reg_plugins(dbstate, None)
    pmgr = BasePluginManager.get_instance()
    cl_list = pmgr.get_reg_reports()
@@ -16,11 +16,15 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #

+# $Id$
+
 """ Unittest for argparser.py """

+from __future__ import print_function
+
 import unittest
 from ..argparser import ArgParser
 import sys
@@ -15,19 +15,16 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #

+# $Id$
+
 """ CLI tests for gramps """

-import sys
 import os
 import unittest
 import re
-import io
-import subprocess
-
-from gramps.gen.const import TEMP_DIR

 test_ged = """0 HEAD
 1 SOUR min1r.ged min 1-rec
@@ -41,8 +38,8 @@ test_ged = """0 HEAD
 """

 ddir = os.path.dirname(__file__)
-min1r = os.path.join(ddir, "min1r.ged")
-out_ged = os.path.join(ddir, "test_out.ged")
+min1r = os.path.join(ddir,"min1r.ged")
+out_ged = os.path.join(ddir,"test_out.ged")

 class Test(unittest.TestCase):
    def setUp(self):
@@ -55,8 +52,7 @@ class Test(unittest.TestCase):
    @classmethod
    def setUpClass(cls):
        if not os.path.exists(min1r):
-            with io.open(min1r, "w") as f:
-                f.write(test_ged)
+            open(min1r,"wb").write(test_ged)

    @classmethod
    def tearDownClass(cls):
@@ -73,21 +69,14 @@ class Test(unittest.TestCase):
    # This tests the fix for bug #1331-1334
    # read trivial gedcom input, write gedcom output
    def test2_exec_CLI(self):
-        pyexec = sys.executable
        ifile = min1r
        ofile = out_ged
        gcmd = "Gramps.py -i %s -e %s" % (ifile, ofile)
-        process = subprocess.Popen("%s %s" % (pyexec ,gcmd),
-                                   stdin=subprocess.PIPE,
-                                   stdout=subprocess.PIPE,
-                                   stderr=subprocess.PIPE, shell=True)
-        result_str, err_str = process.communicate()
-        self.assertEqual(process.returncode, 0,
-                         "executed CLI command %r" % gcmd)
+        rc = os.system("python %s" % gcmd)
+        self.assertEquals(rc, 0, "executed CLI cmmand %r" % gcmd)
        # simple validation o output
        self.assertTrue(os.path.isfile(ofile), "output file created")
-        with io.open(ofile) as f:
-            content = f.read()
+        content = open(ofile).read()
        g = re.search("INDI", content)
        self.assertTrue(g, "found 'INDI' in output file")

@@ -95,67 +84,24 @@ class Test(unittest.TestCase):
    # get cleaned before (and after) running a CLI
    # (eg cleanout stale files from prior crash-runs)
    def test3_files_in_import_dir(self):
-        ddir = os.path.join(TEMP_DIR, "import_dbdir")
-        try:
-            os.makedirs(ddir)
-        except:
-            pass
-        bogofiles = [os.path.join(ddir, fn) for fn in ("family.db", "lock")]
+        from gramps.gen.const import TEMP_DIR
+        ddir = os.path.join(TEMP_DIR,"import_dbdir")
+        os.makedirs(ddir)
+        bogofiles = [os.path.join(ddir,fn) 
+            for fn in ("family.db", "lock")]
        for fn in bogofiles:
-            with io.open(fn, "w") as f:
-                f.write("garbage")
+            f = open(fn, "w").write("garbage")
        
        # ~same as test 2
-        pyexec = sys.executable
        ifile = min1r
        ofile = out_ged
        gcmd = "Gramps.py -i %s -e %s" % (ifile, ofile)
-        process = subprocess.Popen("%s %s" % (pyexec, gcmd),
-                                   stdin=subprocess.PIPE,
-                                   stdout=subprocess.PIPE,
-                                   stderr=subprocess.PIPE, shell=True)
-        result_str, err_str = process.communicate()
-        self.assertEqual(process.returncode, 0,
-                         "executed CLI command %r" % gcmd)
+        rc = os.system("python %s" % gcmd)
+        self.assertEquals(rc, 0, "executed CLI cmmand %r" % gcmd)

        for fn in bogofiles:
            self.assertFalse(os.path.exists(fn))

-class UnicodeTest(unittest.TestCase):
-
-    def setUp(self):
-        from gramps.cli.clidbman import CLIDbManager
-        from gramps.gen.config import set as setconfig, get as getconfig
-        from gramps.gen.dbstate import DbState
-        self.newpath = os.path.join(os.path.dirname(__file__),
-                                    '\u0393\u03c1\u03b1\u03bc\u03c3\u03c0')
-        self.newtitle = 'Gr\u00e4mps T\u00e9st'
-        os.makedirs(self.newpath)
-        self.old_path = getconfig('behavior.database-path')
-        setconfig('behavior.database-path', self.newpath)
-        self.cli = CLIDbManager(DbState())
-
-    def tearDown(self):
-        from gramps.gen.config import set as setconfig
-        for (dirpath, dirnames, filenames) in os.walk(self.newpath, False):
-            for afile in filenames:
-                os.remove(os.path.join(dirpath, afile))
-            for adir in dirnames:
-                os.rmdir(os.path.join(dirpath, adir))
-        os.rmdir(self.newpath)
-        setconfig('behavior.database-path', self.old_path)
-
-    # Test that clidbman will open files in a path containing
-    # arbitrary Unicode characters.
-    def test4_arbitrary_uncode_path(self):
-        (dbpath, title) = self.cli.create_new_db_cli(self.newtitle)
-
-        self.assertEqual(self.newpath, os.path.dirname(dbpath),
-                          "Compare paths %s and %s" % (repr(self.newpath),
-                                                       repr(dbpath)))
-        self.assertEqual(self.newtitle, title, "Compare titles %s and %s" %
-                          (repr(self.newtitle), repr(title)))
-

 if __name__ == "__main__":
    unittest.main()
@@ -16,11 +16,15 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #

+# $Id$
+
 """ Unittest for user.py """

+from __future__ import print_function
+
 import unittest
 from .. import user
 from ...gen.test.user_test import TestUser
@@ -149,6 +153,8 @@ class TestUser_quiet(unittest.TestCase):

@unittest.skipUnless(MOCKING, "Requires unittest.mock to run")
 class TestUser_progress(unittest.TestCase):
+    _progress_begin_step_end = \
+            TestUser_quiet.test_progress_can_begin_step_end.__func__

    def setUp(self):
        self.user = user.User()
@@ -180,11 +186,5 @@ class TestUser_progress(unittest.TestCase):
                pass
        self.assertTrue(MockEP.called)

-    def _progress_begin_step_end(self):
-        self.user.begin_progress("Foo", "Bar", 0)
-        for i in range(10):
-            self.user.step_progress()
-        self.user.end_progress()
-
 if __name__ == "__main__":
    unittest.main()
@@ -15,13 +15,23 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# $Id$
 #

 """
 The User class provides basic interaction with the user.
 """

+#------------------------------------------------------------------------
+#
+# Python Modules
+#
+#------------------------------------------------------------------------
+from __future__ import print_function
+import sys
+
 #------------------------------------------------------------------------
 #
 # Gramps Modules
@@ -46,19 +56,19 @@ _SPINNER = ['|', '/', '-', '\\']
 class User(user.User):
    """
    This class provides a means to interact with the user via CLI.
-    It implements the interface in :class:`.gen.user.User`
+    It implements the interface in gramps.gen.user.User()
    """
    def __init__(self, callback=None, error=None, auto_accept=False, quiet=False):
        """
        Init.

-        :param error: If given, notify_error delegates to this callback
-        :type error: function(title, error)
+        @param error: If given, notify_error delegates to this callback
+        @type error: function(title, error)
        """
        user.User.__init__(self, callback, error)
        self.steps = 0;
        self.current_step = 0;
-        self._input = input
+        self._input = raw_input if sys.version_info[0] < 3 else input

        def yes(*args): 
            return True
@@ -73,15 +83,15 @@ class User(user.User):
        """
        Start showing a progress indicator to the user.
        
-        :param title: the title of the progress meter
-        :type title: str
-        :param message: the message associated with the progress meter
-        :type message: str
-        :param steps: the total number of steps for the progress meter.
-                      a value of 0 indicates that the ending is unknown and the
-                      meter should just show activity.
-        :type steps: int
-        :returns: none
+        @param title: the title of the progress meter
+        @type title: str
+        @param message: the message associated with the progress meter
+        @type message: str
+        @param steps: the total number of steps for the progress meter.
+            a value of 0 indicates that the ending is unknown and the
+            meter should just show activity.
+        @type steps: int
+        @returns: none
        """
        self._fileout.write(message)
        self.steps = steps
@@ -109,23 +119,22 @@ class User(user.User):
        """
        self._fileout.write("\r100%\n")
    
-    def prompt(self, title, message, accept_label, reject_label, parent=None):
+    def prompt(self, title, message, accept_label, reject_label):
        """
        Prompt the user with a message to select an alternative.
        
-        :param title: the title of the question, e.g.: "Undo history warning"
-        :type title: str
-        :param message: the message, e.g.: "Proceeding with the tool will erase
-                        the undo history. If you think you may want to revert
-                        running this tool, please stop here and make a backup
-                        of the DB."
-        :type question: str
-        :param accept_label: what to call the positive choice, e.g.: "Proceed"
-        :type accept_label: str
-        :param reject_label: what to call the negative choice, e.g.: "Stop"
-        :type reject_label: str
-        :returns: the user's answer to the question
-        :rtype: bool
+        @param title: the title of the question, e.g.: "Undo history warning"
+        @type title: str
+        @param message: the message, e.g.: "Proceeding with the tool will
+            erase the undo history. If you think you may want to revert
+            running this tool, please stop here and make a backup of the DB."
+        @type question: str
+        @param accept_label: what to call the positive choice, e.g.: "Proceed"
+        @type accept_label: str
+        @param reject_label: what to call the negative choice, e.g.: "Stop"
+        @type reject_label: str
+        @returns: the user's answer to the question
+        @rtype: bool
        """
        accept_label = accept_label.replace("_", "")
        reject_label = reject_label.replace("_", "")
@@ -145,11 +154,11 @@ class User(user.User):
        """
        Warn the user.
        
-        :param title: the title of the warning
-        :type title: str
-        :param warning: the warning
-        :type warning: str
-        :returns: none
+        @param title: the title of the warning
+        @type title: str
+        @param warning: the warning
+        @type warning: str
+        @returns: none
        """
        self._fileout.write("%s %s" % (title, warning))
    
@@ -157,11 +166,11 @@ class User(user.User):
        """
        Notify the user of an error.
        
-        :param title: the title of the error
-        :type title: str
-        :param error: the error message
-        :type error: str
-        :returns: none
+        @param title: the title of the error
+        @type title: str
+        @param error: the error message
+        @type error: str
+        @returns: none
        """
        if self.error_function:
            self.error_function(title, error)
@@ -172,9 +181,9 @@ class User(user.User):
        """
        Notify the user of a DB error.
        
-        :param error: the error message
-        :type error: str
-        :returns: none
+        @param error: the error message
+        @type error: str
+        @returns: none
        """
        self.notify_error(
            _("Low level database corruption detected"),
@@ -187,4 +196,5 @@ class User(user.User):
        """
        Displays information to the CLI
        """
-        self._fileout.write("{} {}\n".format(msg1, infotext))
+        self._fileout.write(msg1)
+        self._fileout.write(infotext)
--- a/Show More
+++ b/Show More