Thu Aug 26 13:03:25 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * etc/tao.doxygen:
        * etc/tao_anytypecode.doxygen:
        * etc/tao_av.doxygen:
        * etc/tao_compression.doxygen:
        * etc/tao_cosevent.doxygen:
        * etc/tao_cosnaming.doxygen:
        * etc/tao_cosnotification.doxygen:
        * etc/tao_costime.doxygen:
        * etc/tao_costrader.doxygen:
        * etc/tao_dynamicany.doxygen:
        * etc/tao_dynamicinterface.doxygen:
        * etc/tao_esf.doxygen:
        * etc/tao_ifr.doxygen:
        * etc/tao_implrepo.doxygen:
        * etc/tao_iormanip.doxygen:
        * etc/tao_iortable.doxygen:
        * etc/tao_pi.doxygen:
        * etc/tao_pi_server.doxygen:
        * etc/tao_portablegroup.doxygen:
        * etc/tao_portableserver.doxygen:
        * etc/tao_pss.doxygen:
        * etc/tao_rtcorba.doxygen:
        * etc/tao_rtevent.doxygen:
        * etc/tao_rtportableserver.doxygen:
        * etc/tao_security.doxygen:
        * etc/tao_smartproxies.doxygen:
        * etc/tao_ssliop.doxygen:
        * etc/tao_strategies.doxygen:
        * etc/tao_transportcurrent.doxygen:
        * etc/tao_ziop.doxygen:
          Changed documentation subdirectories to make debian packaging easier

30 files changed, 138 insertions, 138 deletions

diff --git a/TAO/etc/tao.doxygen b/TAO/etc/tao.doxygen
index 3f56f63c2f8..1d7afa3a4b0 100644
--- a/TAO/etc/tao.doxygen
+++ b/TAO/etc/tao.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao
+HTML_OUTPUT           = html/libtao-doc
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,8 +135,8 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../ace
-GENERATE_TAGFILE      = html/tao/TAO.tag
+TAGFILES              = html/libace-doc/ACE.tag=../libace-doc
+GENERATE_TAGFILE      = html/libtao-doc/TAO.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_anytypecode.doxygen b/TAO/etc/tao_anytypecode.doxygen
index fa36cd4a586..1f169200840 100644
--- a/TAO/etc/tao_anytypecode.doxygen
+++ b/TAO/etc/tao_anytypecode.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/anytypecode
+HTML_OUTPUT           = html/libtao-doc/anytypecode
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,9 +135,9 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/anytypecode/TAO_AnyTypeCode.tag
+TAGFILES              = html/ace/ACE.tag=../../libace-doc \
+			            html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/anytypecode/TAO_AnyTypeCode.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_av.doxygen b/TAO/etc/tao_av.doxygen
index 6c71587e09c..a0265673f52 100644
--- a/TAO/etc/tao_av.doxygen
+++ b/TAO/etc/tao_av.doxygen
@@ -75,7 +75,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/av
+HTML_OUTPUT           = html/libtao-doc/av
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -138,9 +138,9 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=.. \
-			html/tao/portableserver/TAO_PortableServer.tag=../portableserver
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver
 GENERATE_TAGFILE      = html/tao/av/TAO_AV.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
diff --git a/TAO/etc/tao_compression.doxygen b/TAO/etc/tao_compression.doxygen
index b35b09ade56..2039ad04d61 100644
--- a/TAO/etc/tao_compression.doxygen
+++ b/TAO/etc/tao_compression.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/compression
+HTML_OUTPUT           = html/libtao-doc/compression
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,9 +135,9 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/compression/TAO_Compression.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/compression/TAO_Compression.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_cosevent.doxygen b/TAO/etc/tao_cosevent.doxygen
index 99eedacce2f..5b6e371b6fa 100644
--- a/TAO/etc/tao_cosevent.doxygen
+++ b/TAO/etc/tao_cosevent.doxygen
@@ -75,7 +75,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/cosevent
+HTML_OUTPUT           = html/libtao-doc/cosevent
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -138,10 +138,10 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-	html/tao/TAO.tag=.. \
-	html/tao/portableserver/TAO_PortableServer.tag=../portableserver \
-	html/tao/esf/TAO_ESF.tag=../esf
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver \
+                        html/libtao-doc/esf/TAO_ESF.tag=../esf
 GENERATE_TAGFILE      = html/tao/cosevent/TAO_CosEvent.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
diff --git a/TAO/etc/tao_cosnaming.doxygen b/TAO/etc/tao_cosnaming.doxygen
index 7d3cddf3062..fb073a8bb74 100644
--- a/TAO/etc/tao_cosnaming.doxygen
+++ b/TAO/etc/tao_cosnaming.doxygen
@@ -50,7 +50,7 @@ WARN_FORMAT           = "$file:$line: $text"
 #---------------------------------------------------------------------------
 
 INPUT                 = TAO/orbsvcs/orbsvcs/CosNaming.idl \
-                TAO/orbsvcs/orbsvcs/Naming
+                        TAO/orbsvcs/orbsvcs/Naming
 FILE_PATTERNS         = *.cpp *.h *.inl *.pidl *.idl
 RECURSIVE             =
 EXCLUDE               =
@@ -73,7 +73,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/cosnaming
+HTML_OUTPUT           = html/libtao-doc/cosnaming
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -136,9 +136,9 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-        html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/cosnaming/TAO_CosNaming.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/cosnaming/TAO_CosNaming.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_cosnotification.doxygen b/TAO/etc/tao_cosnotification.doxygen
index 1cb221a6e07..8b8f78457b2 100644
--- a/TAO/etc/tao_cosnotification.doxygen
+++ b/TAO/etc/tao_cosnotification.doxygen
@@ -80,7 +80,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/cosnotification
+HTML_OUTPUT           = html/libtao-doc/cosnotification
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -143,12 +143,12 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-	html/tao/TAO.tag=.. \
-	html/tao/portableserver/TAO_PortableServer.tag=../portableserver \
-	html/tao/cosevent/TAO_CosEvent.tag=../cosevent \
-	html/tao/esf/TAO_ESF.tag=../esf
-GENERATE_TAGFILE      = html/tao/cosnotification/TAO_CosNotification.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver \
+                        html/libtao-doc/cosevent/TAO_CosEvent.tag=../cosevent \
+                        html/libtao-doc/esf/TAO_ESF.tag=../esf
+GENERATE_TAGFILE      = html/libtao-doc/cosnotification/TAO_CosNotification.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_costime.doxygen b/TAO/etc/tao_costime.doxygen
index 0eb0431c649..bdc96d73ade 100644
--- a/TAO/etc/tao_costime.doxygen
+++ b/TAO/etc/tao_costime.doxygen
@@ -50,7 +50,7 @@ WARN_FORMAT           = "$file:$line: $text"
 #---------------------------------------------------------------------------
 
 INPUT                 = TAO/orbsvcs/orbsvcs/TimeService.idl \
-                TAO/orbsvcs/orbsvcs/Time
+                        TAO/orbsvcs/orbsvcs/Time
 FILE_PATTERNS         = *.cpp *.h *.inl *.pidl *.idl
 RECURSIVE             =
 EXCLUDE               =
@@ -73,7 +73,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/costime
+HTML_OUTPUT           = html/libtao-doc/costime
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -136,10 +136,10 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-                        html/tao/TAO.tag=.. \
-                        html/tao/portableserver/TAO_PortableServer.tag=../portableserver
-GENERATE_TAGFILE      = html/tao/costime/TAO_CosTime.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver
+GENERATE_TAGFILE      = html/libtao-doc/costime/TAO_CosTime.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_costrader.doxygen b/TAO/etc/tao_costrader.doxygen
index 7e78a9761db..fc5eaa50678 100644
--- a/TAO/etc/tao_costrader.doxygen
+++ b/TAO/etc/tao_costrader.doxygen
@@ -76,7 +76,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/costrader
+HTML_OUTPUT           = html/libtao-doc/costrader
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -139,10 +139,10 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-	html/tao/TAO.tag=.. \
-	html/tao/portableserver/TAO_PortableServer.tag=../portableserver
-GENERATE_TAGFILE      = html/tao/costrader/TAO_CosTrader.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver
+GENERATE_TAGFILE      = html/libtao-doc/costrader/TAO_CosTrader.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_dynamicany.doxygen b/TAO/etc/tao_dynamicany.doxygen
index afaaed9257b..f79f0043319 100644
--- a/TAO/etc/tao_dynamicany.doxygen
+++ b/TAO/etc/tao_dynamicany.doxygen
@@ -73,7 +73,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/dynamicany
+HTML_OUTPUT           = html/libtao-doc/dynamicany
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -136,8 +136,8 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/dynamicany/TAO_DynamicAny.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/dynamicany/TAO_DynamicAny.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_dynamicinterface.doxygen b/TAO/etc/tao_dynamicinterface.doxygen
index 68ee2127606..c240837e86b 100644
--- a/TAO/etc/tao_dynamicinterface.doxygen
+++ b/TAO/etc/tao_dynamicinterface.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/dynamicinterface
+HTML_OUTPUT           = html/libtao-doc/dynamicinterface
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,8 +135,8 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/dynamicinterface/TAO_DynamicInterface.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/dynamicinterface/TAO_DynamicInterface.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_esf.doxygen b/TAO/etc/tao_esf.doxygen
index 34300d4d0d1..46373c0d91a 100644
--- a/TAO/etc/tao_esf.doxygen
+++ b/TAO/etc/tao_esf.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/esf
+HTML_OUTPUT           = html/libtao-doc/esf
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,10 +135,10 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=.. \
-			html/tao/portableserver/TAO_PortableServer.tag=../portableserver
-GENERATE_TAGFILE      = html/tao/esf/TAO_ESF.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver
+GENERATE_TAGFILE      = html/libtao-doc/esf/TAO_ESF.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_ifr.doxygen b/TAO/etc/tao_ifr.doxygen
index b57e6cc4fe7..2e80935d6c4 100644
--- a/TAO/etc/tao_ifr.doxygen
+++ b/TAO/etc/tao_ifr.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/ifr
+HTML_OUTPUT           = html/libtao-doc/ifr
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,12 +135,12 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=.. \
-			html/tao/portableserver/TAO_PortableServer.tag=../portableserver \
-			html/tao/iortable/TAO_IORTable.tag=../iortable \
-			html/tao/cosnaming/TAO_CosNaming.tag=../cosnaming
-GENERATE_TAGFILE      = html/tao/ifr/TAO_IFR.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver \
+                        html/libtao-doc/iortable/TAO_IORTable.tag=../iortable \
+                        html/libtao-doc/cosnaming/TAO_CosNaming.tag=../cosnaming
+GENERATE_TAGFILE      = html/libtao-doc/ifr/TAO_IFR.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_implrepo.doxygen b/TAO/etc/tao_implrepo.doxygen
index 20945ae8917..4e6b43b4939 100644
--- a/TAO/etc/tao_implrepo.doxygen
+++ b/TAO/etc/tao_implrepo.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/implrepo_service
+HTML_OUTPUT           = html/libtao-doc/implrepo_service
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,11 +135,11 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-	html/tao/TAO.tag=.. \
-	html/tao/portableserver/TAO_PortableServer.tag=../portableserver \
-        html/tao/iortable/TAO_IORTable.tag=../iortable
-GENERATE_TAGFILE      = html/tao/implrepo_service/TAO_ImplRepo.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver \
+                        html/libtao-doc/iortable/TAO_IORTable.tag=../iortable
+GENERATE_TAGFILE      = html/libtao-doc/implrepo_service/TAO_ImplRepo.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_iormanip.doxygen b/TAO/etc/tao_iormanip.doxygen
index 7f3881789aa..0561707964c 100644
--- a/TAO/etc/tao_iormanip.doxygen
+++ b/TAO/etc/tao_iormanip.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/iormanipulation
+HTML_OUTPUT           = html/libtao-doc/iormanipulation
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,9 +135,9 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/iormanipulation/TAO_IORManipulation.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/iormanipulation/TAO_IORManipulation.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_iortable.doxygen b/TAO/etc/tao_iortable.doxygen
index d0674c716c4..7eb76951863 100644
--- a/TAO/etc/tao_iortable.doxygen
+++ b/TAO/etc/tao_iortable.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/iortable
+HTML_OUTPUT           = html/libtao-doc/iortable
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,9 +135,9 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/iortable/TAO_IORTable.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/iortable/TAO_IORTable.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_pi.doxygen b/TAO/etc/tao_pi.doxygen
index 1529a593c0a..b5be0b2867a 100644
--- a/TAO/etc/tao_pi.doxygen
+++ b/TAO/etc/tao_pi.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/pi
+HTML_OUTPUT           = html/libtao-doc/pi
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,9 +135,9 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/pi/TAO_PI.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/pi/TAO_PI.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_pi_server.doxygen b/TAO/etc/tao_pi_server.doxygen
index 974a1114598..bc25efc4bef 100644
--- a/TAO/etc/tao_pi_server.doxygen
+++ b/TAO/etc/tao_pi_server.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/pi_server
+HTML_OUTPUT           = html/libtao-doc/pi_server
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,9 +135,9 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/pi_server/TAO_PI_Server.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/pi_server/TAO_PI_Server.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_portablegroup.doxygen b/TAO/etc/tao_portablegroup.doxygen
index 6ddcfded6d6..80b255debd8 100644
--- a/TAO/etc/tao_portablegroup.doxygen
+++ b/TAO/etc/tao_portablegroup.doxygen
@@ -75,7 +75,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/portablegroup
+HTML_OUTPUT           = html/libtao-doc/portablegroup
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -138,10 +138,10 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-	html/tao/TAO.tag=.. \
-	html/tao/portableserver/TAO_PortableServer.tag=../portableserver
-GENERATE_TAGFILE      = html/tao/portablegroup/TAO_PortableGroup.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver
+GENERATE_TAGFILE      = html/libtao-doc/portablegroup/TAO_PortableGroup.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_portableserver.doxygen b/TAO/etc/tao_portableserver.doxygen
index a98e74baf7b..87a228ad556 100644
--- a/TAO/etc/tao_portableserver.doxygen
+++ b/TAO/etc/tao_portableserver.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/portableserver
+HTML_OUTPUT           = html/libtao-doc/portableserver
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,9 +135,9 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/portableserver/TAO_PortableServer.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/portableserver/TAO_PortableServer.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_pss.doxygen b/TAO/etc/tao_pss.doxygen
index bffd82fca7d..d64228dffce 100644
--- a/TAO/etc/tao_pss.doxygen
+++ b/TAO/etc/tao_pss.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/pss
+HTML_OUTPUT           = html/libtao-doc/pss
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,10 +135,10 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=.. \
-			html/tao/portableserver/TAO_PortableServer.tag=../portableserver
-GENERATE_TAGFILE      = html/tao/pss/TAO_PSS.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver
+GENERATE_TAGFILE      = html/libtao-doc/pss/TAO_PSS.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_rtcorba.doxygen b/TAO/etc/tao_rtcorba.doxygen
index 0b6d9e684a1..a4fcaa639ba 100644
--- a/TAO/etc/tao_rtcorba.doxygen
+++ b/TAO/etc/tao_rtcorba.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/rtcorba
+HTML_OUTPUT           = html/libtao-doc/rtcorba
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,9 +135,9 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/rtcorba/TAO_RTCORBA.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/rtcorba/TAO_RTCORBA.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_rtevent.doxygen b/TAO/etc/tao_rtevent.doxygen
index 3cfb3b9ec4c..605ce20050e 100644
--- a/TAO/etc/tao_rtevent.doxygen
+++ b/TAO/etc/tao_rtevent.doxygen
@@ -81,7 +81,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/rtevent
+HTML_OUTPUT           = html/libtao-doc/rtevent
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -144,11 +144,11 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-	html/tao/TAO.tag=.. \
-	html/tao/portableserver/TAO_PortableServer.tag=../portableserver \
-	html/tao/esf/TAO_ESF.tag=../esf
-GENERATE_TAGFILE      = html/tao/rtevent/TAO_RTEvent.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver \
+                        html/libtao-doc/esf/TAO_ESF.tag=../esf
+GENERATE_TAGFILE      = html/libtao-doc/rtevent/TAO_RTEvent.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_rtportableserver.doxygen b/TAO/etc/tao_rtportableserver.doxygen
index 965d132bc34..b28768d4240 100644
--- a/TAO/etc/tao_rtportableserver.doxygen
+++ b/TAO/etc/tao_rtportableserver.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/rtportableserver
+HTML_OUTPUT           = html/libtao-doc/rtportableserver
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,9 +135,9 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/rtportableserver/TAO_RTPortableServer.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/rtportableserver/TAO_RTPortableServer.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_security.doxygen b/TAO/etc/tao_security.doxygen
index adfd5e8fd96..6d901748ec8 100644
--- a/TAO/etc/tao_security.doxygen
+++ b/TAO/etc/tao_security.doxygen
@@ -77,7 +77,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/security
+HTML_OUTPUT           = html/libtao-doc/security
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -140,10 +140,10 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=.. \
-			html/tao/portableserver/TAO_PortableServer.tag=../portableserver
-GENERATE_TAGFILE      = html/tao/security/TAO_Security.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver
+GENERATE_TAGFILE      = html/libtao-doc/security/TAO_Security.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_smartproxies.doxygen b/TAO/etc/tao_smartproxies.doxygen
index 4ed9a156755..585cee2403d 100644
--- a/TAO/etc/tao_smartproxies.doxygen
+++ b/TAO/etc/tao_smartproxies.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         = TAO_
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/smartproxies
+HTML_OUTPUT           = html/libtao-doc/smartproxies
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,8 +135,8 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/smartproxies/TAO_SmartProxies.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/smartproxies/TAO_SmartProxies.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_ssliop.doxygen b/TAO/etc/tao_ssliop.doxygen
index 83d45f72911..4d1e8bca8e6 100644
--- a/TAO/etc/tao_ssliop.doxygen
+++ b/TAO/etc/tao_ssliop.doxygen
@@ -77,7 +77,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/ssliop
+HTML_OUTPUT           = html/libtao-doc/ssliop
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -140,11 +140,11 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=.. \
-			html/tao/portableserver/TAO_PortableServer.tag=../portableserver \
-			html/tao/security/TAO_Security.tag=../security
-GENERATE_TAGFILE      = html/tao/ssliop/TAO_SSLIOP.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/portableserver/TAO_PortableServer.tag=../portableserver \
+                        html/libtao-doc/security/TAO_Security.tag=../security
+GENERATE_TAGFILE      = html/libtao-doc/ssliop/TAO_SSLIOP.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_strategies.doxygen b/TAO/etc/tao_strategies.doxygen
index 131390d24a4..10a04d22c6f 100644
--- a/TAO/etc/tao_strategies.doxygen
+++ b/TAO/etc/tao_strategies.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/strategies
+HTML_OUTPUT           = html/libtao-doc/strategies
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,8 +135,8 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace html/tao/TAO.tag=..
-GENERATE_TAGFILE      = html/tao/strategies/TAO_Strategies.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc html/libtao-doc/TAO.tag=..
+GENERATE_TAGFILE      = html/libtao-doc/strategies/TAO_Strategies.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_transportcurrent.doxygen b/TAO/etc/tao_transportcurrent.doxygen
index c3e66c02ccf..4fb7755ae42 100644
--- a/TAO/etc/tao_transportcurrent.doxygen
+++ b/TAO/etc/tao_transportcurrent.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/transportcurrent
+HTML_OUTPUT           = html/libtao-doc/transportcurrent
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,10 +135,10 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-                        html/tao/TAO.tag=.. \
-                        html/tao/pi/TAO_PI.tag=../pi
-GENERATE_TAGFILE      = html/tao/transportcurrent/TAO_TransportCurrent.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/pi/TAO_PI.tag=../pi
+GENERATE_TAGFILE      = html/libtao-doc/transportcurrent/TAO_TransportCurrent.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl
 
diff --git a/TAO/etc/tao_ziop.doxygen b/TAO/etc/tao_ziop.doxygen
index 11f5a1df166..69e6dc3ea8b 100644
--- a/TAO/etc/tao_ziop.doxygen
+++ b/TAO/etc/tao_ziop.doxygen
@@ -72,7 +72,7 @@ IGNORE_PREFIX         =
 #---------------------------------------------------------------------------
 
 GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/ziop
+HTML_OUTPUT           = html/libtao-doc/ziop
 HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
@@ -135,10 +135,10 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-TAGFILES              = html/ace/ACE.tag=../../ace \
-                        html/tao/TAO.tag=.. \
-                        html/tao/compression/TAO_Compression.tag=../compression
-GENERATE_TAGFILE      = html/tao/ziop/TAO_ZIOP.tag
+TAGFILES              = html/libace-doc/ACE.tag=../../libace-doc \
+                        html/libtao-doc/TAO.tag=.. \
+                        html/libtao-doc/compression/TAO_Compression.tag=../compression
+GENERATE_TAGFILE      = html/libtao-doc/ziop/TAO_ZIOP.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl