Index: www/mkindex.tcl
==================================================================
--- www/mkindex.tcl
+++ www/mkindex.tcl
@@ -63,17 +63,26 @@
   tickets.wiki {The Fossil Ticket System}
   theory1.wiki {Thoughts On The Design Of The Fossil DVCS}
   webui.wiki {The Fossil Web Interface}
   wikitheory.wiki {Wiki In Fossil}
 }
+
+proc emit_links {ch links} {
+  foreach entry $links {
+    foreach {title file} $entry break
+    puts $ch "<li><a href=\"$file\">$title</a></li>"
+  }
+}
 
 set permindex {}
+set canonindex {}
 set stopwords {fossil and a in of on the to are about used by for or}
 foreach {file title} $doclist {
   set n [llength $title]
   regsub -all {\s+} $title { } title
   lappend permindex [list $title $file]
+  lappend canonindex [list $title $file]
   for {set i 0} {$i<$n-1} {incr i} {
     set prefix [lrange $title 0 $i]
     set suffix [lrange $title [expr {$i+1}] end]
     set firstword [string tolower [lindex $suffix 0]]
     if {[lsearch $stopwords $firstword]<0} {
@@ -80,10 +89,11 @@
       lappend permindex [list "$suffix &mdash; $prefix" $file]
     }
   }
 }
 set permindex [lsort -dict -index 0 $permindex]
+set canonindex [lsort -dict -index 0 $canonindex]
 set out [open permutedindex.html w]
 fconfigure $out -encoding utf-8 -translation lf
 puts $out \
 "<div class='fossil-doc' data-title='Index Of Fossil Documentation'>"
 puts $out {
@@ -100,14 +110,18 @@
 <li> <a href='build.wiki'>Compiling and installing Fossil</a>
 <li> <a href='../COPYRIGHT-BSD2.txt'>License</a>
 <li> <a href='http://www.fossil-scm.org/schimpf-book/home'>Jim Schimpf's
 book</a>
 <li> <a href='../../../help'>Command-line help</a>
+</ul>
+<h2>Canonical Index:</h2>
+(list of unique documents)
+<ul>}
+emit_links $out $canonindex
+puts $out {
 </ul>
 <a name="pindex"></a>
 <h2>Permuted Index:</h2>
+(ordered by keywords - multiple entries linking to the same document)
 <ul>}
-foreach entry $permindex {
-  foreach {title file} $entry break
-  puts $out "<li><a href=\"$file\">$title</a></li>"
-}
+emit_links $out $permindex
 puts $out "</ul></div>"

Index: www/permutedindex.html
==================================================================
--- www/permutedindex.html
+++ www/permutedindex.html
@@ -13,13 +13,74 @@
 <li> <a href='build.wiki'>Compiling and installing Fossil</a>
 <li> <a href='../COPYRIGHT-BSD2.txt'>License</a>
 <li> <a href='http://www.fossil-scm.org/schimpf-book/home'>Jim Schimpf's
 book</a>
 <li> <a href='../../../help'>Command-line help</a>
+</ul>
+<h2>Canonical Index:</h2>
+(list of unique documents)
+<ul>
+<li><a href="tech_overview.wiki">A Technical Overview Of The Design And Implementation Of Fossil</a></li>
+<li><a href="adding_code.wiki">Adding New Features To Fossil</a></li>
+<li><a href="branching.wiki">Branching, Forking, Merging, and Tagging</a></li>
+<li><a href="bugtheory.wiki">Bug Tracking In Fossil</a></li>
+<li><a href="checkin_names.wiki">Check-in And Version Names</a></li>
+<li><a href="checkin.wiki">Check-in Checklist</a></li>
+<li><a href="foss-cklist.wiki">Checklist For Successful Open-Source Projects</a></li>
+<li><a href="build.wiki">Compiling and Installing Fossil</a></li>
+<li><a href="contribute.wiki">Contributing Code or Documentation To The Fossil Project</a></li>
+<li><a href="copyright-release.html">Contributor License Agreement</a></li>
+<li><a href="private.wiki">Creating, Syncing, and Deleting Private Branches</a></li>
+<li><a href="custom_ticket.wiki">Customizing The Ticket System</a></li>
+<li><a href="antibot.wiki">Defense against Spiders and Bots</a></li>
+<li><a href="embeddeddoc.wiki">Embedded Project Documentation</a></li>
+<li><a href="event.wiki">Events</a></li>
+<li><a href="changes.wiki">Fossil Changelog</a></li>
+<li><a href="concepts.wiki">Fossil Core Concepts</a></li>
+<li><a href="delta_encoder_algorithm.wiki">Fossil Delta Encoding Algorithm</a></li>
+<li><a href="delta_format.wiki">Fossil Delta Format</a></li>
+<li><a href="fileformat.wiki">Fossil File Format</a></li>
+<li><a href="quickstart.wiki">Fossil Quick Start Guide</a></li>
+<li><a href="selfcheck.wiki">Fossil Repository Integrity Self Checks</a></li>
+<li><a href="selfhost.wiki">Fossil Self Hosting Repositories</a></li>
+<li><a href="settings.wiki">Fossil Settings</a></li>
+<li><a href="hints.wiki">Fossil Tips And Usage Hints</a></li>
+<li><a href="fossil-v-git.wiki">Fossil Versus Git</a></li>
+<li><a href="faq.wiki">Frequently Asked Questions</a></li>
+<li><a href="hacker-howto.wiki">Hacker How-To</a></li>
+<li><a href="adding_code.wiki">Hacking Fossil</a></li>
+<li><a href="index.wiki">Home Page</a></li>
+<li><a href="server.wiki">How To Configure A Fossil Server</a></li>
+<li><a href="newrepo.wiki">How To Create A New Fossil Repository</a></li>
+<li><a href="inout.wiki">Import And Export To And From Git</a></li>
+<li><a href="fossil-from-msvc.wiki">Integrating Fossil in the Microsoft Express 2010 IDE</a></li>
+<li><a href="password.wiki">Password Management And Authentication</a></li>
+<li><a href="stats.wiki">Performance Statistics</a></li>
+<li><a href="../test/release-checklist.wiki">Pre-Release Testing Checklist</a></li>
+<li><a href="pop.wiki">Principles Of Operations</a></li>
+<li><a href="qandc.wiki">Questions And Criticisms</a></li>
+<li><a href="quotes.wiki">Quotes: What People Are Saying About Fossil, Git, and DVCSes in General</a></li>
+<li><a href="reviews.wiki">Reviews</a></li>
+<li><a href="shunning.wiki">Shunning: Deleting Content From Fossil</a></li>
+<li><a href="style.wiki">Source Code Style Guidelines</a></li>
+<li><a href="tech_overview.wiki">SQLite Databases Used By Fossil</a></li>
+<li><a href="makefile.wiki">The Fossil Build Process</a></li>
+<li><a href="sync.wiki">The Fossil Sync Protocol</a></li>
+<li><a href="tickets.wiki">The Fossil Ticket System</a></li>
+<li><a href="webui.wiki">The Fossil Web Interface</a></li>
+<li><a href="th1.md">The TH1 Scripting Language</a></li>
+<li><a href="customskin.md">Theming: Customizing The Appearance of Web Pages</a></li>
+<li><a href="customgraph.md">Theming: Customizing the Timeline Graph</a></li>
+<li><a href="theory1.wiki">Thoughts On The Design Of The Fossil DVCS</a></li>
+<li><a href="fiveminutes.wiki">Update and Running in 5 Minutes as a Single User</a></li>
+<li><a href="ssl.wiki">Using SSL with Fossil</a></li>
+<li><a href="wikitheory.wiki">Wiki In Fossil</a></li>
+
 </ul>
 <a name="pindex"></a>
 <h2>Permuted Index:</h2>
+(ordered by keywords - multiple entries linking to the same document)
 <ul>
 <li><a href="fiveminutes.wiki">5 Minutes as a Single User &mdash; Update and Running in</a></li>
 <li><a href="fossil-from-msvc.wiki">2010 IDE &mdash; Integrating Fossil in the Microsoft Express</a></li>
 <li><a href="tech_overview.wiki">A Technical Overview Of The Design And Implementation Of Fossil</a></li>
 <li><a href="adding_code.wiki">Adding New Features To Fossil</a></li>