Index: src/search.c
==================================================================
--- src/search.c
+++ src/search.c
@@ -633,15 +633,16 @@
   db_finalize(&q);
 }
 
 #if INTERFACE
 /* What to search for */
-#define SRCH_CKIN   0x0001    /* Search over check-in comments */
-#define SRCH_DOC    0x0002    /* Search over embedded documents */
-#define SRCH_TKT    0x0004    /* Search over tickets */
-#define SRCH_WIKI   0x0008    /* Search over wiki */
-#define SRCH_ALL    0x000f    /* Search over everything */
+#define SRCH_CKIN     0x0001    /* Search over check-in comments */
+#define SRCH_DOC      0x0002    /* Search over embedded documents */
+#define SRCH_TKT      0x0004    /* Search over tickets */
+#define SRCH_WIKI     0x0008    /* Search over wiki */
+#define SRCH_TECHNOTE 0x0010    /* Search over tech notes */
+#define SRCH_ALL      0x001f    /* Search over everything */
 #endif
 
 /*
 ** Remove bits from srchFlags which are disallowed by either the
 ** current server configuration or by user permissions.
@@ -648,17 +649,18 @@
 */
 unsigned int search_restrict(unsigned int srchFlags){
   static unsigned int knownGood = 0;
   static unsigned int knownBad = 0;
   static const struct { unsigned m; const char *zKey; } aSetng[] = {
-     { SRCH_CKIN,   "search-ci"   },
-     { SRCH_DOC,    "search-doc"  },
-     { SRCH_TKT,    "search-tkt"  },
-     { SRCH_WIKI,   "search-wiki" },
+     { SRCH_CKIN,     "search-ci"   },
+     { SRCH_DOC,      "search-doc"  },
+     { SRCH_TKT,      "search-tkt"  },
+     { SRCH_WIKI,     "search-wiki" },
+     { SRCH_TECHNOTE, "search-technote" },
   };
   int i;
-  if( g.perm.Read==0 )   srchFlags &= ~(SRCH_CKIN|SRCH_DOC);
+  if( g.perm.Read==0 )   srchFlags &= ~(SRCH_CKIN|SRCH_DOC|SRCH_TECHNOTE);
   if( g.perm.RdTkt==0 )  srchFlags &= ~(SRCH_TKT);
   if( g.perm.RdWiki==0 ) srchFlags &= ~(SRCH_WIKI);
   for(i=0; i<count(aSetng); i++){
     unsigned int m = aSetng[i].m;
     if( (srchFlags & m)==0 ) continue;
@@ -770,10 +772,30 @@
       "         datetime(tkt_mtime),"
       "         search_snippet()"
       "    FROM ticket"
       "   WHERE search_match(title('t',tkt_id,NULL),body('t',tkt_id,NULL));"
     );
+  }
+  if( (srchFlags & SRCH_TECHNOTE)!=0 ){
+    db_multi_exec(
+      "WITH technote(uuid,rid,mtime) AS ("
+      "  SELECT substr(tagname,7), tagxref.rid, max(tagxref.mtime)"
+      "    FROM tag, tagxref"
+      "   WHERE tag.tagname GLOB 'event-*'"
+      "     AND tagxref.tagid=tag.tagid"
+      "   GROUP BY 1"
+      ")"
+      "INSERT INTO x(label,url,score,id,date,snip)"
+      "  SELECT printf('Tech Note: %%s',uuid),"
+      "         printf('/technote/%%s',uuid),"
+      "         search_score(),"
+      "         'e'||rid,"
+      "         datetime(mtime),"
+      "         search_snippet()"
+      "    FROM technote"
+      "   WHERE search_match('',body('e',rid,NULL));"
+    );
   }
 }
 
 /*
 ** Number of significant bits in a u32
@@ -886,14 +908,15 @@
     zPattern
   );
   if( srchFlags!=SRCH_ALL ){
     const char *zSep = " AND (";
     static const struct { unsigned m; char c; } aMask[] = {
-       { SRCH_CKIN,  'c' },
-       { SRCH_DOC,   'd' },
-       { SRCH_TKT,   't' },
-       { SRCH_WIKI,  'w' },
+       { SRCH_CKIN,     'c' },
+       { SRCH_DOC,      'd' },
+       { SRCH_TKT,      't' },
+       { SRCH_WIKI,     'w' },
+       { SRCH_TECHNOTE, 'e' },
     };
     int i;
     for(i=0; i<count(aMask); i++){
       if( srchFlags & aMask[i].m ){
         blob_appendf(&sql, "%sftsdocs.type='%c'", zSep, aMask[i].c);
@@ -1037,14 +1060,15 @@
   const char *zDisable2;
   const char *zPattern;
   int fDebug = PB("debug");
   srchFlags = search_restrict(srchFlags);
   switch( srchFlags ){
-    case SRCH_CKIN:  zType = " Check-ins";  zClass = "Ckin";  break;
-    case SRCH_DOC:   zType = " Docs";       zClass = "Doc";   break;
-    case SRCH_TKT:   zType = " Tickets";    zClass = "Tkt";   break;
-    case SRCH_WIKI:  zType = " Wiki";       zClass = "Wiki";  break;
+    case SRCH_CKIN:     zType = " Check-ins";  zClass = "Ckin"; break;
+    case SRCH_DOC:      zType = " Docs";       zClass = "Doc";  break;
+    case SRCH_TKT:      zType = " Tickets";    zClass = "Tkt";  break;
+    case SRCH_WIKI:     zType = " Wiki";       zClass = "Wiki"; break;
+    case SRCH_TECHNOTE: zType = " Tech Notes"; zClass = "Note"; break;
   }
   if( srchFlags==0 ){
     zDisable1 = " disabled";
     zDisable2 = " disabled";
     zPattern = "";
@@ -1060,15 +1084,16 @@
     @ <div class='searchForm'>
   }
   @ <input type="text" name="s" size="40" value="%h(zPattern)"%s(zDisable1)>
   if( useYparam && (srchFlags & (srchFlags-1))!=0 && useYparam ){
     static const struct { char *z; char *zNm; unsigned m; } aY[] = {
-       { "all",  "All",        SRCH_ALL  },
-       { "c",    "Check-ins",  SRCH_CKIN },
-       { "d",    "Docs",       SRCH_DOC  },
-       { "t",    "Tickets",    SRCH_TKT  },
-       { "w",    "Wiki",       SRCH_WIKI },
+       { "all",  "All",        SRCH_ALL      },
+       { "c",    "Check-ins",  SRCH_CKIN     },
+       { "d",    "Docs",       SRCH_DOC      },
+       { "t",    "Tickets",    SRCH_TKT      },
+       { "w",    "Wiki",       SRCH_WIKI     },
+       { "e",    "Tech Notes", SRCH_TECHNOTE },
     };
     const char *zY = PD("y","all");
     unsigned newFlags = srchFlags;
     int i;
     @ <select size='1' name='y'>
@@ -1116,10 +1141,11 @@
 **    y=TYPE          What to search.
 **                      c -> check-ins
 **                      d -> documentation
 **                      t -> tickets
 **                      w -> wiki
+**                      e -> tech notes
 **                    all -> everything
 */
 void search_page(void){
   login_check_credentials();
   style_header("Search");
@@ -1222,10 +1248,11 @@
 **
 **    cType:            d      Embedded documentation
 **                      w      Wiki page
 **                      c      Check-in comment
 **                      t      Ticket text
+**                      e      Tech note
 **
 **    rid               The RID of an artifact that defines the object
 **                      being searched.
 **
 **    zName             Name of the object being searched.  This is used
@@ -1247,12 +1274,14 @@
       blob_to_utf8_no_bom(&doc, 0);
       get_stext_by_mimetype(&doc, mimetype_from_name(zName), pOut);
       blob_reset(&doc);
       break;
     }
+    case 'e':     /* Tech Notes */
     case 'w': {   /* Wiki */
-      Manifest *pWiki = manifest_get(rid, CFTYPE_WIKI,0);
+      Manifest *pWiki = manifest_get(rid,
+          cType == 'e' ? CFTYPE_EVENT : CFTYPE_WIKI, 0);
       Blob wiki;
       if( pWiki==0 ) break;
       blob_init(&wiki, pWiki->zWiki, -1);
       get_stext_by_mimetype(&wiki, wiki_filter_mimetypes(pWiki->zMimetype),
                             pOut);
@@ -1367,11 +1396,11 @@
 ** COMMAND: test-search-stext
 **
 ** Usage: fossil test-search-stext TYPE RID NAME
 **
 ** Compute the search text for document TYPE-RID whose name is NAME.
-** The TYPE is one of "c", "d", "t", or "w".  The RID is the document
+** The TYPE is one of "c", "d", "t", "w", or "e".  The RID is the document
 ** ID.  The NAME is used to figure out a mimetype to use for formatting
 ** the raw document text.
 */
 void test_search_stext(void){
   Blob out;
@@ -1484,10 +1513,14 @@
   );
   db_multi_exec(
     "INSERT OR IGNORE INTO ftsdocs(type,rid,idxed)"
     "  SELECT 't', tkt_id, 0 FROM ticket;"
   );
+  db_multi_exec(
+    "INSERT OR IGNORE INTO ftsdocs(type,rid,name,idxed)"
+    "  SELECT 'e', objid, comment, 0 FROM event WHERE type='e';"
+  );
 }
 
 /*
 ** The document described by cType,rid,zName is about to be added or
 ** updated.  If the document has already been indexed, then unindex it
@@ -1508,19 +1541,19 @@
     db_multi_exec(
        "REPLACE INTO ftsdocs(type,rid,name,idxed)"
        " VALUES(%Q,%d,%Q,0)",
        zType, rid, zName
     );
-    if( cType=='w' ){
+    if( cType=='w' || cType=='e' ){
       db_multi_exec(
         "DELETE FROM ftsidx WHERE docid IN"
-        "    (SELECT rowid FROM ftsdocs WHERE type='w' AND name=%Q AND idxed)",
-        zName
+        "    (SELECT rowid FROM ftsdocs WHERE type='%c' AND name=%Q AND idxed)",
+        cType, zName
       );
       db_multi_exec(
-        "DELETE FROM ftsdocs WHERE type='w' AND name=%Q AND rid!=%d",
-        zName, rid
+        "DELETE FROM ftsdocs WHERE type='%c' AND name=%Q AND rid!=%d",
+        cType, zName, rid
       );
     }
   }
 }
 
@@ -1647,10 +1680,34 @@
     "            tagxref.mtime"
     "       FROM tagxref WHERE tagxref.rid=ftsdocs.rid)"
     " WHERE ftsdocs.type='w' AND NOT ftsdocs.idxed"
   );
 }
+
+/*
+** Deal with all of the unindexed 'e' terms in FTSDOCS
+*/
+static void search_update_technote_index(void){
+  db_multi_exec(
+    "INSERT INTO ftsidx(docid,title,body)"
+    " SELECT rowid, title('e',rid,NULL),body('e',rid,NULL) FROM ftsdocs"
+    "  WHERE type='e' AND NOT idxed;"
+  );
+  if( db_changes()==0 ) return;
+  db_multi_exec(
+    "UPDATE ftsdocs SET idxed=1,"
+    "  (name,label,url,mtime) = "
+    "    (SELECT ftsdocs.name,"
+    "            'Tech Note: '||ftsdocs.name,"
+    "            '/technote/'||substr(tag.tagname,7),"
+    "            tagxref.mtime"
+    "       FROM tagxref, tag USING (tagid)"
+    "      WHERE tagxref.rid=ftsdocs.rid"
+    "        AND tagname GLOB 'event-*')"
+    " WHERE ftsdocs.type='e' AND NOT ftsdocs.idxed"
+  );
+}
 
 /*
 ** Deal with all of the unindexed entries in the FTSDOCS table - that
 ** is to say, all the entries with FTSDOCS.IDXED=0.  Add them to the
 ** index.
@@ -1667,10 +1724,13 @@
     search_update_ticket_index();
   }
   if( srchFlags & SRCH_WIKI ){
     search_update_wiki_index();
   }
+  if( srchFlags & SRCH_TECHNOTE ){
+    search_update_technote_index();
+  }
 }
 
 /*
 ** Construct, prepopulate, and then update the full-text index.
 */
@@ -1694,14 +1754,14 @@
 **     reindex            Rebuild the search index.  This is a no-op if
 **                        index search is disabled
 **
 **     index (on|off)     Turn the search index on or off
 **
-**     enable cdtw        Enable various kinds of search. c=Check-ins,
-**                        d=Documents, t=Tickets, w=Wiki.
+**     enable cdtwe       Enable various kinds of search. c=Check-ins,
+**                        d=Documents, t=Tickets, w=Wiki, e=Tech Notes.
 **
-**     disable cdtw       Disable various kinds of search
+**     disable cdtwe      Disable various kinds of search
 **
 **     stemmer (on|off)   Turn the Porter stemmer on or off for indexed
 **                        search.  (Unindexed search is never stemmed.)
 **
 ** The current search settings are displayed after any changes are applied.
@@ -1714,14 +1774,15 @@
      { 3,  "disable"  },
      { 4,  "enable"   },
      { 5,  "stemmer"  },
   };
   static const struct { char *zSetting; char *zName; char *zSw; } aSetng[] = {
-     { "search-ckin",   "check-in search:",  "c" },
-     { "search-doc",    "document search:",  "d" },
-     { "search-tkt",    "ticket search:",    "t" },
-     { "search-wiki",   "wiki search:",      "w" },
+     { "search-ckin",     "check-in search:",  "c" },
+     { "search-doc",      "document search:",  "d" },
+     { "search-tkt",      "ticket search:",    "t" },
+     { "search-wiki",     "wiki search:",      "w" },
+     { "search-technote", "tech note search:", "e" },
   };
   char *zSubCmd = 0;
   int i, j, n;
   int iCmd = 0;
   int iAction = 0;
@@ -1779,21 +1840,21 @@
     search_rebuild_index();
   }
 
   /* Always show the status before ending */
   for(i=0; i<count(aSetng); i++){
-    fossil_print("%-16s %s\n", aSetng[i].zName,
+    fossil_print("%-17s %s\n", aSetng[i].zName,
        db_get_boolean(aSetng[i].zSetting,0) ? "on" : "off");
   }
-  fossil_print("%-16s %s\n", "Porter stemmer:",
+  fossil_print("%-17s %s\n", "Porter stemmer:",
        db_get_boolean("search-stemmer",0) ? "on" : "off");
   if( search_index_exists() ){
-    fossil_print("%-16s enabled\n", "full-text index:");
-    fossil_print("%-16s %d\n", "documents:",
+    fossil_print("%-17s enabled\n", "full-text index:");
+    fossil_print("%-17s %d\n", "documents:",
        db_int(0, "SELECT count(*) FROM ftsdocs"));
   }else{
-    fossil_print("%-16s disabled\n", "full-text index:");
+    fossil_print("%-17s disabled\n", "full-text index:");
   }
   db_end_transaction(0);
 }
 
 /*

Index: src/setup.c
==================================================================
--- src/setup.c
+++ src/setup.c
@@ -2281,11 +2281,13 @@
   @ <br />
   onoff_attribute("Search Documents", "search-doc", "sd", 0, 0);
   @ <br />
   onoff_attribute("Search Tickets", "search-tkt", "st", 0, 0);
   @ <br />
-  onoff_attribute("Search Wiki","search-wiki", "sw", 0, 0);
+  onoff_attribute("Search Wiki", "search-wiki", "sw", 0, 0);
+  @ <br />
+  onoff_attribute("Search Tech Notes", "search-technote", "se", 0, 0);
   @ <hr />
   @ <p><input type="submit"  name="submit" value="Apply Changes" /></p>
   @ <hr />
   if( P("fts0") ){
     search_drop_index();

Index: www/changes.wiki
==================================================================
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,10 +1,11 @@
 <title>Change Log</title>
 
 <a name='v2_4'></a>
 <h2>Changes for Version 2.4 (TBD)</h2>
 
+  *  Add tech note search capability.
   *  Add the -r|--revision option to the annotate command.
   *  Support for URL Aliases added.  URL Aliases allow an administrator
      to define their own URLs on the web interface that are rewritten to
      built-in URLs with specific parameters.
   *  Provide separate on-line help screens for each setting.