diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 5dcbcb43d..e6c395a14 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-28  Alex Roitman  <shura@gramps-project.org>
+	* src/plugins/WebPage.py (WebReportOptions.set_new_options):
+	Define help dictionary to document options.
+	* src/Report.py (CommandLineReport.init_options): Typo.
+
 2005-07-27  Don Allingham  <don@gramps-project.org>
 	* src/plugins/NavWebPage.py: add user html header and footer
 	* src/FamilyView.py: try to prevent adding a spouse that has 
diff --git a/gramps2/src/Report.py b/gramps2/src/Report.py
index a69cb2cf0..3f21c0dbe 100644
--- a/gramps2/src/Report.py
+++ b/gramps2/src/Report.py
@@ -1569,7 +1569,7 @@ class CommandLineReport:
             'style'     : self.option_class.handler.get_default_stylesheet_name(),
             'papers'    : self.option_class.handler.get_paper_name(),
             'papero'    : self.option_class.handler.get_orientation(),
-            'template'  : self.option_class.handler.get_orientation(),
+            'template'  : self.option_class.handler.get_template_name(),
             'id'        : ''
             }
 
diff --git a/gramps2/src/plugins/WebPage.py b/gramps2/src/plugins/WebPage.py
index 8500b6d46..68fd1666b 100644
--- a/gramps2/src/plugins/WebPage.py
+++ b/gramps2/src/plugins/WebPage.py
@@ -1260,6 +1260,58 @@ class WebReportOptions(ReportOptions.ReportOptions):
         }
 
         self.options_help = {
+            'HTMLod'            : ("=str","Output directory for the web site",
+                                   "/full/name/of/the/dir"),
+            'HTMLimg'           : ("=num","Inclusion of images",
+                                   ["No images at all",
+                                    "No images for living people",
+                                    "Images for all people"], True
+                                   ),
+            'HTMLrestrictinfo'  : ("=0/1",
+                                   "Restrict information on living people",
+                                   ["Do not restrict", "Restrict"], True),
+            'HTMLincpriv'       : ("=0/1","Inclusion of people marked private",
+                                   ["Do not include","Include"], True),
+            'HTMLcmtxtsi'       : ("=0/1","Inclusion of comments and text "
+                                   "in source information",
+                                   ["Do not include","Include"], True),
+            'HTMLlnktoalphabet' : ("=0/1","Include links to alphabetical "
+                                   "sections in index page",
+                                   ["Do not include","Include"], True), 
+            'HTMLsplita'        : ("=0/1","Split alphabetical sections "
+                                   "to different pages",
+                                   ["Do not split sections","Split sections"],
+                                   True), 
+            'HTMLshorttree'     : ("=0/1","Include short ancestor tree",
+                                   ["Do not include","Include"], True),
+            'HTMLimagedir'      : ("=str","Image subdirectory",
+                                   "image_subdir_name"),
+            'HTMLincid'         : ("=0/1","Include GRAMPS ID in the report",
+                                   ["Do not include","Include"], True),
+            'HTMLidurl'         : ("=str","URL for links from GRAMPS IDs",
+                                   "the_url_value"),
+            'HTMLlinktidx'      : ("=0/1","Include links to the index page",
+                                   ["Do not include","Include"], True),
+            'HTMLext'           : ("=str","Extension for generated files",
+                                   "Any extension you like: html, htm, "
+                                   "php, asp, etc."),
+            'HTMLtreed'         : ("=num","Depth of ancestor tree",
+                                   "Any integer number"),
+            'HTMLidxt'          : ("=str","Template name for the index page",
+                                   "/full/path/to/the/tpkg"),
+            'HTMLidxcol'        : ("=num",
+                                   "Number of columns in the index page",
+                                   "Any integer number"),
+            'HTMLgendex'        : ("=0/1","Create a GENDEX index",
+                                   ["Do not create","Create"], True),
+            'HTMLidxbirth'      : ("=0/1","Append birth dates to the names "
+                                   "on the index page",
+                                   ["Do not append","Append"], True),
+            'HTMLplaceidx'      : ("=0/1","Create an index of all Places",
+                                   ["Do not create","Create"], True),
+            'HTMLyearso'        : ("=0/1","Use only birth year "
+                                   "on the index page",
+                                   ["Use full date","Use just year"], True),
         }
 
     def enable_options(self):