Thu Jun 23 12:39:08 CEST 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * etc/*.doxygen:
          Disable html help, seems doxygen now disables the search option
          when html help is enabled

30 files changed, 35 insertions, 29 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0fb7df3e607..c8b923c3e6b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 23 12:39:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/*.doxygen:
+          Disable html help, seems doxygen now disables the search option
+          when html help is enabled
+
 Thu Jun 23 13:46:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * TAO version 2.0.3 released.
diff --git a/TAO/etc/tao.doxygen b/TAO/etc/tao.doxygen
index d76d4730168..da1319128bc 100644
--- a/TAO/etc/tao.doxygen
+++ b/TAO/etc/tao.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_anytypecode.doxygen b/TAO/etc/tao_anytypecode.doxygen
index 0e5ab250a70..fd19f1be074 100644
--- a/TAO/etc/tao_anytypecode.doxygen
+++ b/TAO/etc/tao_anytypecode.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_av.doxygen b/TAO/etc/tao_av.doxygen
index 2c4ef8757a5..54da471d6ef 100644
--- a/TAO/etc/tao_av.doxygen
+++ b/TAO/etc/tao_av.doxygen
@@ -80,7 +80,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_compression.doxygen b/TAO/etc/tao_compression.doxygen
index deec0a17d30..aad1b9bea0c 100644
--- a/TAO/etc/tao_compression.doxygen
+++ b/TAO/etc/tao_compression.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_cosevent.doxygen b/TAO/etc/tao_cosevent.doxygen
index f8e63aa3aa6..397f26d6def 100644
--- a/TAO/etc/tao_cosevent.doxygen
+++ b/TAO/etc/tao_cosevent.doxygen
@@ -80,7 +80,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_cosnaming.doxygen b/TAO/etc/tao_cosnaming.doxygen
index b6eca6ff7ef..aeb2acd4468 100644
--- a/TAO/etc/tao_cosnaming.doxygen
+++ b/TAO/etc/tao_cosnaming.doxygen
@@ -78,7 +78,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_cosnotification.doxygen b/TAO/etc/tao_cosnotification.doxygen
index f43b3bcc951..6aeb31cc43a 100644
--- a/TAO/etc/tao_cosnotification.doxygen
+++ b/TAO/etc/tao_cosnotification.doxygen
@@ -85,7 +85,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_costime.doxygen b/TAO/etc/tao_costime.doxygen
index b94477dadea..9c7b9bcda40 100644
--- a/TAO/etc/tao_costime.doxygen
+++ b/TAO/etc/tao_costime.doxygen
@@ -78,7 +78,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_costrader.doxygen b/TAO/etc/tao_costrader.doxygen
index a7f565d9ea8..046b93f8be0 100644
--- a/TAO/etc/tao_costrader.doxygen
+++ b/TAO/etc/tao_costrader.doxygen
@@ -80,7 +80,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_dynamicany.doxygen b/TAO/etc/tao_dynamicany.doxygen
index 16d2bed576c..b9e3cc9d752 100644
--- a/TAO/etc/tao_dynamicany.doxygen
+++ b/TAO/etc/tao_dynamicany.doxygen
@@ -78,7 +78,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_dynamicinterface.doxygen b/TAO/etc/tao_dynamicinterface.doxygen
index 47141d66893..e661ed62653 100644
--- a/TAO/etc/tao_dynamicinterface.doxygen
+++ b/TAO/etc/tao_dynamicinterface.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_esf.doxygen b/TAO/etc/tao_esf.doxygen
index 946642ed299..a5a5f1e9f2c 100644
--- a/TAO/etc/tao_esf.doxygen
+++ b/TAO/etc/tao_esf.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_ifr.doxygen b/TAO/etc/tao_ifr.doxygen
index 4c5016191a7..5ba8541d669 100644
--- a/TAO/etc/tao_ifr.doxygen
+++ b/TAO/etc/tao_ifr.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_implrepo.doxygen b/TAO/etc/tao_implrepo.doxygen
index ebf1f644752..46bf3264f1c 100644
--- a/TAO/etc/tao_implrepo.doxygen
+++ b/TAO/etc/tao_implrepo.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_iormanip.doxygen b/TAO/etc/tao_iormanip.doxygen
index 035065a69da..f6c958beade 100644
--- a/TAO/etc/tao_iormanip.doxygen
+++ b/TAO/etc/tao_iormanip.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_iortable.doxygen b/TAO/etc/tao_iortable.doxygen
index 89c0d8e7e4a..c3c2a189538 100644
--- a/TAO/etc/tao_iortable.doxygen
+++ b/TAO/etc/tao_iortable.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_pi.doxygen b/TAO/etc/tao_pi.doxygen
index 4574c930d52..54bfcb536c4 100644
--- a/TAO/etc/tao_pi.doxygen
+++ b/TAO/etc/tao_pi.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_pi_server.doxygen b/TAO/etc/tao_pi_server.doxygen
index 7e423a29c28..40f8a38458d 100644
--- a/TAO/etc/tao_pi_server.doxygen
+++ b/TAO/etc/tao_pi_server.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_portablegroup.doxygen b/TAO/etc/tao_portablegroup.doxygen
index 87ff0db81f2..b46d02feb1c 100644
--- a/TAO/etc/tao_portablegroup.doxygen
+++ b/TAO/etc/tao_portablegroup.doxygen
@@ -80,7 +80,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_portableserver.doxygen b/TAO/etc/tao_portableserver.doxygen
index abe30e36444..7769955701e 100644
--- a/TAO/etc/tao_portableserver.doxygen
+++ b/TAO/etc/tao_portableserver.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_rtcorba.doxygen b/TAO/etc/tao_rtcorba.doxygen
index 4bd083c73b7..b6930997085 100644
--- a/TAO/etc/tao_rtcorba.doxygen
+++ b/TAO/etc/tao_rtcorba.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_rtevent.doxygen b/TAO/etc/tao_rtevent.doxygen
index d432e2ee3d0..5fa13a4fbac 100644
--- a/TAO/etc/tao_rtevent.doxygen
+++ b/TAO/etc/tao_rtevent.doxygen
@@ -86,7 +86,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_rtportableserver.doxygen b/TAO/etc/tao_rtportableserver.doxygen
index b740a3bed35..5a8ee076fce 100644
--- a/TAO/etc/tao_rtportableserver.doxygen
+++ b/TAO/etc/tao_rtportableserver.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_security.doxygen b/TAO/etc/tao_security.doxygen
index 64e1f3a9ce2..7af7f5f56d0 100644
--- a/TAO/etc/tao_security.doxygen
+++ b/TAO/etc/tao_security.doxygen
@@ -82,7 +82,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_smartproxies.doxygen b/TAO/etc/tao_smartproxies.doxygen
index 83894b34ad1..ed4d41592d7 100644
--- a/TAO/etc/tao_smartproxies.doxygen
+++ b/TAO/etc/tao_smartproxies.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_ssliop.doxygen b/TAO/etc/tao_ssliop.doxygen
index d0b761a7fbc..f8f2b7544ab 100644
--- a/TAO/etc/tao_ssliop.doxygen
+++ b/TAO/etc/tao_ssliop.doxygen
@@ -82,7 +82,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_strategies.doxygen b/TAO/etc/tao_strategies.doxygen
index 2ac0de9e15f..a29f396d8f3 100644
--- a/TAO/etc/tao_strategies.doxygen
+++ b/TAO/etc/tao_strategies.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_transportcurrent.doxygen b/TAO/etc/tao_transportcurrent.doxygen
index 470407c0d70..a656796374f 100644
--- a/TAO/etc/tao_transportcurrent.doxygen
+++ b/TAO/etc/tao_transportcurrent.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/TAO/etc/tao_ziop.doxygen b/TAO/etc/tao_ziop.doxygen
index f4c5dcbe874..7c7d2a80344 100644
--- a/TAO/etc/tao_ziop.doxygen
+++ b/TAO/etc/tao_ziop.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output