diff --git a/config/rootrc.in b/config/rootrc.in
index 3b4ad89769872792c8b5bb6987a5cd17fdf13374..32eb1c584c40b5799f2a9864ea982bb9e70ab38e 100644
--- a/config/rootrc.in
+++ b/config/rootrc.in
@@ -143,17 +143,18 @@ Hist.Stats.KurtosisX  Kurtosis x
 Hist.Stats.KurtosisY  Kurtosis y
 
 # THtml specific settings (for more see doc of THtml class).
-Unix.*.Root.Html.SourceDir:  .:src:include
-WinNT.*.Root.Html.SourceDir: .;src;include
-Root.Html.Root:              http://root.cern.ch/root/html
-#Root.Html.OutputDir:        htmldoc/
+Root.Html.SourceDir:    .
+Root.Html.Root:         http://root.cern.ch/root/html
+Root.Html.ViewCVS:      http://root.cern.ch/viewcvs/trunk/%f?view=log
+Root.Html.Search:       http://www.google.com/search?q=%s+site%3A%u+-site%3A%u%2Fsrc%2F+-site%3A%u%2Fexamples%2F
+#Root.Html.OutputDir:   htmldoc/
 #Root.Html.Homepage:
 #Root.Html.Header:
 #Root.Html.Footer:
-#Root.Html.Description:      //____________________
-#Root.Html.Author:           // Author:
-#Root.Html.LastUpdate:       // @(#)
-#Root.Html.Copyright:        * Copyright
+#Root.Html.Description: //____________________
+#Root.Html.Author:      // Author:
+#Root.Html.LastUpdate:  // @(#)
+#Root.Html.Copyright:   * Copyright
 
 # GUI specific settings.
 Gui.Backend:                native
diff --git a/etc/html/ROOT.css b/etc/html/ROOT.css
index d8bb16f8f518c7ee0b856080297059446f8d0afc..e6ace8b912f55c8a6deacf68936906643fb5f430 100755
--- a/etc/html/ROOT.css
+++ b/etc/html/ROOT.css
@@ -282,7 +282,17 @@ a.linkeddoc {
 }
 
 #searchform {
-   margin-left: 2em;
+   margin-left: -0.75em;
+   display: inline;
+}
+#searchlink {
+	background-color: ButtonFace;
+	border-style: outset;
+	border-width: 1px;
+	padding: 1px 0.2em 1px 0.2em;
+	text-decoration: none;
+	color: ButtonText;
+	margin-left: 0.5em;
 }
 
 /*** Class doc pages ***/
@@ -391,7 +401,14 @@ td.funcname {
    margin: 0px 0px 0px 0px;
    width: 100%;
 }
-
+span.funcprop 
+{
+	margin-left: 1em;
+	background-color: #FFFFCC;
+	border: solid 1px #FFFF33;
+	font-size: 80%;
+	font-weight: bold;
+}
 td.dataname {
    font-weight: bolder;
    vertical-align: top;
diff --git a/etc/html/footer.html b/etc/html/footer.html
index 3ef343e98c4438f8185bda044574b889b34e467b..b4e24cacd4c931efb0314f37bd40a9295df060cf 100755
--- a/etc/html/footer.html
+++ b/etc/html/footer.html
@@ -1,7 +1,8 @@
 <br />
 <!--SIGNATURE-->
 <em>Author: %AUTHOR%</em><br />
-<em>Last update: %UPDATE%</em><br />
+<em>Last change: %CHANGED%</em><br />
+<em>Last generated: %GENERATED%</em><br />
 <em>Copyright  %COPYRIGHT%</em><br />
 <hr />
 <em>
diff --git a/hist/hist/src/TH1.cxx b/hist/hist/src/TH1.cxx
index d6c956fb553be56086aee1a10b6317bd0d05cb83..95c86ca340362e8c8d75fdef52e0e60e1071cc0b 100644
--- a/hist/hist/src/TH1.cxx
+++ b/hist/hist/src/TH1.cxx
@@ -1416,7 +1416,7 @@ Double_t TH1::Chi2Test(const TH1* h2, Option_t *option, Double_t *res) const
    //   (minimal expected frequency equal to one) and the weighted histogram with
    //   500 events (minimal expected frequency equal to 25)
    //Begin_Macro
-   // ../../tutorials/math/chi2test.C
+   // ../../../tutorials/math/chi2test.C
    //End_Macro
    //   Fig 1. An example of comparison of the unweighted histogram with 200 events
    //   and the weighted histogram with 500 events:
@@ -1438,7 +1438,7 @@ Double_t TH1::Chi2Test(const TH1* h2, Option_t *option, Double_t *res) const
    //   frequency equal to one) and the weighted histogram with 500 events (minimal
    //   expected frequency equal to 25)
    //Begin_Macro
-   // ../../tutorials/math/chi2test.C(17)
+   // ../../../tutorials/math/chi2test.C(17)
    //End_Macro
    //   Fig 2. An example of comparison of the unweighted histogram with 217 events
    //   and the weighted histogram with 500 events:
diff --git a/tree/treeviewer/src/TSpider.cxx b/tree/treeviewer/src/TSpider.cxx
index f392ac43e6fa0c3e58b21c185ac033ec4a8b0757..6d123be41c538154dd11e587c1cac38b5d3aca3f 100644
--- a/tree/treeviewer/src/TSpider.cxx
+++ b/tree/treeviewer/src/TSpider.cxx
@@ -48,7 +48,7 @@ End_Html
 Begin_Macro(source)
 {
    TCanvas *c1 = new TCanvas("c1","TSpider example",200,10,700,700);
-   TFile *f = new TFile("hsimple.root");
+   TFile *f = new TFile("$(ROOTSYS)/tutorials/hsimple.root");
    if (!f || f->IsZombie()) {
       printf("Please run <ROOT location>/tutorials/hsimple.C before.");
       return;