From 9e2573bac15e39dc4f3545351ad87e221b4785e7 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Tue, 7 Jul 2009 13:54:39 +0200
Subject: Updated docs to mention pattern matching in help project file lists.

Reviewed-by: kh
---
 doc/src/examples/simpletextviewer.qdoc    |  7 +------
 doc/src/qthelp.qdoc                       | 14 ++++++++------
 doc/src/snippets/code/doc_src_qthelp.qdoc |  6 ++----
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/doc/src/examples/simpletextviewer.qdoc b/doc/src/examples/simpletextviewer.qdoc
index 87eae57..2531a86 100644
--- a/doc/src/examples/simpletextviewer.qdoc
+++ b/doc/src/examples/simpletextviewer.qdoc
@@ -198,12 +198,7 @@
           <file>openfile.html</file>
           <file>wildcardmatching.html</file>
           <file>images/browse.png</file>
-          <file>images/fadedfilemenu.png</file>
-          <file>images/filedialog.png</file>
-          <file>images/handbook.png</file>
-          <file>images/mainwindow.png</file>
-          <file>images/open.png</file>
-          <file>images/wildcard.png</file>
+          <file>images/*.png</file>
         </files>
       </filterSection>
     </QtHelpProject>
diff --git a/doc/src/qthelp.qdoc b/doc/src/qthelp.qdoc
index b5395c9..92c9609 100644
--- a/doc/src/qthelp.qdoc
+++ b/doc/src/qthelp.qdoc
@@ -398,11 +398,13 @@
 
     Finally, the actual documentation files have to be listed. Make sure
     that all files neccessary to display the help are mentioned, i.e.
-    stylesheets or similar files need to be there as well. The file, like all
+    stylesheets or similar files need to be there as well. The files, like all
     file references in a Qt help project, are relative to the help project file
-    itself. All listed files will be compressed and written to the Qt compressed
-    help file. So, in the end, one single Qt help file contains all
-    documentation files along with the contents and indices. \note The
-    referenced files must be inside the same directory (or within a subdirectory)
-    as the help project file. An absolute file path is not supported either.
+    itself. As the example shows, files (but not directories) can also be 
+    specified as patterns using wildcards. All listed files will be compressed 
+    and written to the Qt compressed help file. So, in the end, one single Qt 
+    help file contains all documentation files along with the contents and 
+    indices. \note The referenced files must be inside the same directory 
+    (or within a subdirectory) as the help project file. An absolute file path 
+    is not supported either.
 */
diff --git a/doc/src/snippets/code/doc_src_qthelp.qdoc b/doc/src/snippets/code/doc_src_qthelp.qdoc
index 11d231f..949e2a5 100644
--- a/doc/src/snippets/code/doc_src_qthelp.qdoc
+++ b/doc/src/snippets/code/doc_src_qthelp.qdoc
@@ -92,8 +92,7 @@ if (links.count()) {
         </keywords>
         <files>
             <file>classic.css</file>
-            <file>index.html</file>
-            <file>doc.html</file>
+            <file>*.html</file>
         </files>
     </filterSection>
 </QtHelpProject>
@@ -154,8 +153,7 @@ if (links.count()) {
 ...
 <files>
     <file>classic.css</file>
-    <file>index.html</file>
-    <file>doc.html</file>
+    <file>*.html</file>
 </files>
 ...
 //! [13]
-- 
cgit v0.12