diff --git a/data/man/conf.py b/data/man/conf.py
index 6bb759423..b27d4cc61 100644
--- a/data/man/conf.py
+++ b/data/man/conf.py
@@ -37,7 +37,7 @@ source_suffix = '.rst'
 #source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = 'en'
+master_doc = 'index'
 
 # General information about the project.
 project = u'Gramps'
@@ -215,7 +215,7 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('en', 'gramps', u'Gramps Documentation',
-     [u'.'], 1)
+     ['Gramps project'], 1)
 ]
 
 # If true, show URL addresses after external links.
diff --git a/data/man/cs/cs.rst b/data/man/cs/cs.rst
index 2b4608c46..6ac0942bb 100644
--- a/data/man/cs/cs.rst
+++ b/data/man/cs/cs.rst
@@ -1,3 +1,6 @@
+Czech
+======
+
 gramps(1)			     3.4.0			     gramps(1)
 
 
diff --git a/data/man/en.rst b/data/man/en.rst
index ae74975cb..2b8b5a48b 100644
--- a/data/man/en.rst
+++ b/data/man/en.rst
@@ -1,3 +1,6 @@
+English
+=======
+
 gramps(1)                4.0.0               gramps(1)
 
 
diff --git a/data/man/fr/conf.py b/data/man/fr/conf.py
index 0f9ec001b..50393d820 100644
--- a/data/man/fr/conf.py
+++ b/data/man/fr/conf.py
@@ -61,7 +61,7 @@ gettext_compact = True
 # non-false value, then it is used:
 #today = ''
 # Else, today_fmt is used as the format for a strftime call.
-today_fmt = '%B %d, %Y'
+today_fmt = '%d %B %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -215,7 +215,7 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('fr', 'gramps', u'Gramps Documentation',
-     [u'.'], 1)
+     ['Jerome Rapinat'], 1)
 ]
 
 # If true, show URL addresses after external links.
diff --git a/data/man/fr/fr.rst b/data/man/fr/fr.rst
index 6b6afb370..512e0ea3e 100644
--- a/data/man/fr/fr.rst
+++ b/data/man/fr/fr.rst
@@ -1,3 +1,7 @@
+French
+=======
+
+
 gramps(1)			     4.0.0			     gramps(1)
 
 
diff --git a/data/man/index.rst b/data/man/index.rst
new file mode 100644
index 000000000..d80002eb9
--- /dev/null
+++ b/data/man/index.rst
@@ -0,0 +1,22 @@
+.. Gramps documentation master file, created by
+   sphinx-quickstart on Sat Dec 1 00:07:37 2012.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to Gramps' command line documentation!
+==============================================
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   en
+   cs/cs
+   fr/fr
+   nl/nl
+   pl/pl
+   pt_BR/pt_BR
+   sv/sv
+
+
diff --git a/data/man/nl/nl.rst b/data/man/nl/nl.rst
index fc7f064e1..be01727fb 100644
--- a/data/man/nl/nl.rst
+++ b/data/man/nl/nl.rst
@@ -1,3 +1,6 @@
+Dutch
+======
+
 gramps(1)			     3.4.0			     gramps(1)
 
 
diff --git a/data/man/pl/pl.rst b/data/man/pl/pl.rst
index f2c879a36..46719580b 100644
--- a/data/man/pl/pl.rst
+++ b/data/man/pl/pl.rst
@@ -1,3 +1,6 @@
+Polish
+=======
+
 gramps(1)			     3.4.0			     gramps(1)
 
 
diff --git a/data/man/pt_BR/pt_BR.rst b/data/man/pt_BR/pt_BR.rst
index e5acaad5d..a70408570 100644
--- a/data/man/pt_BR/pt_BR.rst
+++ b/data/man/pt_BR/pt_BR.rst
@@ -1,3 +1,6 @@
+Portuguese (Brazil)
+===================
+
 gramps(1)                4.0.0               gramps(1)
 
 
@@ -208,17 +211,16 @@ automaticamente):
 **gramps** **-i** *arquivo1.ged* **-i** *arquivo2.tgz*
 **-e** *~/novo-pacote* **-f** *gramps-pkg* 
 
-Importar tr?s bancos de dados e
-iniciar a sess?o interativa do Gramps com o resultado: 
+Importar tr?s bancos de dados e iniciar a sess?o interativa do Gramps com o resultado: 
 
 **gramps** **-i**
 *arquivo1.ged* **-i** *arquivo2.tgz* **-i** *~/db3.gramps* 
 
-Executar a
-ferramenta de verifica??o a partir da linha de comando e direcionar o
+Executar a ferramenta de verifica??o a partir da linha de comando e direcionar o
 resultado para stdout:
 
-**gramps** **-O** *'Minha ?rvore geneal?gica'* **-a** *tool* **-p** **name**=*verify* 
+**gramps** **-O** *'Minha ?rvore geneal?gica'* **-a** *tool* **-p** 
+**name**=*verify* 
 
 Finalmente, para iniciar uma sess?o
 interativa normal, digite: 
diff --git a/data/man/sv/sv.rst b/data/man/sv/sv.rst
index 0248c3aa5..275e7a608 100644
--- a/data/man/sv/sv.rst
+++ b/data/man/sv/sv.rst
@@ -1,3 +1,6 @@
+Swedish
+=======
+
 Gramps(1)			     3.4.0			     Gramps(1)
 
 
@@ -95,9 +98,9 @@ ALTERNATIV
 	      Utför ÅTGÄRD på importerade  data.  Detta  görs  efter  att  all
 	      import har avslutats felfritt. F. n. är följand åtgärder möjliga
 	      summary	(samma	  som	 Rapporter->Visa->Sammanfattning    av
-	      databasen),  check  (samma  som Verktyg->Reparera databas ->Kon‐
+	      databasen) ,  check  (samma  som Verktyg->Reparera databas ->Kon‐
 	      trollera och reparera) samt report (skapar report, kräver en 
-          ALTERNATIVSTRÄNG lämnad via -p-flaggan).
+          ALTERNATIVSTRÄNG lämnad via -p-flaggan) .
 
 	      ALTERNATIVSTRÄNG-en måste uppfylla följand villkor:
 	      Får ej innehålla några mellanslag.  Om  några  argument  behöver