5 files changed, 30 insertions, 8 deletions
diff --git a/doc/config.doc b/doc/config.doc
index db181dd..db7cd16 100644
--- a/doc/config.doc
+++ b/doc/config.doc
@@ -195,6 +195,9 @@ followed by the descriptions of the tags grouped by category.
 \refitem cfg_project_number PROJECT_NUMBER
 \refitem cfg_qhp_namespace QHP_NAMESPACE
 \refitem cfg_qhp_virtual_folder QHP_VIRTUAL_FOLDER
+\refitem cfg_qhp_custom_filter_name QHP_CUSTOM_FILTER_NAME
+\refitem cfg_qhp_cust_filter_attrs QHP_CUST_FILTER_ATTRS
+\refitem cfg_qhp_sect_filter_attrs QHP_SECT_FILTER_ATTRS
 \refitem cfg_qhg_location QHG_LOCATION
 \refitem cfg_qt_autobrief QT_AUTOBRIEF
 \refitem cfg_quiet QUIET
@@ -1384,6 +1387,25 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn"
  generating Qt Help Project output. For more information please see
  <a href="http://doc.trolltech.com/qthelpproject.html#virtual-folders">Qt Help Project / Virtual Folders</a>.
 
+\anchor cfg_qhp_custom_filter_name
+<dt>\c QHP_CUSTOM_FILTER_NAME <dd>
+  \addindex QHP_CUSTOM_FILTER_NAME
+  If QHP_CUSTOM_FILTER_NAME is set, it specifies the name of a custom filter to add. For more information please see
+  <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+\anchor cfg_qhp_cust_filter_attrs
+<dt>\c QHP_CUST_FILTER_ATTRS <dd>
+  \addindex QHP_CUST_FILTER_ATTRS
+  The QHP_CUST_FILTER_ATTRIBUTES tag specifies the list of the attributes of the custom filter to add.
+  For more information please see
+  <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+\anchor cfg_qhp_sect_filter_attrs
+<dt>\c QHP_SECT_FILTER_ATTRS <dd>
+  \addindex QHP_SECT_FILTER_ATTRS
+  The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's filter section matches.
+  <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+
 \anchor cfg_qhg_location
 <dt>\c QHG_LOCATION <dd>
  \addindex QHG_LOCATION
diff --git a/doc/features.doc b/doc/features.doc
index bfc62b5..b1ebf0c 100644
--- a/doc/features.doc
+++ b/doc/features.doc
@@ -80,11 +80,11 @@
 
 Although doxygen can now be used in any project written in a language that is 
 supported by doxygen, initially it was specifically designed to be used for projects 
-that make use of Troll Tech's 
+that make use of Qt Software's 
 <A HREF="http://www.trolltech.com/products/qt.html">Qt toolkit</A>. I have tried to 
 make doxygen `Qt-compatible'. That is: Doxygen can read the documentation contained in 
 the Qt source code and create a class browser that looks quite similar to the 
-one that is generated by Troll Tech. Doxygen understands the C++ extensions 
+one that is generated by Qt Software. Doxygen understands the C++ extensions 
 used by Qt such as signals and slots and many of the markup commands used in the Qt sources.
 
 Doxygen can also automatically generate links to existing documentation
diff --git a/doc/index.doc b/doc/index.doc
index 87e419f..0debece 100644
--- a/doc/index.doc
+++ b/doc/index.doc
@@ -175,7 +175,7 @@ Thanks go to:
     The first version of doxygen borrowed some code of an old version of DOC++. 
     Although I have rewritten practically all code since then, DOC++ has still 
     given me a good start in writing doxygen.
-<li>All people at Troll Tech, for creating a beautiful GUI Toolkit
+<li>All people at Qt Software, for creating a beautiful GUI Toolkit
     (which is very useful as a Windows/Unix platform abstraction layer :-)
 <li>Kevin McBride for maintaining the subversion reporsitory for doxygen.
 <li>My brother Frank
diff --git a/doc/install.doc b/doc/install.doc
index 41961ec..77530fa 100644
--- a/doc/install.doc
+++ b/doc/install.doc
@@ -55,7 +55,7 @@ To take full advantage of doxygen's features the following additional
 tools should be installed.
 
 <ul>
-<li>Troll Tech's GUI toolkit 
+<li>Qt Software's GUI toolkit 
     <A HREF="http://www.trolltech.com/products/qt.html">Qt</A>
     \latexonly(see {\tt http://www.trolltech.com/products/qt.html})\endlatexonly
     \addindex Qt
@@ -505,7 +505,7 @@ Here is what is required:
     For doxywizard, a complete Qt library is 
     still a requirement however. A commercial license to build
     doxywizard with the latest Qt library was kindly donated to me
-    by the nice people at <a href="http://www.trolltech.com">TrollTech</a>. 
+    by the nice people at <a href="http://www.trolltech.com">Qt Software</a>. 
     See doxygen download page for a link. 
    
 <li>If you used WinZip to extract the tar archive it will (apparently) not 
@@ -589,7 +589,7 @@ You can download it from
 If you want to produce Qt Compressed Help files (see \ref 
 cfg_qhg_location "QHG_LOCATION") in the config file, then 
 you need qhelpgenerator which is part of Qt. 
-You can download Qt from <a href="http://trolltech.com/downloads/">Trolltech Downloads</a>.
+You can download Qt from <a href="http://trolltech.com/downloads/">Qt Software Downloads</a>.
 
 In order to generate PDF output or use scientific formulas you will also need to
 install <a href="http://en.wikipedia.org/wiki/LaTeX">LaTeX</a> and 
@@ -662,7 +662,7 @@ features:
     cfg_qhelgenerator_loc "QHG_LOCATION") in the config file,
     then you need qhelpgenerator which is part of Qt. 
     You can download Qt from
-    <a href="http://trolltech.com/downloads/">Trolltech Downloads</a>.
+    <a href="http://trolltech.com/downloads/">Qt Software Downloads</a>.
 
 <li><a href="http://www.graphviz.org/">
     the Graph visualization toolkit version 1.8.10</a><br>
diff --git a/doc/lists.doc b/doc/lists.doc
index 649d83c..c55277a 100644
--- a/doc/lists.doc
+++ b/doc/lists.doc
@@ -103,7 +103,7 @@ Here is the above example with HTML commands:
 
 <b>Using \\arg or \@li</b>
 
-For compatibility with the Troll Tech's internal documentation tool and
+For compatibility with the Qt Software's internal documentation tool qdoc and
 with KDoc, doxygen has two commands that can be used to create simple
 unnested lists.