Update the upgrade documentation.

git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1951 8cb11bc2-c004-0410-86c3-e597b4017df7

docs/upgrading-howto.html

@@ -189,6 +189,47 @@ td {
 
 </div>
 
+<div class="h3">
+<h3>Syntax Highlighting</h3>
+
+<p>ViewVC 1.0.x supports syntax highlighting provided by multiple
+   third-party highlighting engines, including GNU enscript, GNU
+   source-highlight, highlight, php, and py2html.  Unfortunately, each
+   of those integrations worked differently than the others.  Some
+   supported line numbers, some didn't; some were under active
+   development and recognized newer languages; some weren't; each had
+   its own set of CSS stylations that needed to be customized;
+   etc.</p>
+
+<p>In ViewVC 1.1, we've dropped support for all of those integations
+   in favor of a single integration with <a
+   href="http://www.pygments.org/" >Pygments</a>, a
+   Python-module-based syntax highlighting engine.  As such, the
+   configuration options for the various other engines (both those
+   that enabled the integration and those that specified the locations
+   of the third-party tools) have been removed from ViewVC, and have
+   been replaced by a single new configuration option:
+   <code>enable_syntax_coloration</code>.</p>
+
+<p>The list of removed options is as follows:</p>
+
+<ul>
+  <li>options/enscript_path</li>
+  <li>options/highlight_convert_tabs</li>
+  <li>options/highlight_path</li>
+  <li>options/markup_line_numbers</li>
+  <li>options/php_exe</li>
+  <li>options/py2html_path</li>
+  <li>options/use_enscript</li>
+  <li>options/use_highlight</li>
+  <li>options/use_php</li>
+  <li>options/use_py2html</li>
+  <li>options/use_pygments</li>
+  <li>options/use_source_highlight</li>
+</ul>
+
+</div>
+
 <div class="h3">
 <h3>Configuration Options</h3>
 
@@ -203,16 +244,10 @@ td {
    following options were added:</p>
 
 <ul>
-  <li>options/use_py2html</li>
   <li>utilities/cvsgraph</li>
   <li>utilities/cvsnt</li>
   <li>utilities/diff</li>
-  <li>utilities/enscript</li>
-  <li>utilities/highlight</li>
-  <li>utilities/php</li>
-  <li>utilities/py2html_dir</li>
   <li>utilities/rcs_dir</li>
-  <li>utilities/sed</li>
   <li>utilities/svn</li>
 </ul>
 
@@ -223,10 +258,6 @@ td {
   <li>general/rcs_path</li>
   <li>general/svn_path</li>
   <li>options/cvsgraph_path</li>
-  <li>options/enscript_path</li>
-  <li>options/highlight_path</li>
-  <li>options/php_exe</li>
-  <li>options/py2html_path</li>
 </ul>
 
 <p>All the options which governed which ViewVC views were enabled have
@@ -288,6 +319,10 @@ allow_tar = 1
    Authoring Guide</a> for the current set of variables available to
    each templates.</p>
 
+<p>One notable change in ViewVC 1.1 is that the markup.ezt and
+   annotate.ezt templates have been combined into a single file.ezt
+   template.</p>
+
 <table>
 <thead>
 <tr>
@@ -324,99 +359,34 @@ allow_tar = 1
 </tr>
 <tr class="added">
   <td class="varname">queryform_href</td>
-  <td>annotate.ezt, diff.ezt, graph.ezt, log.ezt, log_table.ezt, markup.ezt, 
+  <td>diff.ezt, file.ezt, graph.ezt, log.ezt, log_table.ezt, 
       query_form.ezt, revision.ezt, roots.ezt</td>
   <td>added</td>
 </tr>
 <tr class="added">
   <td class="varname">tarball_href</td>
-  <td>annotate.ezt, diff.ezt, graph.ezt, log.ezt, log_table.ezt, markup.ezt, 
+  <td>diff.ezt, file.ezt, graph.ezt, log.ezt, log_table.ezt,
       query_form.ezt, query_results.ezt, revision.ezt, roots.ezt</td>
   <td>added</td>
 </tr>
 <tr class="added">
   <td class="varname">properties</td>
-  <td>annotate.ezt, markup.ezt, directory.ezt</td>
+  <td>directory.ezt, file.ezt</td>
   <td>added</td>
 </tr>
 <tr class="added">
   <td class="varname">properties.name</td>
-  <td>annotate.ezt, markup.ezt, directory.ezt</td>
+  <td>directory.ezt, file.ezt</td>
   <td>added</td>
 </tr>
 <tr class="added">
   <td class="varname">properties.undisplayable</td>
-  <td>annotate.ezt, markup.ezt, directory.ezt</td>
+  <td>directory.ezt, file.ezt</td>
   <td>added</td>
 </tr>
 <tr class="added">
   <td class="varname">properties.value</td>
-  <td>annotate.ezt, markup.ezt, directory.ezt</td>
-  <td>added</td>
-</tr>
-<tr class="added">
-  <td class="varname">mime_type</td>
-  <td>annotate.ezt</td>
-  <td>added</td>
-</tr>
-<tr class="added">
-  <td class="varname">log</td>
-  <td>annotate.ezt</td>
-  <td>added</td>
-</tr>
-<tr class="added">
-  <td class="varname">date</td>
-  <td>annotate.ezt</td>
-  <td>added</td>
-</tr>
-<tr class="added">
-  <td class="varname">ago</td>
-  <td>annotate.ezt</td>
-  <td>added</td>
-</tr>
-<tr class="added">
-  <td class="varname">author</td>
-  <td>annotate.ezt</td>
-  <td>added</td>
-</tr>
-<tr class="added">
-  <td class="varname">branches</td>
-  <td>annotate.ezt</td>
-  <td>added</td>
-</tr>
-<tr class="added">
-  <td class="varname">tags</td>
-  <td>annotate.ezt</td>
-  <td>added</td>
-</tr>
-<tr class="added">
-  <td class="varname">branch_points</td>
-  <td>annotate.ezt</td>
-  <td>added</td>
-</tr>
-<tr class="added">
-  <td class="varname">changed</td>
-  <td>annotate.ezt</td>
-  <td>added</td>
-</tr>
-<tr class="added">
-  <td class="varname">size</td>
-  <td>annotate.ezt</td>
-  <td>added</td>
-</tr>
-<tr class="added">
-  <td class="varname">state</td>
-  <td>annotate.ezt</td>
-  <td>added</td>
-</tr>
-<tr class="added">
-  <td class="varname">vendor_branch</td>
-  <td>annotate.ezt</td>
-  <td>added</td>
-</tr>
-<tr class="added">
-  <td class="varname">prev</td>
-  <td>annotate.ezt</td>
+  <td>directory.ezt, file.ezt</td>
   <td>added</td>
 </tr>
 <tr class="changed">