Retroactively "peg" the svn:externals property on these tags which

pulls in the 'templates-contrib' area. git-svn-id: http://viewvc.tigris.org/svn/viewvc/tags/1.1.2@2451 8cb11bc2-c004-0410-86c3-e597b4017df7
Tag the 1.1.2 final release.
2019-04-16 04:14:59 +03:00 · 2010-09-08 16:51:21 +00:00 · 2009-08-11 13:05:06 +00:00
37 changed files with 1922 additions and 1111 deletions
--- a/35
+++ b/35
@@ -1,38 +1,3 @@
-Version 1.1.6 (released 02-Jun-2010)
-
-  * add rudimentary support for WSGI-based deployments (issue #397)
-  * fix exception caused by trying to HTML-escape non-string data (issue #454)
-  * fix incorrect RSS feed Content-Type header (issue #449)
-  * fix RSS <title> encoding problem (issue #451)
-  * allow 'svndbadmin purge' to work on missing repositories (issue #452)
-
-Version 1.1.5 (released 29-Mar-2010)
-
-  * security fix: escape user-provided search_re input to avoid XSS attack
-
-Version 1.1.4 (released 10-Mar-2010)
-
-  * security fix: escape user-provided query form input to avoid XSS attack
-  * fix standalone.py failure (when per-root options aren't used) (issue #445)
-  * fix annotate failure caused by ignored svn_config_dir (issue #447)
-
-Version 1.1.3 (released 22-Dec-2009)
-
-  * security fix: add root listing support of per-root authz config
-  * security fix: query.py requires 'forbidden' authorizer (or none) in config
-  * fix URL-ification of truncated log messages (issue #3)
-  * fix regexp input validation (issue #426, #427, #440)
-  * add support for configurable tab-to-spaces conversion
-  * fix not-a-sequence error in diff view
-  * allow viewvc-install to work when templates-contrib is absent
-  * minor template improvements/corrections
-  * expose revision metadata in diff view (issue #431)
-  * markup file/directory item property URLs and email addresses (issue #434)
-  * make ViewVC cross copies in Subversion history by default
-  * fix bug that caused standalone.py failure under Python 1.5.2 (issue #442)
-  * fix support for per-vhost overrides of authorizer parameters (issue #411)
-  * fix root name identification in query.py interface
-
 Version 1.1.2 (released 11-Aug-2009)

  * security fix: validate the 'view' parameter to avoid XSS attack
--- a/90
+++ b/90
@@ -168,23 +168,14 @@ checkin database working are below.
 APACHE CONFIGURATION
 --------------------

-1) Locate your Apache configuration file(s).
+1) Find out where the web server configuration file is kept. Typical
+   locations are /etc/httpd/httpd.conf, /etc/httpd/conf/httpd.conf,
+   and /etc/apache/httpd.conf. Depending on how apache was installed,
+   you may also look under /usr/local/etc or /etc/local. Use the vendor
+   documentation or the find utility if in doubt.

-   Typical locations are /etc/httpd/httpd.conf,
-   /etc/httpd/conf/httpd.conf, and /etc/apache/httpd.conf. Depending
-   on how Apache was installed, you may also look under /usr/local/etc
-   or /etc/local. Use the vendor documentation or the find utility if
-   in doubt.
-
-2) Configure Apache to expose ViewVC to users at the URL of your choice.
-
-   ViewVC provides several different ways to do this.  Choose one of
-   the following methods:
-
-   -----------------------------------
-   METHOD A:  CGI mode via ScriptAlias
-   -----------------------------------
-   The ScriptAlias directive is very useful for pointing 
+Either METHOD A: 
+2) The ScriptAlias directive is very useful for pointing 
   directly to the viewvc.cgi script.  Simply insert a line containing

     ScriptAlias /viewvc <VIEWVC_INSTALLATION_DIRECTORY>/bin/cgi/viewvc.cgi
@@ -195,34 +186,34 @@ APACHE CONFIGURATION
     ScriptAlias /viewvc /usr/local/viewvc-1.0/bin/cgi/viewvc.cgi
     ScriptAlias /query /usr/local/viewvc-1.0/bin/cgi/query.cgi

-   ----------------------------------------
-   METHOD B:  CGI mode in cgi-bin directory
-   ----------------------------------------
-   Copy the CGI scripts from 
+   continue with step 3).
+
+or alternatively METHOD B: 
+2) Copy the CGI scripts from 
   <VIEWVC_INSTALLATION_DIRECTORY>/bin/cgi/*.cgi
   to the /cgi-bin/ directory configured in your httpd.conf file.
+
+   continue with step 3).
   
-   ------------------------------------------
-   METHOD C:  CGI mode in ExecCGI'd directory
-   ------------------------------------------
-   Copy the CGI scripts from 
+and then there's METHOD C:
+2) Copy the CGI scripts from 
   <VIEWVC_INSTALLATION_DIRECTORY>/bin/cgi/*.cgi
   to the directory of your choosing in the Document Root adding the following
-   Apache directives for the directory in httpd.conf or an .htaccess file:
+   apache directives for the directory in httpd.conf or an .htaccess file:

     Options +ExecCGI
     AddHandler cgi-script .cgi
     
-   Note: For this to work mod_cgi has to be loaded.  And for the .htaccess file
+   (Note: For this to work mod_cgi has to be loaded. And for the .htaccess file
   to be effective, "AllowOverride All" or "AllowOverride Options FileInfo"
-   needs to have been specified for the directory.
+   need to have been specified for the directory.)
   
-   ------------------------------------------
-   METHOD D:  Using mod_python (if installed)
-   ------------------------------------------
-   Copy the Python scripts and .htaccess file from 
+   continue with step 3).
+
+or if you've got Mod_Python installed you can use METHOD D:
+2) Copy the Python scripts and .htaccess file from 
   <VIEWVC_INSTALLATION_DIRECTORY>/bin/mod_python/
-   to a directory being served by Apache.
+   to a directory being served by apache.
   
   In httpd.conf, make sure that "AllowOverride All" or at least 
   "AllowOverride FileInfo Options" are enabled for the directory
@@ -232,36 +223,17 @@ APACHE CONFIGURATION
   feature may not work because it uses multithreading.  This works fine
   under Apache 2.
   
-   ----------------------------------------
-   METHOD E:  Using mod_wsgi (if installed)
-   ----------------------------------------
-   Copy the Python scripts file from
-   <VIEWVC_INSTALLATION_DIRECTORY>/bin/mod_python/
-   to the directory of your choosing.  Modify httpd.conf with the
-   following directives:
+   continue with step 3).

-      WSGIScriptAlias /viewvc <VIEWVC_INSTALLATION_DIRECTORY>/bin/wsgi/viewvc.wsgi
-      WSGIScriptAlias /query <VIEWVC_INSTALLATION_DIRECTORY>/bin/wsgi/query.wsgi
+3) Restart apache.  The commands to do this vary.  "httpd -k restart" and 
+   "apache -k restart" are two common variants.  On RedHat Linux it is
+   done using the command "/sbin/service httpd restart" and on SuSE Linux
+   it is done with "rcapache restart" 

-   You'll probably also need the following directive because of the
-   not-quite-sanctioned way that ViewVC manipulates Python objects.
+4) Optional: Add access control.

-      WSGIApplicationGroup %{GLOBAL}
-
-   Note: WSGI support in ViewVC is at this time quite rudimentary,
-   bordering on downright experimental.  Your mileage may vary.
-
-3) Restart Apache.
-
-   The commands to do this vary.  "httpd -k restart" and "apache -k
-   restart" are two common variants.  On RedHat Linux it is done using
-   the command "/sbin/service httpd restart" and on SuSE Linux it is
-   done with "rcapache restart".  Other systems use "apachectl restart".
-
-4) [Optional] Add access control.
-
-   In your httpd.conf you can control access to certain modules by
-   adding directives like this:
+   In your httpd.conf you can control access to certain modules by adding 
+   directives like this:

      <Location "<url to viewvc.cgi>/<modname_you_wish_to_access_ctl>">
        AllowOverride None
--- a/LICENSE.html
+++ b/LICENSE.html
@@ -15,7 +15,7 @@

 <blockquote>

-<p><strong>Copyright &copy; 1999-2010 The ViewCVS Group.  All rights
+<p><strong>Copyright &copy; 1999-2009 The ViewCVS Group.  All rights
   reserved.</strong></p>

 <p>By using ViewVC, you agree to the terms and conditions set forth
@@ -60,7 +60,6 @@
  <li>April 10, 2007 &mdash; copyright years updated</li>
  <li>February 22, 2008 &mdash; copyright years updated</li>
  <li>March 18, 2009 &mdash; copyright years updated</li>
-  <li>March 29, 2010 &mdash; copyright years updated</li>
 </ul>

 </body>
--- a/bin/svndbadmin
+++ b/bin/svndbadmin
@@ -242,7 +242,6 @@ def main(command, repository, revs=[], verbose=0, force=0):
    cfg = viewvc.load_config(CONF_PATHNAME)
    db = cvsdb.ConnectDatabase(cfg)

-    # Purge what must be purged.
    if command in ('rebuild', 'purge'):
        if verbose:
            print "Purging commit info for repository root `%s'" % repository
@@ -253,24 +252,18 @@ def main(command, repository, revs=[], verbose=0, force=0):
                sys.stderr.write("ERROR: " + str(e) + "\n")
                sys.exit(1)

-    # Record what must be recorded.
-    if command in ('rebuild', 'update'):
-        if not os.path.exists(repository):
-            sys.stderr.write('ERROR: could not find repository %s\n'
-                             % (repository))
-            sys.exit(1)
-        repo = SvnRepo(repository)
-        if command == 'rebuild' or (command == 'update' and not revs):
-            for rev in range(repo.rev_max+1):
-                handle_revision(db, command, repo, rev, verbose)
-        elif command == 'update':
-            if revs[0] is None:
-                revs[0] = repo.rev_max
-            if revs[1] is None:
-                revs[1] = repo.rev_max
-            revs.sort()
-            for rev in range(revs[0], revs[1]+1):
-                handle_revision(db, command, repo, rev, verbose, force)
+    repo = SvnRepo(repository)
+    if command == 'rebuild' or (command == 'update' and not revs):
+        for rev in range(repo.rev_max+1):
+            handle_revision(db, command, repo, rev, verbose)
+    elif command == 'update':
+        if revs[0] is None:
+            revs[0] = repo.rev_max
+        if revs[1] is None:
+            revs[1] = repo.rev_max
+        revs.sort()
+        for rev in range(revs[0], revs[1]+1):
+            handle_revision(db, command, repo, rev, verbose, force)

 def _rev2int(r):
    if r == 'HEAD':
@@ -337,6 +330,12 @@ if __name__ == '__main__':
        sys.stderr.write('ERROR: unknown command %s\n' % command)
        usage()

+    repository = args[2]
+    if not os.path.exists(repository):
+        sys.stderr.write('ERROR: could not find repository %s\n' % args[2])
+        usage()
+    repository = vclib.svn.canonicalize_rootpath(repository)
+
    revs = []
    if len(sys.argv) > 3:
        if command == 'rebuild':
@@ -359,7 +358,6 @@ if __name__ == '__main__':
        rev = None

    try:
-        repository = vclib.svn.canonicalize_rootpath(args[2])
        repository = cvsdb.CleanRepository(os.path.abspath(repository))
        main(command, repository, revs, verbose, force)
    except KeyboardInterrupt:
--- a/bin/wsgi/query.wsgi
+++ b/bin/wsgi/query.wsgi
@@ -1,42 +0,0 @@
-# -*-python-*-
-#
-# Copyright (C) 1999-2009 The ViewCVS Group. All Rights Reserved.
-#
-# By using this file, you agree to the terms and conditions set forth in
-# the LICENSE.html file which can be found at the top level of the ViewVC
-# distribution or at http://viewvc.org/license-1.html.
-#
-# For more information, visit http://viewvc.org/
-#
-# -----------------------------------------------------------------------
-#
-# viewvc: View CVS/SVN repositories via a web browser
-#
-# -----------------------------------------------------------------------
-#
-# This is a wsgi entry point for the query ViewVC app. It's appropriate
-# for use with mod_wsgi. It defines a single application function that
-# is a walid wsgi entry point.
-#
-# -----------------------------------------------------------------------
-
-import sys, os
-
-LIBRARY_DIR = None
-CONF_PATHNAME = None
-
-if LIBRARY_DIR:
-  sys.path.insert(0, LIBRARY_DIR)
-else:
-  sys.path.insert(0, os.path.abspath(os.path.join(sys.argv[0],
-                                                  "../../../lib")))
-
-import sapi
-import viewvc
-import query
-
-def application(environ, start_response):
-  server = sapi.WsgiServer(environ, start_response)
-  cfg = viewvc.load_config(CONF_PATHNAME, server)
-  query.main(server, cfg, "viewvc.wsgi")
-  return []
--- a/bin/wsgi/viewvc.wsgi
+++ b/bin/wsgi/viewvc.wsgi
@@ -1,41 +0,0 @@
-# -*-python-*-
-#
-# Copyright (C) 1999-2009 The ViewCVS Group. All Rights Reserved.
-#
-# By using this file, you agree to the terms and conditions set forth in
-# the LICENSE.html file which can be found at the top level of the ViewVC
-# distribution or at http://viewvc.org/license-1.html.
-#
-# For more information, visit http://viewvc.org/
-#
-# -----------------------------------------------------------------------
-#
-# viewvc: View CVS/SVN repositories via a web browser
-#
-# -----------------------------------------------------------------------
-#
-# This is a wsgi entry point for the main ViewVC app. It's appropriate
-# for use with mod_wsgi. It defines a single application function that
-# is a walid wsgi entry point.
-#
-# -----------------------------------------------------------------------
-
-import sys, os
-
-LIBRARY_DIR = None
-CONF_PATHNAME = None
-
-if LIBRARY_DIR:
-  sys.path.insert(0, LIBRARY_DIR)
-else:
-  sys.path.insert(0, os.path.abspath(os.path.join(sys.argv[0],
-                                                  "../../../lib")))
-
-import sapi
-import viewvc
-
-def application(environ, start_response):
-  server = sapi.WsgiServer(environ, start_response)
-  cfg = viewvc.load_config(CONF_PATHNAME, server)
-  viewvc.main(server, cfg)
-  return []
--- a/conf/viewvc.conf.dist
+++ b/conf/viewvc.conf.dist
@@ -136,7 +136,7 @@
 ## virtue of being the basenames of repositories found in the
 ## root_parents option locations.
 ##
-## NOTE: This setting is ignored when root_as_url_component is enabled.
+## Note: This setting is ignored when root_as_url_component is enabled.
 ##
 ## Example:
 ## default_root = cvsroot
@@ -243,14 +243,9 @@
 ## aren't installed in the executable search path, so here's where you can
 ## tell ViewVC where to find them.
 ##
-## NOTE: Options with a "_dir" suffix are for configuring the
-## directories in which certain programs live.  Note that this might
-## not be the same directory into which the program's installer dumped
-## the whole program package -- we want the deepest directory in which
-## the executable program itself resides ("C:\rcstools\bin\win32"
-## rather than just "C:\rcstools", for example).  The values of options
-## whose names lack the "_dir" suffix should point to the actual
-## program itself (such as "C:\Program Files\cvsnt\cvs.exe").
+## NOTE:  Options with a "_dir" suffix are for configuring the directories
+## in which certain programs live; otherwise, the option value should
+## point to the actual program.


 ## rcs_dir: Directory in which the RCS utilities are installed, used
@@ -308,16 +303,14 @@
 ## alternative to using the "root=" query key. If ViewVC is configured
 ## with multiple repositories, this results in more natural looking
 ## ViewVC URLs.
-##
-## NOTE: Enabling this option will break backwards compatibility with
+## Note: Enabling this option will break backwards compatibility with
 ## any old ViewCVS URL which doesn't have an explicit "root" parameter.
 ##
 #root_as_url_component = 1

 ## checkout_magic: Use checkout links with magic /*checkout*/ prefixes so
 ## checked out HTML pages can have working links to other repository files
-##
-## NOTE: This option is DEPRECATED and should not be used in new ViewVC
+## Note: This option is DEPRECATED and should not be used in new ViewVC
 ## installations. Setting "default_file_view = co" achieves the same effect
 ##
 #checkout_magic = 0
@@ -354,7 +347,6 @@
 ## hide_cvsroot: Don't show the CVSROOT directory
 ##   1      Hide CVSROOT directory
 ##   0      Show CVSROOT directory
-##
 ## NOTE: Someday this option may be removed in favor of letting
 ## individual authorizer plugin hide the CVSROOT.
 ##
@@ -365,8 +357,7 @@
 ##   0 - No mangling; markup un-mangled email addresses as hyperlinks
 ##   1 - Obfuscation (using entity encoding); no hyperlinking
 ##   2 - Data-dropping address truncation; no hyperlinking
-##
-## NOTE: this will not effect the display of versioned file contents, only
+## Note: this will not effect the display of versioned file contents, only
 ## addresses that appear in version control metadata (e.g. log messages).
 ##
 #mangle_email_addresses = 0
@@ -377,11 +368,9 @@
 ## ViewCVS URLs, but "co" has the advantage that it allows ViewVC to serve
 ## static HTML pages directly from a repository with working links
 ## to other repository files
-##
-## NOTE: Changing this option may break compatibility with existing
+## Note: Changing this option may break compatibility with existing
 ## bookmarked URLs.
-##
-## ALSO NOTE: If you choose one of the "co" or "markup" views, be sure
+## Also note: If you choose one of the "co" or "markup" views, be sure
 ## to enable it (via the allowed_views option)
 ##
 #default_file_view = log
@@ -501,7 +490,7 @@
 ## allow_compress: Allow compression via gzip of output if the Browser
 ## accepts it (HTTP_ACCEPT_ENCODING contains "gzip").
 ##
-## NOTE: this relies on Python's gzip module, which has proven to be
+## Note: this relies on Python's gzip module, which has proven to be
 ## not-so-performant.  Enabling this feature should reduce the overall
 ## transfer size of ViewVC's responses to the client's request, but
 ## will do so with a speed penalty.
@@ -516,8 +505,7 @@
 ## this config file resides; absolute paths may be used as well.  If
 ## %lang% occurs in the pathname, then the selected language will be
 ## substituted.
-## 
-## SEE ALSO: the [templates] configuration section, where you can
+## See Also: the [templates] configuration section, where you can
 ## override templates on a per-view basis.
 ##
 #template_dir = templates
@@ -529,16 +517,9 @@
 ## penalty, and from the "docroot" subdirectory of the directory
 ## specified by the "template_dir" option).
 ##
-## NOTE: This option is evaluated outside the context of a particular
-## root.  Be careful when using per-root configuration to select an
-## alternate template set as the default value for this option will
-## still be based on the global default template set per 'template_dir'
-## above, not on 'template_dir' as overridden for a given root.
-##
 #docroot = 

 ## show_subdir_lastmod: Show last changelog message for CVS subdirectories
-##
 ## NOTE: The current implementation makes many assumptions and may show
 ## the incorrect file at some times. The main assumption is that the
 ## last modified file has the newest filedate. But some CVS operations
@@ -547,8 +528,7 @@
 ## the last checkin was on the same tag as you are viewing.  Enable
 ## this if you like the feature, but don't rely on correct results.
 ##
-## SECURITY WARNING: Enabling this will currently leak unauthorized
-## path names.
+## ** WARNING: Enabling this will currently leak unauthorized path names **
 ##
 #show_subdir_lastmod = 0

@@ -579,11 +559,6 @@
 ##
 #enable_syntax_coloration = 1

-## tabsize: The number of spaces into which tabstops are converted
-## when viewing file contents.
-##
-#tabsize = 8
-
 ## detect_encoding: Should we attempt to detect versioned file
 ## character encodings?  [Requires 'chardet' module, and is currently
 ## used only by the syntax coloration logic -- if enabled -- for the
@@ -657,7 +632,7 @@
 ## If %lang% occurs in the pathname, then the selected language will be
 ## substituted.
 ##
-## NOTE: the selected language is defined by the "languages" item in the
+## Note: the selected language is defined by the "languages" item in the
 ##       [general] section, and based on the request's Accept-Language
 ##       header.
 ##
@@ -723,8 +698,7 @@
 #port = 3306

 ## database_name: ViewVC database name.
-##
-#database_name = ViewVC
+##database_name = ViewVC

 ## user: Username of user with read/write privileges to the database
 ## specified by the 'database_name' configuration option.
@@ -809,16 +783,6 @@
 ## ViewVC options typically found in the base configuration section
 ## named CONFIGSECTION ("general", "option", etc.)
 ##
-## NOTE: Per-vhost overrides may only be applied to the following
-## sections:
-##
-##    general
-##    options
-##    utilities
-##    templates
-##    cvsdb
-##    authz-*
-##
 ## Here is an example:
 ##
 ## [vhosts]
@@ -848,19 +812,7 @@
 ## basename of a root path in root_parents.  Options found in this new
 ## configuration section override for this one root the corresponding
 ## options found in the base configuration section CONFIGSECTION
-## ("options", "authz-*", etc.) as interpreted after per-vhost
-## overrides (if any) have been applied.
-##
-## NOTE: Per-root overrides may only be applied to the following
-## sections:
-##
-##    options
-##    utilities
-##    authz-*
-##
-## WARNING: Do not use per-root overrides if your ViewVC instance is
-## served via the standalone.py server option!  Doing so could cause
-## ViewVC to be unable to function properly (or at all).
+## ("options", "authz-*", etc.)
 ##
 ## Here is an example showing how to enable Subversion authz-based
 ## authorization for only the single root named "svnroot":
@@ -876,15 +828,8 @@
 [authz-forbidden]

 ## The "forbidden" authorizer forbids access to repository modules,
-## defined to be top-level subdirectories in a repository.
-##
-## NOTE: The options in this section apply only when the 'authorizer'
-## option (in the [options] section) is set to 'forbidden'.
-
-## forbidden: A comma-delimited list of patterns which match modules
-## that ViewVC should hide from users.
-##
-## You can use a simple list of modules, or something more complex:
+## defined to be top-level subdirectories in a repository.  You can use
+## a simple list of modules, or something more complex:
 ##
 ##   *) The "!" can be used before a module to explicitly state that it
 ##      is NOT forbidden. Whenever this form is seen, then all modules will
@@ -939,12 +884,6 @@
 ## regular expressions.  Directory paths will be terminated by a forward
 ## slash.
 ##
-## NOTE: The options in this section apply only when the 'authorizer'
-## option (in the [options] section) is set to 'forbiddenre'.
-
-## forbiddenre: A comma-delimited list of regular expressions which
-## match paths that ViewVC should hide from users.
-##
 ## Like the "forbidden" authorizer...
 ##
 ##   *) The "!" can be used before a module to explicitly state that it
@@ -979,9 +918,6 @@

 ## The "svnauthz" authorizer uses a Subversion authz configuration file
 ## to determine access to repository paths.
-##
-## NOTE: The options in this section apply only when the 'authorizer'
-## option (in the [options] section) is set to 'svnauthz'.

 ## authzfile: Specifies the location of the authorization rules file
 ## (using an absolute path).
--- a/docs/template-authoring-guide.html
+++ b/docs/template-authoring-guide.html
@@ -726,22 +726,12 @@ td {
  <td>Container</td>
  <td>Container object for grouping information about the left file.</td>
 </tr>
-<tr class="varlevel2">
-  <td class="varname">left.ago</td>
-  <td>String</td>
-  <td>Text description of the time elapsed since <var>left.date</date>.</td>
-</tr>
 <tr class="varlevel2">
  <td class="varname">left.annotate_href</td>
  <td>String</td>
  <td>URL of the ViewVC annotation view for the left file.
      Valid only when <var>entries.pathtype</var> is <tt>file</tt>.</td>
 </tr>
-<tr class="varlevel2">
-  <td class="varname">left.author</td>
-  <td>String</td>
-  <td>Author of the revision of the left file.</td>
-</tr>
 <tr class="varlevel2">
  <td class="varname">left.date</td>
  <td>String</td>
@@ -759,11 +749,6 @@ td {
  <td>URL to download the HEAD revision of the left file as
      <tt>text/plain</tt>.</td>
 </tr>
-<tr class="varlevel2">
-  <td class="varname">left.log</td>
-  <td>String</td>
-  <td>Log message of the left file revision.</td>
-</tr>
 <tr class="varlevel2">
  <td class="varname">left.path</td>
  <td>String</td>
@@ -787,11 +772,6 @@ td {
      current revision.  Valid only when <var>roottype</var> is
      <tt>svn</tt>.</td>
 </tr>
-<tr class="varlevel2">
-  <td class="varname">left.size</td>
-  <td>String</td>
-  <td>Size of the left file revision, in bytes. Subversion only.</td>
-</tr>
 <tr class="varlevel2">
  <td class="varname">left.tag</td>
  <td>String</td>
@@ -813,22 +793,12 @@ td {
  <td>Container</td>
  <td>Container object for grouping information about the right file.</td>
 </tr>
-<tr class="varlevel2">
-  <td class="varname">right.author</td>
-  <td>String</td>
-  <td>Author of the revision of the right file.</td>
-</tr>
 <tr class="varlevel2">
  <td class="varname">right.annotate_href</td>
  <td>String</td>
  <td>URL of the ViewVC annotation view for the right file.
      Valid only when <var>entries.pathtype</var> is <tt>file</tt>.</td>
 </tr>
-<tr class="varlevel2">
-  <td class="varname">right.author</td>
-  <td>String</td>
-  <td>Author of the revision of the right file.</td>
-</tr>
 <tr class="varlevel2">
  <td class="varname">right.date</td>
  <td>String</td>
@@ -846,11 +816,6 @@ td {
  <td>URL to download the HEAD revision of the right file as
      <tt>text/plain</tt>.</td>
 </tr>
-<tr class="varlevel2">
-  <td class="varname">right.log</td>
-  <td>String</td>
-  <td>Log message of the right file revision.</td>
-</tr>
 <tr class="varlevel2">
  <td class="varname">right.path</td>
  <td>String</td>
@@ -874,11 +839,6 @@ td {
      current revision.  Valid only when <var>roottype</var> is
      <tt>svn</tt>.</td>
 </tr>
-<tr class="varlevel2">
-  <td class="varname">right.size</td>
-  <td>String</td>
-  <td>Size of the right file revision, in bytes. Subversion only.</td>
-</tr>
 <tr class="varlevel2">
  <td class="varname">right.tag</td>
  <td>String</td>
--- a/docs/upgrading-howto.html
+++ b/docs/upgrading-howto.html
@@ -348,7 +348,7 @@ td {
 all = viewvc.*

 [all-options]
-allowed_views = annotate, diff, markup, tar
+allow_tar = 1
 </pre>
 </blockquote>

@@ -358,7 +358,7 @@ allowed_views = annotate, diff, markup, tar
 all = viewvc.*

 [vhost-all/options]
-allowed_views = annotate, diff, markup, tar
+allow_tar = 1
 </pre>
 </blockquote>

--- a/lib/blame.py
+++ b/lib/blame.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*-python-*-
 #
-# Copyright (C) 1999-2010 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2008 The ViewCVS Group. All Rights Reserved.
 # Copyright (C) 2000 Curt Hagenlocher <curt@hagenlocher.org>
 #
 # By using this file, you agree to the terms and conditions set forth in
@@ -32,8 +32,9 @@ import os
 import re
 import time
 import math
+import cgi
 import vclib
-import sapi
+

 re_includes = re.compile('\\#(\\s*)include(\\s*)"(.*?)"')

@@ -81,7 +82,7 @@ class HTMLBlameSource:
    diff_url = None
    if item.prev_rev:
      diff_url = '%sr1=%s&amp;r2=%s' % (self.diff_url, item.prev_rev, item.rev)
-    thisline = link_includes(sapi.escape(item.text), self.repos,
+    thisline = link_includes(cgi.escape(item.text), self.repos,
                             self.path_parts, self.include_url)
    return _item(text=thisline, line_number=item.line_number,
                 rev=item.rev, prev_rev=item.prev_rev,
--- a/lib/config.py
+++ b/lib/config.py
@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2010 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2009 The ViewCVS Group. All Rights Reserved.
 #
 # By using this file, you agree to the terms and conditions set forth in
 # the LICENSE.html file which can be found at the top level of the ViewVC
@@ -24,142 +24,45 @@ import fnmatch
 #########################################################################
 #
 # CONFIGURATION
-# -------------
 #
 # There are three forms of configuration:
 #
-#    1. edit the viewvc.conf created by the viewvc-install(er)
-#    2. as (1), but delete all unchanged entries from viewvc.conf
-#    3. do not use viewvc.conf and just edit the defaults in this file
+#       1) edit the viewvc.conf created by the viewvc-install(er)
+#       2) as (1), but delete all unchanged entries from viewvc.conf
+#       3) do not use viewvc.conf and just edit the defaults in this file
 #
 # Most users will want to use (1), but there are slight speed advantages
 # to the other two options. Note that viewvc.conf values are a bit easier
 # to work with since it is raw text, rather than python literal values.
 #
-#
-# A WORD ABOUT OPTION LAYERING/OVERRIDES
-# --------------------------------------
-#
-# ViewVC has three "layers" of configuration options:
-#
-#    1. base configuration options - very basic configuration bits
-#       found in sections like 'general', 'options', etc.
-#    2. vhost overrides - these options overlay/override the base
-#       configuration on a per-vhost basis.
-#    3. root overrides - these options overlay/override the base
-#       configuration and vhost overrides on a per-root basis.
-#
-# Here's a diagram of the valid overlays/overrides:
-#
-#         PER-ROOT          PER-VHOST            BASE
-#       
-#                         ,-----------.     ,-----------.
-#                         | vhost-*/  |     |           |
-#                         |  general  | --> |  general  |
-#                         |           |     |           |
-#                         `-----------'     `-----------'
-#       ,-----------.     ,-----------.     ,-----------.
-#       |  root-*/  |     | vhost-*/  |     |           |
-#       |  options  | --> |  options  | --> |  options  |
-#       |           |     |           |     |           |
-#       `-----------'     `-----------'     `-----------'
-#       ,-----------.     ,-----------.     ,-----------.
-#       |  root-*/  |     | vhost-*/  |     |           |
-#       | templates | --> | templates | --> | templates |
-#       |           |     |           |     |           |
-#       `-----------'     `-----------'     `-----------'
-#       ,-----------.     ,-----------.     ,-----------.
-#       |  root-*/  |     | vhost-*/  |     |           |
-#       | utilities | --> | utilities | --> | utilities |
-#       |           |     |           |     |           |
-#       `-----------'     `-----------'     `-----------'
-#                         ,-----------.     ,-----------.
-#                         | vhost-*/  |     |           |
-#                         |   cvsdb   | --> |   cvsdb   |
-#                         |           |     |           |
-#                         `-----------'     `-----------'
-#       ,-----------.     ,-----------.     ,-----------.
-#       |  root-*/  |     | vhost-*/  |     |           |
-#       |  authz-*  | --> |  authz-*  | --> |  authz-*  |
-#       |           |     |           |     |           |
-#       `-----------'     `-----------'     `-----------'
-#                                           ,-----------.
-#                                           |           |
-#                                           |  vhosts   |
-#                                           |           |
-#                                           `-----------'
-#
-# ### TODO:  Figure out what this all means for the 'kv' stuff.
-#
 #########################################################################

 class Config:
-  _base_sections = (
-    # Base configuration sections.
-    'authz-*',
-    'cvsdb',
-    'general',
-    'options',
-    'templates',
-    'utilities',
-    )
-  _force_multi_value = (
-    # Configuration values with multiple, comma-separated values.
-    'allowed_views',
-    'cvs_roots',
-    'kv_files',
-    'languages',
-    'mime_types_files',
-    'root_parents',
-    'svn_roots',
-    )
-  _allowed_overrides = {
-    # Mapping of override types to allowed overridable sections.
-    'vhost' : ('authz-*',
-               'cvsdb',
-               'general',
-               'options',
-               'templates',
-               'utilities',
-               ),
-    'root'  : ('authz-*',
-               'options',
-               'templates',
-               'utilities',
-               )
-    }
+  _sections = ('general', 'utilities', 'options', 'cvsdb', 'templates')
+  _force_multi_value = ('cvs_roots', 'svn_roots', 'languages', 'kv_files',
+                        'root_parents', 'allowed_views', 'mime_types_files')

  def __init__(self):
-    self.root_options_overlayed = 0
-    for section in self._base_sections:
-      if section[-1] == '*':
-        continue
+    for section in self._sections:
      setattr(self, section, _sub_config())

-  def load_config(self, pathname, vhost=None):
-    """Load the configuration file at PATHNAME, applying configuration
-    settings there as overrides to the built-in default values.  If
-    VHOST is provided, also process the configuration overrides
-    specific to that virtual host."""
-    
+  def load_config(self, pathname, vhost=None, rootname=None):
    self.conf_path = os.path.isfile(pathname) and pathname or None
    self.base = os.path.dirname(pathname)
    self.parser = ConfigParser.ConfigParser()
    self.parser.read(self.conf_path or [])
-    
-    for section in self.parser.sections():
-      if self._is_allowed_section(self.parser, section,
-                                  self._base_sections):
+
+    for section in self._sections:
+      if self.parser.has_section(section):
        self._process_section(self.parser, section, section)

    if vhost and self.parser.has_section('vhosts'):
      self._process_vhost(self.parser, vhost)

+    if rootname:
+      self._process_root_options(self.parser, rootname)
+
  def load_kv_files(self, language):
-    """Process the key/value (kv) files specified in the
-    configuration, merging their values into the configuration as
-    dotted heirarchical items."""
-    
    kv = _sub_config()

    for fname in self.general.kv_files:
@@ -189,12 +92,10 @@ class Config:
    return kv

  def path(self, path):
-    """Return PATH relative to the config file directory."""
+    """Return path relative to the config file directory"""
    return os.path.join(self.base, path)

  def _process_section(self, parser, section, subcfg_name):
-    if not hasattr(self, subcfg_name):
-      setattr(self, subcfg_name, _sub_config())
    sc = getattr(self, subcfg_name)

    for opt in parser.options(section):
@@ -207,55 +108,25 @@ class Config:
        except ValueError:
          pass

-      ### FIXME: This feels like unnecessary depth of knowledge for a
-      ### semi-generic configuration object.
      if opt == 'cvs_roots' or opt == 'svn_roots':
        value = _parse_roots(opt, value)

      setattr(sc, opt, value)

-  def _is_allowed_section(self, parser, section, allowed_sections):
-    """Return 1 iff SECTION is an allowed section, defined as being
-    explicitly present in the ALLOWED_SECTIONS list or present in the
-    form 'someprefix-*' in that list."""
-    
-    for allowed_section in allowed_sections:
-      if allowed_section[-1] == '*':
-        if _startswith(section, allowed_section[:-1]):
-          return 1
-      elif allowed_section == section:
-        return 1
-    return 0
-
-  def _is_allowed_override(self, parser, sectype, secspec, section):
-    """Test if SECTION is an allowed override section for sections of
-    type SECTYPE ('vhosts' or 'root', currently) and type-specifier
-    SECSPEC (a rootname or vhostname, currently).  If it is, return
-    the overridden base section name.  If it's not an override section
-    at all, return None.  And if it's an override section but not an
-    allowed one, raise IllegalOverrideSection."""
-
-    cv = '%s-%s/' % (sectype, secspec)
-    lcv = len(cv)
-    if section[:lcv] != cv:
-      return None
-    base_section = section[lcv:]
-    if self._is_allowed_section(parser, base_section,
-                                self._allowed_overrides[sectype]):
-      return base_section
-    raise IllegalOverrideSection(sectype, section)
-
  def _process_vhost(self, parser, vhost):
-    # Find a vhost name for this VHOST, if any (else, we've nothing to do).
+    # find a vhost name for this vhost, if any (if not, we've nothing to do)
    canon_vhost = self._find_canon_vhost(parser, vhost)
    if not canon_vhost:
      return

-    # Overlay any option sections associated with this vhost name.
+    # overlay any option sections associated with this vhost name
+    cv = 'vhost-%s/' % (canon_vhost)
+    lcv = len(cv)
    for section in parser.sections():
-      base_section = self._is_allowed_override(parser, 'vhost',
-                                               canon_vhost, section)
-      if base_section:
+      if section[:lcv] == cv:
+        base_section = section[lcv:]
+        if base_section not in self._sections:
+          raise IllegalOverrideSection('vhost', section)
        self._process_section(parser, section, base_section)

  def _find_canon_vhost(self, parser, vhost):
@@ -270,30 +141,26 @@ class Config:

    return None

+  def _process_root_options(self, parser, rootname):
+    rn = 'root-%s/' % (rootname)
+    lrn = len(rn)
+    for section in parser.sections():
+      if section[:lrn] == rn:
+        base_section = section[lrn:]
+        if base_section in self._sections:
+          if base_section == 'general':
+            raise IllegalOverrideSection('root', section)
+          self._process_section(parser, section, base_section)
+        elif _startswith(base_section, 'authz-'):
+          pass
+        else:
+          raise IllegalOverrideSection('root', section)
+          
  def overlay_root_options(self, rootname):
-    """Overlay per-root options for ROOTNAME atop the existing option
-    set.  This is a destructive change to the configuration."""
-
-    did_overlay = 0
-    
+    "Overly per-root options atop the existing option set."
    if not self.conf_path:
      return
-
-    for section in self.parser.sections():
-      base_section = self._is_allowed_override(self.parser, 'root',
-                                               rootname, section)
-      if base_section:
-        # We can currently only deal with root overlays happening
-        # once, so check that we've not yet done any overlaying of
-        # per-root options.
-        assert(self.root_options_overlayed == 0)
-        self._process_section(self.parser, section, base_section)
-        did_overlay = 1
-
-    # If we actually did any overlaying, remember this fact so we
-    # don't do it again later.
-    if did_overlay:
-      self.root_options_overlayed = 1
+    self._process_root_options(self.parser, rootname)

  def _get_parser_items(self, parser, section):
    """Basically implement ConfigParser.items() for pre-Python-2.3 versions."""
@@ -304,67 +171,23 @@ class Config:
      for option in parser.options(section):
        d[option] = parser.get(section, option)
      return d.items()
-
-  def get_authorizer_and_params_hack(self, rootname):
-    """Return a 2-tuple containing the name and parameters of the
-    authorizer configured for use with ROOTNAME.
-
-    ### FIXME: This whole thing is a hack caused by our not being able
-    ### to non-destructively overlay root options when trying to do
-    ### something like a root listing (which might need to get
-    ### different authorizer bits for each and every root in the list).
-    ### Until we have a good way to do that, we expose this function,
-    ### which assumes that base and per-vhost configuration has been
-    ### absorbed into this object and that per-root options have *not*
-    ### been overlayed.  See issue #371."""
-
-    # We assume that per-root options have *not* been overlayed.
-    assert(self.root_options_overlayed == 0)
-
+    
+  def get_authorizer_params(self, authorizer, rootname=None):
    if not self.conf_path:
-      return None
+      return {}

-    # Figure out the authorizer by searching first for a per-root
-    # override, then falling back to the base/vhost configuration.
-    authorizer = None
-    root_options_section = 'root-%s/options' % (rootname)
-    if self.parser.has_section(root_options_section) \
-       and self.parser.has_option(root_options_section, 'authorizer'):
-      authorizer = self.parser.get(root_options_section, 'authorizer')
-    if not authorizer:
-      authorizer = self.options.authorizer
-
-    # No authorizer?  Get outta here.
-    if not authorizer:
-      return None, {}
-
-    # Dig up the parameters for the authorizer, starting with the
-    # base/vhost items, then overlaying any root-specific ones we find.
    params = {}
    authz_section = 'authz-%s' % (authorizer)
-    if hasattr(self, authz_section):
-      sub_config = getattr(self, authz_section)
-      for attr in dir(sub_config):
-        params[attr] = getattr(sub_config, attr)
-    root_authz_section = 'root-%s/authz-%s' % (rootname, authorizer)
    for section in self.parser.sections():
-      if section == root_authz_section:
+      if section == authz_section:
        for key, value in self._get_parser_items(self.parser, section):
          params[key] = value
-    return authorizer, params
-
-  def get_authorizer_params(self, authorizer=None):
-    """Return a dictionary of parameter names and values which belong
-    to the configured authorizer (or AUTHORIZER, if provided)."""
-    params = {}
-    if authorizer is None:
-      authorizer = self.options.authorizer
-    if authorizer:
-      authz_section = 'authz-%s' % (self.options.authorizer)
-      if hasattr(self, authz_section):
-        sub_config = getattr(self, authz_section)
-        for attr in dir(sub_config):
-          params[attr] = getattr(sub_config, attr)
+    if rootname:
+      root_authz_section = 'root-%s/authz-%s' % (rootname, authorizer)
+      for section in self.parser.sections():
+        if section == root_authz_section:
+          for key, value in self._get_parser_items(self.parser, section):
+            params[key] = value
    return params
  
  def set_defaults(self):
@@ -417,11 +240,10 @@ class Config:
    self.options.show_subdir_lastmod = 0
    self.options.show_logs = 1
    self.options.show_log_in_markup = 1
-    self.options.cross_copies = 1
+    self.options.cross_copies = 0
    self.options.use_localtime = 0
    self.options.short_log_len = 80
    self.options.enable_syntax_coloration = 1
-    self.options.tabsize = 8
    self.options.detect_encoding = 0
    self.options.use_cvsgraph = 0
    self.options.cvsgraph_conf = "cvsgraph.conf"
--- a/lib/ezt.py
+++ b/lib/ezt.py
@@ -347,7 +347,7 @@ class Template:
      for_names = [ ]

    if base_format:
-      program.append((self._cmd_format, _formatters[base_format]))
+      program.append((self._cmd_format, _printers[base_format]))

    for i in range(len(parts)):
      piece = parts[i]
@@ -405,13 +405,13 @@ class Template:
          elif cmd == 'format':
            if args[1][0]:
              # argument is a variable reference
-              formatter = args[1]
+              printer = args[1]
            else:
-              # argument is a string constant referring to built-in formatter
-              formatter = _formatters.get(args[1][1])
-              if not formatter:
+              # argument is a string constant referring to built-in printer
+              printer = _printers.get(args[1][1])
+              if not printer:
                raise UnknownFormatConstantError(str(args[1:]))
-            program.append((self._cmd_format, formatter))
+            program.append((self._cmd_format, printer))

          # remember the cmd, current pos, args, and a section placeholder
          stack.append([cmd, len(program), args[1:], None])
@@ -465,13 +465,13 @@ class Template:
    except TypeError:
      raise Exception("Unprintable value type for '%s'" % (str(valrefs[0][0])))

-  def _cmd_format(self, formatter, ctx):
-    if type(formatter) is TupleType:
-      formatter = _get_value(formatter, ctx)
-    ctx.formatters.append(formatter)
+  def _cmd_format(self, printer, ctx):
+    if type(printer) is TupleType:
+      printer = _get_value(printer, ctx)
+    ctx.printers.append(printer)

  def _cmd_end_format(self, valref, ctx):
-    ctx.formatters.pop()
+    ctx.printers.pop()

  def _cmd_include(self, (valref, reader), ctx):
    fname = _get_value(valref, ctx)
@@ -637,23 +637,14 @@ def _get_value((refname, start, rest), ctx):
  # string or a sequence
  return ob

-def _print_formatted(formatters, ctx, chunk):
-  # print chunk to ctx.fp after running it sequentially through formatters
-  for formatter in formatters:
-    chunk = formatter(chunk)
-  ctx.fp.write(chunk)
-  
 def _write_value(value, args, ctx):
  # value is a callback function, generates its own output
  if callable(value):
    apply(value, [ctx] + list(args))
    return

-  # squirrel away formatters in case one of them recursively calls
-  # _write_value() -- we'll use them (in reverse order) to format our
-  # output.
-  formatters = ctx.formatters[:]
-  formatters.reverse()
+  # pop printer in case it recursively calls _write_value
+  printer = ctx.printers.pop()

  try:
    # if the value has a 'read' attribute, then it is a stream: copy it
@@ -662,7 +653,7 @@ def _write_value(value, args, ctx):
        chunk = value.read(16384)
        if not chunk:
          break
-        _print_formatted(formatters, ctx, chunk)
+        printer(ctx, chunk)

    # value is a substitution pattern
    elif args:
@@ -675,16 +666,14 @@ def _write_value(value, args, ctx):
            piece = args[idx]
          else:
            piece = '<undef>'
-        _print_formatted(formatters, ctx, piece)
+        printer(ctx, piece)

    # plain old value, write to output
    else:
-      _print_formatted(formatters, ctx, value)
+      printer(ctx, value)

  finally:
-    # restore our formatters
-    formatters.reverse()
-    ctx.formatters = formatters
+    ctx.printers.append(printer)


 class TemplateData:
@@ -726,7 +715,7 @@ class Context:
  """A container for the execution context"""
  def __init__(self, fp):
    self.fp = fp
-    self.formatters = []
+    self.printers = []
  def write(self, value, args=()):
    _write_value(value, args, self)

@@ -839,26 +828,20 @@ class BaseUnavailableError(EZTException):
 class UnknownFormatConstantError(EZTException):
  """The format specifier is an unknown value."""

-def _raw_formatter(s):
-  return s
+def _raw_printer(ctx, s):
+  ctx.fp.write(s)
+  
+def _html_printer(ctx, s):
+  ctx.fp.write(cgi.escape(s))

-def _html_formatter(s):
-  return cgi.escape(s)
+def _uri_printer(ctx, s):
+  ctx.fp.write(urllib.quote(s))

-def _xml_formatter(s):
-  s = s.replace('&', '&#x26;')
-  s = s.replace('<', '&#x3C;')
-  s = s.replace('>', '&#x3E;')
-  return s
-
-def _uri_formatter(s):
-  return urllib.quote(s)
-
-_formatters = {
-  FORMAT_RAW  : _raw_formatter,
-  FORMAT_HTML : _html_formatter,
-  FORMAT_XML  : _xml_formatter,
-  FORMAT_URI  : _uri_formatter,
+_printers = {
+  FORMAT_RAW  : _raw_printer,
+  FORMAT_HTML : _html_printer,
+  FORMAT_XML  : _html_printer,
+  FORMAT_URI  : _uri_printer,
 }

 # --- standard test environment ---
--- a/lib/idiff.py
+++ b/lib/idiff.py
@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2010 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
 #
 # By using this file, you agree to the terms and conditions set forth in
 # the LICENSE.html file which can be found at the top level of the ViewVC
@@ -20,7 +20,7 @@ import difflib
 import sys
 import re
 import ezt
-import sapi
+import cgi

 def sidebyside(fromlines, tolines, context):
  """Generate side by side diff"""
@@ -49,18 +49,18 @@ def _mdiff_split(flag, (line_number, text)):
  while True:
    m = _re_mdiff.search(text, pos)
    if not m:
-      segments.append(_item(text=sapi.escape(text[pos:]), type=None))
+      segments.append(_item(text=cgi.escape(text[pos:]), type=None))
      break

    if m.start() > pos:
-      segments.append(_item(text=sapi.escape(text[pos:m.start()]), type=None))
+      segments.append(_item(text=cgi.escape(text[pos:m.start()]), type=None))

    if m.group(1) == "+":
-      segments.append(_item(text=sapi.escape(m.group(2)), type="add"))
+      segments.append(_item(text=cgi.escape(m.group(2)), type="add"))
    elif m.group(1) == "-":
-      segments.append(_item(text=sapi.escape(m.group(2)), type="remove"))
+      segments.append(_item(text=cgi.escape(m.group(2)), type="remove"))
    elif m.group(1) == "^":
-      segments.append(_item(text=sapi.escape(m.group(2)), type="change"))
+      segments.append(_item(text=cgi.escape(m.group(2)), type="change"))

    pos = m.end()

@@ -166,12 +166,12 @@ def _differ_split(row, guide):

    for m in _re_differ.finditer(guide, pos):
      if m.start() > pos:
-        segments.append(_item(text=sapi.escape(line[pos:m.start()]), type=None))
-      segments.append(_item(text=sapi.escape(line[m.start():m.end()]),
+        segments.append(_item(text=cgi.escape(line[pos:m.start()]), type=None))
+      segments.append(_item(text=cgi.escape(line[m.start():m.end()]),
                            type="change"))
      pos = m.end()

-  segments.append(_item(text=sapi.escape(line[pos:]), type=None))
+  segments.append(_item(text=cgi.escape(line[pos:]), type=None))

  return _item(gap=ezt.boolean(gap), type=type, segments=segments,
               left_number=left_number, right_number=right_number)
--- a/lib/query.py
+++ b/lib/query.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*-python-*-
 #
-# Copyright (C) 1999-2010 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2009 The ViewCVS Group. All Rights Reserved.
 #
 # By using this file, you agree to the terms and conditions set forth in
 # the LICENSE.html file which can be found at the top level of the ViewVC
@@ -275,30 +275,8 @@ def prev_rev(rev):
    return string.join(r, '.')

 def is_forbidden(cfg, cvsroot_name, module):
-    '''Return 1 if MODULE in CVSROOT_NAME is forbidden; return 0 otherwise.'''
-
-    # CVSROOT_NAME might be None here if the data comes from an
-    # unconfigured root.  This interfaces doesn't care that the root
-    # isn't configured, but if that's the case, it will consult only
-    # the base and per-vhost configuration for authorizer and
-    # authorizer parameters.
-    if cvsroot_name:
-        authorizer, params = cfg.get_authorizer_and_params_hack(cvsroot_name)
-    else:
-        authorizer = cfg.options.authorizer
-        params = cfg.get_authorizer_params()
-        
-    # If CVSROOT_NAME isn't configured to use an authorizer, nothing
-    # is forbidden.  If it's configured to use something other than
-    # the 'forbidden' authorizer, complain.  Otherwise, check for
-    # forbiddenness per the PARAMS as expected.
-    if not authorizer:
-        return 0
-    if authorizer != 'forbidden':    
-        raise Exception("The 'forbidden' authorizer is the only one supported "
-                        "by this interface.  The '%s' root is configured to "
-                        "use a different one." % (cvsroot_name))
-    forbidden = params.get('forbidden', '')
+    auth_params = cfg.get_authorizer_params('forbidden', cvsroot_name)
+    forbidden = auth_params.get('forbidden', '')
    forbidden = map(string.strip, filter(None, string.split(forbidden, ',')))
    default = 0
    for pat in forbidden:
@@ -391,7 +369,6 @@ def run_query(server, cfg, form_data, viewvc_link):
    files = [ ]

    cvsroots = {}
-    viewvc.expand_root_parents(cfg)
    rootitems = cfg.general.svn_roots.items() + cfg.general.cvs_roots.items()
    for key, value in rootitems:
        cvsroots[cvsdb.CleanRepository(value)] = key
@@ -439,11 +416,11 @@ def main(server, cfg, viewvc_link):
      'cfg' : cfg,
      'address' : cfg.general.address,
      'vsn' : viewvc.__version__,
-      'repository' : server.escape(form_data.repository),
-      'branch' : server.escape(form_data.branch),
-      'directory' : server.escape(form_data.directory),
-      'file' : server.escape(form_data.file),
-      'who' : server.escape(form_data.who),
+      'repository' : server.escape(form_data.repository, 1),
+      'branch' : server.escape(form_data.branch, 1),
+      'directory' : server.escape(form_data.directory, 1),
+      'file' : server.escape(form_data.file, 1),
+      'who' : server.escape(form_data.who, 1),
      'docroot' : cfg.options.docroot is None \
                  and viewvc_link + '/' + viewvc.docroot_magic_path \
                  or cfg.options.docroot,
--- a/lib/sapi.py
+++ b/lib/sapi.py
@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2010 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2006 The ViewCVS Group. All Rights Reserved.
 #
 # By using this file, you agree to the terms and conditions set forth in
 # the LICENSE.html file which can be found at the top level of the ViewVC
@@ -20,27 +20,13 @@ import string
 import os
 import sys
 import re
-import cgi


-# global server object. It will be either a CgiServer, a WsgiServer,
-# or a proxy to an AspServer or ModPythonServer object.
+# global server object. It will be either a CgiServer or a proxy to
+# an AspServer or ModPythonServer object.
 server = None


-# Simple HTML string escaping.  Note that we always escape the
-# double-quote character -- ViewVC shouldn't ever need to preserve
-# that character as-is, and sometimes needs to embed escaped values
-# into HTML attributes.
-def escape(s):
-  s = str(s)
-  s = string.replace(s, '&', '&amp;')
-  s = string.replace(s, '>', '&gt;')
-  s = string.replace(s, '<', '&lt;')
-  s = string.replace(s, '"', "&quot;")
-  return s
-
-  
 class Server:
  def __init__(self):
    self.pageGlobals = {}
@@ -48,9 +34,6 @@ class Server:
  def self(self):
    return self

-  def escape(self, s):
-    return escape(s)
-    
  def close(self):
    pass

@@ -146,6 +129,9 @@ class CgiServer(Server):
    global server
    server = self

+    global cgi
+    import cgi
+
  def addheader(self, name, value):
    self.headers.append((name, value))

@@ -174,6 +160,9 @@ class CgiServer(Server):
    self.header(status='301 Moved')
    sys.stdout.write('This document is located <a href="%s">here</a>.\n' % url)

+  def escape(self, s, quote = None):
+    return cgi.escape(s, quote)
+
  def getenv(self, name, value=None):
    ret = os.environ.get(name, value)
    if self.iis and name == 'PATH_INFO' and ret:
@@ -198,66 +187,6 @@ class CgiServer(Server):
    return sys.stdout


-class WsgiServer(Server):
-  def __init__(self, environ, start_response):
-    Server.__init__(self)
-
-    self._environ = environ
-    self._start_response = start_response;
-    self._headers = []
-    self._wsgi_write = None
-    self.headerSent = False
-
-    global server
-    server = self
-
-    global cgi
-    import cgi
-
-  def addheader(self, name, value):
-    self._headers.append((name, value))
-
-  def header(self, content_type='text/html; charset=UTF-8', status=None):
-    if not status:
-      status = "200 OK"
-    if not self.headerSent:
-      self.headerSent = True
-      self._headers.insert(0, ("Content-Type", content_type),)
-      self._wsgi_write = self._start_response("%s" % status, self._headers)
-
-  def redirect(self, url):
-    """Redirect client to url. This discards any data that has been queued
-    to be sent to the user. But there should never by any anyway.
-    """
-    self.addheader('Location', url)
-    self.header(status='301 Moved')
-    self._wsgi_write('This document is located <a href="%s">here</a>.' % url)
-
-  def escape(self, s, quote = None):
-    return cgi.escape(s, quote)
-
-  def getenv(self, name, value=None):
-    return self._environ.get(name, value)
-
-  def params(self):
-    return cgi.parse(environ=self._environ, fp=self._environ["wsgi.input"])
-
-  def FieldStorage(self, fp=None, headers=None, outerboundary="",
-                   environ=os.environ, keep_blank_values=0, strict_parsing=0):
-    return cgi.FieldStorage(self._environ["wsgi.input"], self._headers,
-                            outerboundary, self._environ, keep_blank_values,
-                            strict_parsing)
-
-  def write(self, s):
-    self._wsgi_write(s)
-
-  def flush(self):
-    pass
-
-  def file(self):
-    return File(self)
-
-
 class AspServer(ThreadedServer):
  def __init__(self, Server, Request, Response, Application):
    ThreadedServer.__init__(self)
@@ -290,6 +219,9 @@ class AspServer(ThreadedServer):
  def redirect(self, url):
    self.response.Redirect(url)

+  def escape(self, s, quote = None):
+    return self.server.HTMLEncode(str(s))
+
  def getenv(self, name, value = None):
    ret = self.request.ServerVariables(name)()
    if not type(ret) is types.UnicodeType:
@@ -351,6 +283,9 @@ class ModPythonServer(ThreadedServer):
    self.request = request
    self.headerSent = 0
    
+    global cgi
+    import cgi
+
  def addheader(self, name, value):
    self.request.headers_out.add(name, value)

@@ -373,6 +308,9 @@ class ModPythonServer(ThreadedServer):
    self.request.write("You are being redirected to <a href=\"%s\">%s</a>"
                       % (url, url))

+  def escape(self, s, quote = None):
+    return cgi.escape(s, quote)
+
  def getenv(self, name, value = None):
    try:
      return self.request.subprocess_env[name]
--- a/lib/vclib/ccvs/rcsparse/default.py
+++ b/lib/vclib/ccvs/rcsparse/default.py
@@ -19,11 +19,7 @@ import string
 import common

 class _TokenStream:
-  token_term = string.whitespace + ";:"
-  try:
-    token_term = frozenset(token_term)
-  except NameError:
-    pass
+  token_term = string.whitespace + ';:'

  # the algorithm is about the same speed for any CHUNK_SIZE chosen.
  # grab a good-sized chunk, but not too large to overwhelm memory.
@@ -48,17 +44,15 @@ class _TokenStream:
    # out more complex solutions.

    buf = self.buf
-    lbuf = len(buf)
    idx = self.idx

    while 1:
-      if idx == lbuf:
+      if idx == len(buf):
        buf = self.rcsfile.read(self.CHUNK_SIZE)
        if buf == '':
          # signal EOF by returning None as the token
          del self.buf   # so we fail if get() is called again
          return None
-        lbuf = len(buf)
        idx = 0

      if buf[idx] not in string.whitespace:
@@ -66,7 +60,7 @@ class _TokenStream:

      idx = idx + 1

-    if buf[idx] in ';:':
+    if buf[idx] == ';' or buf[idx] == ':':
      self.buf = buf
      self.idx = idx + 1
      return buf[idx]
@@ -76,18 +70,17 @@ class _TokenStream:
      token = ''
      while 1:
        # find token characters in the current buffer
-        while end < lbuf and buf[end] not in self.token_term:
+        while end < len(buf) and buf[end] not in self.token_term:
          end = end + 1
        token = token + buf[idx:end]

-        if end < lbuf:
+        if end < len(buf):
          # we stopped before the end, so we have a full token
          idx = end
          break

        # we stopped at the end of the buffer, so we may have a partial token
        buf = self.rcsfile.read(self.CHUNK_SIZE)
-        lbuf = len(buf)
        idx = end = 0

      self.buf = buf
@@ -101,24 +94,22 @@ class _TokenStream:
    chunks = [ ]

    while 1:
-      if idx == lbuf:
+      if idx == len(buf):
        idx = 0
        buf = self.rcsfile.read(self.CHUNK_SIZE)
        if buf == '':
          raise RuntimeError, 'EOF'
-        lbuf = len(buf)
      i = string.find(buf, '@', idx)
      if i == -1:
        chunks.append(buf[idx:])
-        idx = lbuf
+        idx = len(buf)
        continue
-      if i == lbuf - 1:
+      if i == len(buf) - 1:
        chunks.append(buf[idx:i])
        idx = 0
        buf = '@' + self.rcsfile.read(self.CHUNK_SIZE)
        if buf == '@':
          raise RuntimeError, 'EOF'
-        lbuf = len(buf)
        continue
      if buf[i + 1] == '@':
        chunks.append(buf[idx:i+1])
--- a/lib/vclib/svn/svn_repos.py
+++ b/lib/vclib/svn/svn_repos.py
@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2010 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2009 The ViewCVS Group. All Rights Reserved.
 #
 # By using this file, you agree to the terms and conditions set forth in
 # the LICENSE.html file which can be found at the top level of the ViewVC
@@ -314,14 +314,14 @@ class FileContentsPipe:


 class BlameSource:
-  def __init__(self, local_url, rev, first_rev, config_dir):
+  def __init__(self, local_url, rev, first_rev):
    self.idx = -1
    self.first_rev = first_rev
    self.blame_data = []

    ctx = client.ctx_t()
-    core.svn_config_ensure(config_dir)
-    ctx.config = core.svn_config_get_config(config_dir)
+    core.svn_config_ensure(None)
+    ctx.config = core.svn_config_get_config(None)
    ctx.auth_baton = core.svn_auth_open([])
    try:
      ### TODO: Is this use of FIRST_REV always what we want?  Should we
@@ -376,7 +376,7 @@ class LocalSubversionRepository(vclib.Repository):
    self.auth = authorizer
    self.svn_client_path = utilities.svn or 'svn'
    self.diff_cmd = utilities.diff or 'diff'
-    self.config_dir = config_dir or None
+    self.config_dir = config_dir

    # See if this repository is even viewable, authz-wise.
    if not vclib.check_root_access(self):
@@ -567,7 +567,7 @@ class LocalSubversionRepository(vclib.Repository):
    youngest_rev, youngest_path = history[0]
    oldest_rev, oldest_path = history[-1]
    source = BlameSource(_rootpath2url(self.rootpath, path),
-                         youngest_rev, oldest_rev, self.config_dir)
+                         youngest_rev, oldest_rev)
    return source, youngest_rev

  def _revinfo(self, rev, include_changed_paths=0):
--- a/lib/viewvc.py
+++ b/lib/viewvc.py
@@ -1,6 +1,6 @@
 # -*-python-*-
 #
-# Copyright (C) 1999-2010 The ViewCVS Group. All Rights Reserved.
+# Copyright (C) 1999-2009 The ViewCVS Group. All Rights Reserved.
 #
 # By using this file, you agree to the terms and conditions set forth in
 # the LICENSE.html file which can be found at the top level of the ViewVC
@@ -14,7 +14,7 @@
 #
 # -----------------------------------------------------------------------

-__version__ = '1.1.6'
+__version__ = '1.1.2'

 # this comes from our library; measure the startup time
 import debug
@@ -24,6 +24,7 @@ debug.t_start('imports')
 # standard modules that we know are in the path or builtin
 import sys
 import os
+import cgi
 import gzip
 import mimetypes
 import re
@@ -233,7 +234,7 @@ class Request:
        cfg.overlay_root_options(self.rootname)
        
        # Setup an Authorizer for this rootname and username
-        self.auth = setup_authorizer(cfg, self.username)
+        self.auth = setup_authorizer(cfg, self.username, self.rootname)

        # Create the repository object
        try:
@@ -431,8 +432,7 @@ class Request:
    action = self.server.escape(urllib.quote(url, _URL_SAFE_CHARS))
    hidden_values = []
    for name, value in params.items():
-      hidden_values.append(_item(name=self.server.escape(name),
-                                 value=self.server.escape(value)))
+      hidden_values.append(_item(name=name, value=value))
    return action, hidden_values

  def get_link(self, view_func=None, where=None, pathtype=None, params=None):
@@ -633,14 +633,12 @@ def _validate_param(name, value):
    '400 Bad Request')

 def _validate_regex(value):
+  # hmm. there isn't anything that we can do here.
+
  ### we need to watch the flow of these parameters through the system
  ### to ensure they don't hit the page unescaped. otherwise, these
  ### parameters could constitute a CSS attack.
-  try:
-    re.compile(value)
-    return True
-  except:
-    return None
+  pass

 def _validate_view(value):
  # Return true iff VALUE is one of our allowed views.
@@ -691,15 +689,15 @@ _legal_params = {
  'content-type'  : _validate_mimetype,

  # for query
-  'file_match'    : _re_validate_alpha,
+  'branch'        : _validate_regex,
  'branch_match'  : _re_validate_alpha,
-  'who_match'     : _re_validate_alpha,
-  'comment_match' : _re_validate_alpha,
  'dir'           : None,
-  'file'          : None,
-  'branch'        : None,
-  'who'           : None,
-  'comment'       : None,
+  'file'          : _validate_regex,
+  'file_match'    : _re_validate_alpha,
+  'who'           : _validate_regex,
+  'who_match'     : _re_validate_alpha,
+  'comment'       : _validate_regex,
+  'comment_match' : _re_validate_alpha,
  'querysort'     : _re_validate_alpha,
  'date'          : _re_validate_alpha,
  'hours'         : _re_validate_number,
@@ -793,37 +791,32 @@ def _orig_path(request, rev_param='revision', path_param=None):
    return _path_parts(request.repos.get_location(path, pathrev, rev)), rev
  return _path_parts(path), rev

-def setup_authorizer(cfg, username, rootname=None):
-  """Setup the authorizer.  If ROOTNAME is provided, assume that
-  per-root options have not been overlayed.  Otherwise, assume they
-  have (and fetch the authorizer for the configured root)."""
+def setup_authorizer(cfg, username, rootname):
+  import imp
  
-  if rootname is None:
-    authorizer = cfg.options.authorizer
-    params = cfg.get_authorizer_params()
-  else:
-    authorizer, params = cfg.get_authorizer_and_params_hack(rootname)
-
  # No configured authorizer?  No problem.
-  if not authorizer:
+  if not cfg.options.authorizer:
    return None

  # First, try to load a module with the configured name.
-  import imp
  fp = None
  try:
    try:
-      fp, path, desc = imp.find_module("%s" % (authorizer), vcauth.__path__)
+      fp, path, desc = imp.find_module("%s" % (cfg.options.authorizer),
+                                       vcauth.__path__)
      my_auth = imp.load_module('viewvc', fp, path, desc)
    except ImportError:
      raise debug.ViewVCException(
        'Invalid authorizer (%s) specified for root "%s"' \
-        % (authorizer, rootname),
+        % (cfg.options.authorizer, rootname),
        '500 Internal Server Error')
  finally:
    if fp:
      fp.close()

+  # Now we'll get custom parameters for our particular root.
+  params = cfg.get_authorizer_params(cfg.options.authorizer, rootname)
+
  # Finally, instantiate our Authorizer.
  return my_auth.ViewVCAuthorizer(username, params)

@@ -915,7 +908,7 @@ def get_writeready_server_file(request, content_type=None):
  return fp
  
 def generate_page(request, view_name, data, content_type=None):
-  server_fp = get_writeready_server_file(request, content_type)
+  server_fp = get_writeready_server_file(request)
  template = get_view_template(request.cfg, view_name, request.language)
  template.generate(server_fp, data)

@@ -1076,189 +1069,54 @@ def get_file_view_info(request, where, rev=None, mime_type=None, pathrev=-1):
               prefer_markup=ezt.boolean(prefer_markup))


-# Matches URLs
+# Regular expressions for location text that looks like URLs and email
+# addresses.  Note that the regexps assume the text is already HTML-encoded.
 _re_rewrite_url = re.compile('((http|https|ftp|file|svn|svn\+ssh)'
-                             '(://[-a-zA-Z0-9%.~:_/]+)((\?|\&)'
+                             '(://[-a-zA-Z0-9%.~:_/]+)((\?|\&amp;)'
                             '([-a-zA-Z0-9%.~:_]+)=([-a-zA-Z0-9%.~:_])+)*'
                             '(#([-a-zA-Z0-9%.~:_]+)?)?)')
-# Matches email addresses
 _re_rewrite_email = re.compile('([-a-zA-Z0-9_.\+]+)@'
                               '(([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})')

+def mangle_email_addresses(text, style=0):
+  # style=2:  truncation mangling
+  if style == 2: 
+    return re.sub(_re_rewrite_email, r'\1&#64;&hellip;', text)

-class HtmlFormatter:
-  """Format a string as HTML-encoded output with customizable markup
-  rules, for example turning strings that look like URLs into anchor links.
+  # style=1:  entity-encoding and at-wrapping    
+  if style == 1: 
+    def _match_replace(matchobj):
+      return string.join(map(lambda x: '&#%d;' % (ord(x)),
+                             matchobj.group(1)), '') \
+             + ' {at} ' + \
+             string.join(map(lambda x: '&#%d;' % (ord(x)),
+                             matchobj.group(2)), '')
+    return re.sub(_re_rewrite_email, _match_replace, text)

-  NOTE:  While there might appear to be some unused portions of this
-  interface, there is a good chance that there are consumers outside
-  of ViewVC itself that make use of these things.
-  """
-  
-  def __init__(self):
-    self._formatters = []
+  # otherwise, no mangling
+  return text

-  def format_url(self, mobj, userdata, maxlen=0):
-    """Return a 2-tuple containing:
-         - the text represented by MatchObject MOBJ, formatted as
-           linkified URL, with no more than MAXLEN characters in the
-           non-HTML-tag bits.  If MAXLEN is 0, there is no maximum.
-         - the number of non-HTML-tag characters returned.
-    """
-    s = mobj.group(0)
-    trunc_s = maxlen and s[:maxlen] or s
-    return '<a href="%s">%s</a>' % (sapi.escape(s),
-                                    sapi.escape(trunc_s)), \
-           len(trunc_s)
+def htmlify(html, mangle_email_addrs=0):
+  if not html:
+    return html
+  html = cgi.escape(html)
+  html = re.sub(_re_rewrite_url, r'<a href="\1">\1</a>', html)
+  html = mangle_email_addresses(html, mangle_email_addrs)
+  return html

-  def format_email(self, mobj, userdata, maxlen=0):
-    """Return a 2-tuple containing:
-         - the text represented by MatchObject MOBJ, formatted as
-           linkified email address, with no more than MAXLEN characters
-           in the non-HTML-tag bits.  If MAXLEN is 0, there is no maximum.
-         - the number of non-HTML-tag characters returned.
-    """    
-    s = mobj.group(0)
-    trunc_s = maxlen and s[:maxlen] or s
-    return '<a href="mailto:%s">%s</a>' % (urllib.quote(s),
-                                           self._entity_encode(trunc_s)), \
-           len(trunc_s)
-
-  def format_email_obfuscated(self, mobj, userdata, maxlen=0):
-    """Return a 2-tuple containing:
-         - the text represented by MatchObject MOBJ, formatted as an
-           entity-encoded email address, with no more than MAXLEN characters
-           in the non-HTML-tag bits.  If MAXLEN is 0, there is no maximum.
-         - the number of non-HTML-tag characters returned.
-    """    
-    s = mobj.group(0)
-    trunc_s = maxlen and s[:maxlen] or s
-    return self._entity_encode(trunc_s), len(trunc_s)
-
-  def format_email_truncated(self, mobj, userdata, maxlen=0):
-    """Return a 2-tuple containing:
-         - the text represented by MatchObject MOBJ, formatted as an
-           HTML-escaped truncated email address of no more than MAXLEN
-           characters.  If MAXLEN is 0, there is no maximum.
-         - the number of characters returned.
-    """
-    s = mobj.group(1)
-    s_len = len(s)
-    if (maxlen == 0) or (s_len < (maxlen - 1)):
-      return self._entity_encode(s) + '&#64;&hellip;', s_len + 2
-    elif s_len < maxlen:
-      return self._entity_encode(s) + '&#64;', s_len + 1
-    else:
-      trunc_s = mobj.group(1)[:maxlen]
-      return self._entity_encode(trunc_s), len(trunc_s)
-
-  def format_text(self, s, unused, maxlen=0):
-    """Return a 2-tuple containing:
-         - the text S, HTML-escaped, containing no more than MAXLEN
-           characters.  If MAXLEN is 0, there is no maximum.
-         - the number of characters returned.
-    """   
-    trunc_s = maxlen and s[:maxlen] or s
-    return sapi.escape(trunc_s), len(trunc_s)
-  
-  def add_formatter(self, regexp, conv, userdata=None):
-    """Register a formatter which finds instances of strings matching
-    REGEXP, and using the function CONV and USERDATA to format them.
-
-    CONV is a function which accepts three parameters:
-      - the MatchObject which holds the string portion to be formatted,
-      - the USERDATA object,
-      - the maximum number of characters from that string to use for
-        human-readable output (or 0 to indicate no maximum).
-    """
-    if type(regexp) == type(''):
-      regexp = re.compile(regexp)
-    self._formatters.append([regexp, conv, userdata])
-
-  def get_result(self, s, maxlen=0):
-    """Format S per the set of formatters registered with this object,
-    and limited to MAXLEN visible characters (or unlimited if MAXLEN
-    is 0).  Return a 3-tuple containing the formatted result string,
-    the number of visible characters in the result string, and a
-    boolean flag indicating whether or not S was truncated.
-    """
-    out = ''
-    out_len = 0
-    for token in self._tokenize_text(s):
-      chunk, chunk_len = token.converter(token.match, token.userdata, maxlen)
-      out = out + chunk
-      out_len = out_len + chunk_len
-      if maxlen:
-        maxlen = maxlen - chunk_len
-        if maxlen <= 0:
-          return out, out_len, 1
-    return out, out_len, 0
-
-  def _entity_encode(self, s):
-    return string.join(map(lambda x: '&#%d;' % (ord(x)), s), '')
-
-  def _tokenize_text(self, s):
-    tokens = []
-    while s:
-      best_match = best_conv = best_userdata = None
-      for test in self._formatters:
-        match = test[0].search(s)
-        # If we find and match and (a) its our first one, or (b) it
-        # matches text earlier than our previous best match, or (c) it
-        # matches text at the same location as our previous best match
-        # but extends to cover more text than that match, then this is
-        # our new best match.
-        #
-        # Implied here is that when multiple formatters match exactly
-        # the same text, the first formatter in the registration list wins.
-        if match \
-           and ((best_match is None) \
-                or (match.start() < best_match.start())
-                or ((match.start() == best_match.start()) \
-                    and (match.end() > best_match.end()))):
-          best_match = match
-          best_conv = test[1]
-          best_userdata = test[2]
-      # If we found a match...
-      if best_match:
-        # ... add any non-matching stuff first, then the matching bit.
-        start = best_match.start()
-        end = best_match.end()
-        if start > 0:
-          tokens.append(_item(match=s[:start],
-                              converter=self.format_text,
-                              userdata=None))
-        tokens.append(_item(match=best_match,
-                            converter=best_conv,
-                            userdata=best_userdata))
-        s = s[end:]
-      else:
-        # Otherwise, just add the rest of the string.
-        tokens.append(_item(match=s,
-                            converter=self.format_text,
-                            userdata=None))
-        s = ''
-    return tokens
-
-def format_log(log, cfg, maxlen=0, htmlize=1):
+def format_log(log, cfg, htmlize=1):
  if not log:
    return log
-
  if htmlize:
-    lf = HtmlFormatter()
-    lf.add_formatter(_re_rewrite_url, lf.format_url)
-    if cfg.options.mangle_email_addresses == 2:
-      lf.add_formatter(_re_rewrite_email, lf.format_email_truncated)
-    elif cfg.options.mangle_email_addresses == 1:
-      lf.add_formatter(_re_rewrite_email, lf.format_email_obfuscated)
-    else:
-      lf.add_formatter(_re_rewrite_email, lf.format_email)
-    log, log_len, truncated = lf.get_result(log, maxlen)
-    return log + (truncated and '&hellip;' or '')
+    s = htmlify(log[:cfg.options.short_log_len],
+                cfg.options.mangle_email_addresses)
  else:
+    s = cgi.escape(log[:cfg.options.short_log_len])
    if cfg.options.mangle_email_addresses == 2:
-      log = re.sub(_re_rewrite_email, r'\1@...', log)
-    return maxlen and log[:maxlen] or log
+      s = re.sub(_re_rewrite_email, r'\1@...', s)
+  if len(log) > cfg.options.short_log_len:
+    s = s + '...'
+  return s

 _time_desc = {
         1 : 'second',
@@ -1346,7 +1204,7 @@ def common_template_data(request, revision=None, mime_type=None):
    'rootname' : request.rootname \
                 and request.server.escape(request.rootname) or None,
    'rootpath' : request.rootpath,
-    'roots_href' : None,
+    'roots_href' : request.get_url(view_func=view_roots, escape=1, params={}),
    'roottype' : request.roottype,
    'rss_href' : None,
    'tarball_href' : None,
@@ -1382,10 +1240,6 @@ def common_template_data(request, revision=None, mime_type=None):
                                      where=dir, pathtype=vclib.DIR,
                                      params={}, escape=1)

-  if 'roots' in cfg.options.allowed_views:
-    data['roots_href'] = request.get_url(view_func=view_roots,
-                                         escape=1, params={})
-
  if request.pathtype == vclib.FILE:
    fvi = get_file_view_info(request, request.where, data['rev'], mime_type)
    data['view_href'] = fvi.view_href
@@ -1458,21 +1312,22 @@ def retry_read(src, reqlen=CHUNK_SIZE):
        continue
    return chunk
  
-def copy_stream(src, dst, htmlize=0):
+def copy_stream(src, dst, cfg, htmlize=0):
  while 1:
    chunk = retry_read(src)
    if not chunk:
      break
    if htmlize:
-      chunk = sapi.escape(chunk)
+      chunk = htmlify(chunk, mangle_email_addrs=0)
    dst.write(chunk)

 class MarkupPipeWrapper:
  """An EZT callback that outputs a filepointer, plus some optional
  pre- and post- text."""

-  def __init__(self, fp, pretext=None, posttext=None, htmlize=0):
+  def __init__(self, cfg, fp, pretext=None, posttext=None, htmlize=1):
    self.fp = fp
+    self.cfg = cfg
    self.pretext = pretext
    self.posttext = posttext
    self.htmlize = htmlize
@@ -1480,7 +1335,7 @@ class MarkupPipeWrapper:
  def __call__(self, ctx):
    if self.pretext:
      ctx.fp.write(self.pretext)
-    copy_stream(self.fp, ctx.fp, self.htmlize)
+    copy_stream(self.fp, ctx.fp, self.cfg, self.htmlize)
    self.fp.close()
    if self.posttext:
      ctx.fp.write(self.posttext)
@@ -1493,7 +1348,7 @@ def markup_stream_pygments(request, cfg, blame_data, fp, filename, mime_type):
  blame_source = []
  if blame_data:
    for i in blame_data:
-      i.text = sapi.escape(i.text)
+      i.text = cgi.escape(i.text)
      i.diff_href = None
      if i.prev_rev:
        i.diff_href = request.get_url(view_func=view_diff,
@@ -1521,13 +1376,11 @@ def markup_stream_pygments(request, cfg, blame_data, fp, filename, mime_type):
    try:
      lexer = get_lexer_for_mimetype(mime_type,
                                     encoding=encoding,
-                                     tabsize=cfg.options.tabsize,
                                     stripnl=False)
    except ClassNotFound:
      try:
        lexer = get_lexer_for_filename(filename,
                                       encoding=encoding,
-                                       tabsize=cfg.options.tabsize,
                                       stripnl=False)
      except ClassNotFound:
        use_pygments = 0
@@ -1539,15 +1392,7 @@ def markup_stream_pygments(request, cfg, blame_data, fp, filename, mime_type):
  # one from the file contents we fetch with PATH and REV.
  if not use_pygments:
    if blame_source:
-      class BlameSourceTabsizeWrapper:
-        def __init__(self, blame_source, tabsize):
-          self.blame_source = blame_source
-          self.tabsize = cfg.options.tabsize
-        def __getitem__(self, idx):
-          item = self.blame_source.__getitem__(idx)
-          item.text = string.expandtabs(item.text, self.tabsize)
-          return item
-      return BlameSourceTabsizeWrapper(blame_source, cfg.options.tabsize)
+      return blame_source
    else:
      lines = []
      line_no = 0
@@ -1556,8 +1401,8 @@ def markup_stream_pygments(request, cfg, blame_data, fp, filename, mime_type):
        if not line:
          break
        line_no = line_no + 1
-        line = sapi.escape(string.expandtabs(line, cfg.options.tabsize))
-        item = vclib.Annotation(line, line_no, None, None, None, None)
+        item = vclib.Annotation(cgi.escape(line), line_no,
+                                None, None, None, None)
        item.diff_href = None
        lines.append(item)
    return lines
@@ -1623,7 +1468,7 @@ def get_itemprops(request, path_parts, rev):
  props = []
  has_binary_props = 0
  for name in propnames:
-    value = format_log(itemprops[name], request.cfg)
+    value = itemprops[name]
    undisplayable = ezt.boolean(0)
    # skip non-utf8 property names
    try:
@@ -1727,7 +1572,7 @@ def markup_or_annotate(request, is_annotate):
    data['date'] = make_time_string(entry.date, cfg)
    data['author'] = entry.author
    data['changed'] = entry.changed
-    data['log'] = format_log(entry.log, cfg)
+    data['log'] = htmlify(entry.log, cfg.options.mangle_email_addresses)
    data['size'] = entry.size

    if entry.date is not None:
@@ -1943,9 +1788,8 @@ def view_directory(request):
      row.date = make_time_string(file.date, cfg)
      row.ago = html_time(request, file.date)
    if cfg.options.show_logs:
-      row.log = format_log(file.log, cfg)
-      row.short_log = format_log(file.log, cfg,
-                                 maxlen=cfg.options.short_log_len)
+      row.short_log = format_log(file.log, cfg)
+      row.log = htmlify(file.log, cfg.options.mangle_email_addresses)
    row.lockinfo = file.lockinfo
    row.anchor = request.server.escape(file.name)
    row.name = request.server.escape(file.name)
@@ -2031,7 +1875,9 @@ def view_directory(request):
    'entries' : rows,
    'sortby' : sortby,
    'sortdir' : sortdir,
-    'search_re' : request.server.escape(search_re),
+    'search_re' : search_re \
+                  and htmlify(search_re, cfg.options.mangle_email_addresses) \
+                  or None,
    'dir_pagestart' : None,
    'sortby_file_href' :   request.get_url(params={'sortby': 'file',
                                                   'sortdir': None},
@@ -2318,7 +2164,7 @@ def view_log(request):
    entry.ago = None
    if rev.date is not None:
      entry.ago = html_time(request, rev.date, 1)
-    entry.log = format_log(rev.log or '', cfg)
+    entry.log = htmlify(rev.log or "", cfg.options.mangle_email_addresses)
    entry.size = rev.size
    entry.lockinfo = rev.lockinfo
    entry.branch_point = None
@@ -2580,7 +2426,7 @@ def view_checkout(request):
                or calculate_mime_type(request, path, rev) \
                or 'text/plain'
    server_fp = get_writeready_server_file(request, mime_type)
-    copy_stream(fp, server_fp)
+    copy_stream(fp, server_fp, cfg)
  fp.close()

 def view_cvsgraph_image(request):
@@ -2602,7 +2448,7 @@ def view_cvsgraph_image(request):
                    "-r", request.repos.rootpath,
                    rcsfile), 'rb', 0)
  
-  copy_stream(fp, get_writeready_server_file(request, 'image/png'))
+  copy_stream(fp, get_writeready_server_file(request, 'image/png'), cfg)
  fp.close()

 def view_cvsgraph(request):
@@ -2710,7 +2556,7 @@ def view_doc(request):
    mime_type = 'text/css'
  else: # assume HTML:
    mime_type = None
-  copy_stream(fp, get_writeready_server_file(request, mime_type))
+  copy_stream(fp, get_writeready_server_file(request, mime_type), cfg)
  fp.close()

 def rcsdiff_date_reformat(date_str, cfg):
@@ -2759,11 +2605,11 @@ class DiffSource:
        return item

  def _format_text(self, text):
-    text = string.expandtabs(string.rstrip(text), self.cfg.options.tabsize)
+    text = string.expandtabs(string.rstrip(text))
    hr_breakable = self.cfg.options.hr_breakable
    
    # in the code below, "\x01" will be our stand-in for "&". We don't want
-    # to insert "&" because it would get escaped by sapi.escape().  Similarly,
+    # to insert "&" because it would get escaped by htmlify().  Similarly,
    # we use "\x02" as a stand-in for "<br>"
  
    if hr_breakable > 1 and len(text) > hr_breakable:
@@ -2773,7 +2619,7 @@ class DiffSource:
      text = string.replace(text, '  ', ' \x01nbsp;')
    else:
      text = string.replace(text, ' ', '\x01nbsp;')
-    text = sapi.escape(text)
+    text = htmlify(text, mangle_email_addrs=0)
    text = string.replace(text, '\x01', '&')
    text = string.replace(text, '\x02',
                          '<span style="color:red">\</span><br />')
@@ -3055,7 +2901,7 @@ def view_patch(request):

  server_fp = get_writeready_server_file(request, 'text/plain')
  server_fp.write(headers)
-  copy_stream(fp, server_fp)
+  copy_stream(fp, server_fp, cfg)
  fp.close()


@@ -3073,15 +2919,6 @@ def view_diff(request):
  if check_freshness(request, None, '%s-%s' % (rev1, rev2), weak=1):
    return

-  # TODO: Is the slice necessary, or is limit enough?
-  log_entry1 = request.repos.itemlog(p1, rev1, vclib.SORTBY_REV, 0, 1, {})[-1]
-  log_entry2 = request.repos.itemlog(p2, rev2, vclib.SORTBY_REV, 0, 1, {})[-1]
-
-  ago1 = log_entry1.date is not None \
-         and html_time(request, log_entry1.date, 1) or None
-  ago2 = log_entry2.date is not None \
-         and html_time(request, log_entry2.date, 2) or None
-  
  diff_type = None
  diff_options = {}
  human_readable = 0
@@ -3142,31 +2979,30 @@ def view_diff(request):
                                 'to diff', '400 Bad Request')
  path_left = _path_join(p1)
  path_right = _path_join(p2)
-
-  date1 = date2 = raw_diff_fp = None
-  changes = []
  if fp:
    date1, date2, flag, headers = diff_parse_headers(fp, diff_type,
-                                                     rev1, rev2, sym1, sym2)
+                                                     rev1, rev2,
+                                                     sym1, sym2)
+  else:
+    date1 = date2 = flag = headers = None
+
+  raw_diff_fp = changes = None
+  if fp:
    if human_readable:
      if flag is not None:
        changes = [ _item(type=flag) ]
      else:
        changes = DiffSource(fp, cfg)
    else:
-      raw_diff_fp = MarkupPipeWrapper(fp, request.server.escape(headers), None, 1)
+      raw_diff_fp = MarkupPipeWrapper(cfg, fp,
+                                      htmlify(headers, mangle_email_addrs=0),
+                                      None, 1)

  no_format_params = request.query_dict.copy()
  no_format_params['diff_format'] = None
-  diff_format_action, diff_format_hidden_values = \
-    request.get_form(params=no_format_params)

  fvi = get_file_view_info(request, path_left, rev1)
-  left = _item(date=make_time_string(log_entry1.date, cfg),
-               author=log_entry1.author,
-               log=format_log(log_entry1.log, cfg),
-               size=log_entry1.size,
-               ago=ago1,
+  left = _item(date=rcsdiff_date_reformat(date1, cfg),
               path=path_left,
               rev=rev1,
               tag=sym1,
@@ -3178,11 +3014,7 @@ def view_diff(request):
               prefer_markup=fvi.prefer_markup)
    
  fvi = get_file_view_info(request, path_right, rev2)
-  right = _item(date=make_time_string(log_entry2.date, cfg),
-                author=log_entry2.author,
-                log=format_log(log_entry2.log, cfg),
-                size=log_entry2.size,
-                ago=ago2,
+  right = _item(date=rcsdiff_date_reformat(date2, cfg),
                path=path_right,
                rev=rev2,
                tag=sym2,
@@ -3193,6 +3025,9 @@ def view_diff(request):
                revision_href=fvi.revision_href,
                prefer_markup=fvi.prefer_markup)

+  diff_format_action, diff_format_hidden_values = \
+    request.get_form(params=no_format_params)
+      
  data = common_template_data(request)
  data.merge(ezt.TemplateData({
    'left' : left,
@@ -3537,7 +3372,7 @@ def view_revision(request):
    'rev' : str(rev),
    'author' : author,
    'date' : date_str,
-    'log' : format_log(msg, cfg),
+    'log' : msg and htmlify(msg, cfg.options.mangle_email_addresses) or None,
    'ago' : date is not None and html_time(request, date, 1) or None,
    'changes' : changes,
    'prev_href' : prev_rev_href,
@@ -3550,11 +3385,6 @@ def view_revision(request):
    'first_changes_href': first_changes_href,
    'jump_rev_action' : jump_rev_action,
    'jump_rev_hidden_values' : jump_rev_hidden_values,
-    'revision_href' : request.get_url(view_func=view_revision,
-                                      where=None,
-                                      pathtype=None,
-                                      params={'revision': str(rev)},
-                                      escape=1),
  }))
  if rev == youngest_rev:
    request.server.addheader("Cache-control", "no-store")
@@ -3582,67 +3412,34 @@ def is_querydb_nonempty_for_root(request):
      return 1
  return 0

-def validate_query_args(request):
-  # Do some additional input validation of query form arguments beyond
-  # what is offered by the CGI param validation loop in Request.run_viewvc().
-  
-  for arg_base in ['branch', 'file', 'comment', 'who']:
-    # First, make sure the the XXX_match args have valid values:
-    arg_match = arg_base + '_match'
-    arg_match_value = request.query_dict.get(arg_match, 'exact')
-    if not arg_match_value in ('exact', 'like', 'glob', 'regex', 'notregex'):
-      raise debug.ViewVCException(
-        'An illegal value was provided for the "%s" parameter.'
-        % (arg_match),
-        '400 Bad Request')
-
-    # Now, for those args which are supposed to be regular expressions (per
-    # their corresponding XXX_match values), make sure they are.
-    if arg_match_value == 'regex' or arg_match_value == 'notregex':
-      arg_base_value = request.query_dict.get(arg_base)
-      if arg_base_value:
-        try:
-          re.compile(arg_base_value)
-        except:
-          raise debug.ViewVCException(
-            'An illegal value was provided for the "%s" parameter.'
-            % (arg_base),
-            '400 Bad Request')
-  
 def view_queryform(request):
  if not is_query_supported(request):
    raise debug.ViewVCException('Can not query project root "%s" at "%s".'
                                 % (request.rootname, request.where),
                                 '403 Forbidden')

-  # Do some more precise input validation.
-  validate_query_args(request)
-  
  query_action, query_hidden_values = \
    request.get_form(view_func=view_query, params={'limit_changes': None})
  limit_changes = \
    int(request.query_dict.get('limit_changes',
                               request.cfg.options.limit_changes))
-
-  def escaped_query_dict_get(itemname, itemdefault=''):
-    return request.server.escape(request.query_dict.get(itemname, itemdefault))
-    
+  
  data = common_template_data(request)
  data.merge(ezt.TemplateData({
-    'branch' : escaped_query_dict_get('branch', ''),
-    'branch_match' : escaped_query_dict_get('branch_match', 'exact'),
-    'dir' : escaped_query_dict_get('dir', ''),
-    'file' : escaped_query_dict_get('file', ''),
-    'file_match' : escaped_query_dict_get('file_match', 'exact'),
-    'who' : escaped_query_dict_get('who', ''),
-    'who_match' : escaped_query_dict_get('who_match', 'exact'),
-    'comment' : escaped_query_dict_get('comment', ''),
-    'comment_match' : escaped_query_dict_get('comment_match', 'exact'),
-    'querysort' : escaped_query_dict_get('querysort', 'date'),
-    'date' : escaped_query_dict_get('date', 'hours'),
-    'hours' : escaped_query_dict_get('hours', '2'),
-    'mindate' : escaped_query_dict_get('mindate', ''),
-    'maxdate' : escaped_query_dict_get('maxdate', ''),
+    'branch' : request.query_dict.get('branch', ''),
+    'branch_match' : request.query_dict.get('branch_match', 'exact'),
+    'dir' : request.query_dict.get('dir', ''),
+    'file' : request.query_dict.get('file', ''),
+    'file_match' : request.query_dict.get('file_match', 'exact'),
+    'who' : request.query_dict.get('who', ''),
+    'who_match' : request.query_dict.get('who_match', 'exact'),
+    'comment' : request.query_dict.get('comment', ''),
+    'comment_match' : request.query_dict.get('comment_match', 'exact'),
+    'querysort' : request.query_dict.get('querysort', 'date'),
+    'date' : request.query_dict.get('date', 'hours'),
+    'hours' : request.query_dict.get('hours', '2'),
+    'mindate' : request.query_dict.get('mindate', ''),
+    'maxdate' : request.query_dict.get('maxdate', ''),
    'query_action' : query_action,
    'query_hidden_values' : query_hidden_values,
    'limit_changes' : limit_changes,
@@ -3706,7 +3503,8 @@ def english_query(request):
    ret.append('on all branches ')
  comment = request.query_dict.get('comment', '')
  if comment:
-    ret.append('with comment <i>%s</i> ' % request.server.escape(comment))
+    ret.append('with comment <i>%s</i> '
+               % htmlify(comment, mangle_email_addrs=0))
  if who:
    ret.append('by <em>%s</em> ' % request.server.escape(who))
  date = request.query_dict.get('date', 'hours')
@@ -3894,9 +3692,8 @@ def build_commit(request, files, max_files, dir_strip, format):
    commit.log = None
    commit.short_log = None
  else:
-    commit.log = format_log(desc, cfg, 0, format != 'rss')
-    commit.short_log = format_log(desc, cfg, cfg.options.short_log_len,
-                                  format != 'rss')
+    commit.log = htmlify(desc)
+    commit.short_log = format_log(desc, cfg, format != 'rss')
  commit.author = request.server.escape(author)
  commit.rss_date = make_rss_time_string(date, request.cfg)
  if request.roottype == 'svn':
@@ -3913,29 +3710,27 @@ def build_commit(request, files, max_files, dir_strip, format):
  return commit

 def query_backout(request, commits):
-  server_fp = get_writeready_server_file(request, 'text/plain')
-  if not commits:
-    server_fp.write("""\
-# No changes were selected by the query.
-# There is nothing to back out.
-""")
+  request.server.header('text/plain')
+  if commits:
+    print '# This page can be saved as a shell script and executed.'
+    print '# It should be run at the top of your work area.  It will update'
+    print '# your working copy to back out the changes selected by the'
+    print '# query.'
+    print
+  else:
+    print '# No changes were selected by the query.'
+    print '# There is nothing to back out.'
    return
-  server_fp.write("""\
-# This page can be saved as a shell script and executed.
-# It should be run at the top of your work area.  It will update
-# your working copy to back out the changes selected by the
-# query.
-""")
  for commit in commits:
    for fileinfo in commit.files:
      if request.roottype == 'cvs':
-        server_fp.write('cvs update -j %s -j %s %s/%s\n'
-                        % (fileinfo.rev, prev_rev(fileinfo.rev),
-                           fileinfo.dir, fileinfo.file))
+        print 'cvs update -j %s -j %s %s/%s' \
+              % (fileinfo.rev, prev_rev(fileinfo.rev),
+                 fileinfo.dir, fileinfo.file)
      elif request.roottype == 'svn':
-        server_fp.write('svn merge -r %s:%s %s/%s\n'
-                        % (fileinfo.rev, prev_rev(fileinfo.rev),
-                           fileinfo.dir, fileinfo.file))
+        print 'svn merge -r %s:%s %s/%s' \
+              % (fileinfo.rev, prev_rev(fileinfo.rev),
+                 fileinfo.dir, fileinfo.file)

 def view_query(request):
  if not is_query_supported(request):
@@ -3945,9 +3740,6 @@ def view_query(request):

  cfg = request.cfg

-  # Do some more precise input validation.
-  validate_query_args(request)
-
  # get form data
  branch = request.query_dict.get('branch', '')
  branch_match = request.query_dict.get('branch_match', 'exact')
@@ -4282,7 +4074,7 @@ def load_config(pathname=None, server=None):
  if cfg.general.mime_types_files:
    files = cfg.general.mime_types_files[:]
    files.reverse()
-    files = map(lambda x, y=pathname: os.path.join(os.path.dirname(y), x), files)
+    files = map(lambda x: os.path.join(os.path.dirname(pathname), x), files)
    mimetypes.init(files)
  
  debug.t_end('load-config')
--- a/notes/releases.txt
+++ b/notes/releases.txt
@@ -44,7 +44,9 @@ numbers, and not literal):

 8.  Update your working copy to HEAD, and tag the release:

-       svn up && svn cp -m "Tag the X.Y.Z final release." . ^/tags/X.Y.Z
+       svn update
+       svn cp -m "Tag the X.Y.Z final release." . \
+                 http://viewvc.tigris.org/svn/viewvc/tags/X.Y.Z

 9.  Go into an empty directory and run the 'make-release' script:

--- a/templates/diff.ezt
+++ b/templates/diff.ezt
@@ -21,13 +21,13 @@
    <th style="width:6%;"></th>
    <th style="width:47%; vertical-align:top;">
      [is left.path right.path][else][left.path][end]
-      revision [if-any left_view_href]<a href="[left_view_href]">[end][left.rev][if-any left_view_href]</a>[end][if-any left.author] by <em>[left.author]</em>[end],
+      revision [if-any left_view_href]<a href="[left_view_href]">[end][left.rev][if-any left_view_href]</a>[end],
      [left.date]
      [if-any left.tag]<br />Tag: [left.tag][end]
    </th>
    <th style="width:47%; vertical-align:top;">
      [is left.path right.path][else][right.path][end]
-      revision [if-any right_view_href]<a href="[right_view_href]">[end][right.rev][if-any right_view_href]</a>[end][if-any right.author] by <em>[right.author]</em>[end],
+      revision [if-any right_view_href]<a href="[right_view_href]">[end][right.rev][if-any right_view_href]</a>[end],
      [right.date]
      [if-any right.tag]<br />Tag: [right.tag][end]
    </th>
--- a/templates/file.ezt
+++ b/templates/file.ezt
@@ -71,9 +71,9 @@ Revision [if-any revision_href]<a href="[revision_href]"><strong>[rev]</strong><
 [if-any image_src_href][define hide_binary_garbage]0[end][end]

 [is hide_binary_garbage "1"]
-<p><strong>This file's contents are not viewable.
-   [if-any download_href]Please <a href="[download_href]">download</a>
-   this version of the file in order to view it.[end]</strong></p>
+<p><strong>This file's contents are not viewable.  Please 
+   <a href="[download_href]">download</a> this version of the
+   file in order to view it.</strong></p>
 [else]

 [define last_rev]0[end]
--- a/templates/include/header.ezt
+++ b/templates/include/header.ezt
@@ -5,7 +5,7 @@
 <head>
  <title>[if-any rootname][[][rootname]][else]ViewVC[end] [page_title]</title>
  <meta name="generator" content="ViewVC [vsn]" />
-  <link rel="shortcut icon" href="[docroot]/images/favicon.ico" />
+  <link rel="shortcut icon" href="[docroot]/images/favicon.ico" type="image/x-icon" />
  <link rel="stylesheet" href="[docroot]/styles.css" type="text/css" />
  [if-any rss_href]<link rel="alternate" type="application/rss+xml" title="RSS [[][rootname]][where]" href="[rss_href]" />[end]
 </head>
--- a/templates/rss.ezt
+++ b/templates/rss.ezt
@@ -7,11 +7,11 @@
    <description>[is roottype "svn"]Subversion[else]CVS[end] commits to the[if-any where] [where] directory of the[end] [rootname] repository</description>

 	[for commits]<item>
-        <title>[if-any commits.rev][commits.rev]: [end][[commits.author]] [format "xml"][commits.short_log][end]</title>
+        <title>[if-any commits.rev][commits.rev]: [end][[commits.author]] [commits.short_log]</title>
 		[if-any commits.rss_url]<link>[commits.rss_url]</link>[end]
 		<author>[commits.author]</author>
 		<pubDate>[if-any commits.rss_date][commits.rss_date][else](unknown date)[end]</pubDate>
-		<description>&#x3C;pre&#x3E;[format "xml"][format "html"][commits.log][end][end]&#x3C;/pre&#x3E;</description>
+		<description>&lt;pre&gt;[format "xml"][commits.log][end]&lt;/pre&gt;</description>
    </item>[end]
 </channel>	
 </rss>
--- a/19
+++ b/19
@@ -49,8 +49,6 @@ CLEAN_MODE = None
 FILE_INFO_LIST = [
    ("bin/cgi/viewvc.cgi",        "bin/cgi/viewvc.cgi",        0755, 1, 0, 0),
    ("bin/cgi/query.cgi",         "bin/cgi/query.cgi",         0755, 1, 0, 0),
-    ("bin/wsgi/viewvc.wsgi",      "bin/wsgi/viewvc.wsgi",      0755, 1, 0, 0),
-    ("bin/wsgi/query.wsgi",       "bin/wsgi/query.wsgi",       0755, 1, 0, 0),
    ("bin/mod_python/viewvc.py",  "bin/mod_python/viewvc.py",  0755, 1, 0, 0),
    ("bin/mod_python/query.py",   "bin/mod_python/query.py",   0755, 1, 0, 0),
    ("bin/mod_python/handler.py", "bin/mod_python/handler.py", 0755, 1, 0, 0),
@@ -77,12 +75,11 @@ if sys.platform == "win32":
 ## List of directories for installation.
 ##    type (source path,
 ##          destination path,
-##          boolean -- optional item?,
 ##          boolean -- prompt before replacing?)
 TREE_LIST = [
-    ("lib",                       "lib",                       0, 0),
-    ("templates",                 "templates",                 0, 1),
-    ("templates-contrib",         "templates-contrib",         1, 1),
+    ("lib",                       "lib",                       0),
+    ("templates",                 "templates",                 1),
+    ("templates-contrib",         "templates-contrib",         1),
    ]


@@ -278,22 +275,18 @@ LEGEND
        py_compile.compile(destdir_path, destdir_path + "c" , dst_path)


-def install_tree(src_path, dst_path, is_optional, prompt_replace):
+def install_tree(src_path, dst_path, prompt_replace):
    """Install a tree whose source is at SRC_PATH (which is relative
    to the ViewVC source directory) into the location DST_PATH (which
    is relative both to the global ROOT_DIR and DESTDIR settings).  If
    PROMPT_REPLACE is set (and is not overridden by global setting
    CLEAN_MODE), prompt the user for how to deal with already existing
-    files that differ from the to-be-installed version.  If
-    IS_OPTIONAL is set, don't fuss about a missing source item."""
+    files that differ from the to-be-installed version."""

    orig_src_path = src_path
    orig_dst_path = dst_path
    src_path = _actual_src_path(src_path)
    dst_path = os.path.join(ROOT_DIR, string.replace(dst_path, '/', os.sep))
-    if not os.path.isdir(src_path):
-        print "   skipping  %s" % (dst_path)
-        return
    destdir_path = os.path.join(DESTDIR + dst_path)

    # Get a list of items in the directory.
@@ -313,7 +306,7 @@ def install_tree(src_path, dst_path, is_optional, prompt_replace):

        # If the item is a subdirectory, recurse.  Otherwise, install the file.
        if os.path.isdir(os.path.join(src_path, fname)):
-            install_tree(orig_src_child, orig_dst_child, 0, prompt_replace)
+            install_tree(orig_src_child, orig_dst_child, prompt_replace)
        else:
            set_paths = 0
            compile_it = fname[-3:] == '.py'
--- a/viewvc.org/.htaccess
+++ b/viewvc.org/.htaccess
@@ -0,0 +1,9 @@
+# Old documents.
+RedirectPermanent /upgrading.html http://viewvc.tigris.org/nonav/source/browse/*checkout*/viewvc/trunk/docs/upgrading-howto.html
+RedirectPermanent /template-authoring-guide.html http://viewvc.tigris.org/nonav/source/browse/*checkout*/viewvc/trunk/docs/template-authoring-guide.html
+RedirectPermanent /url-reference.html http://viewvc.tigris.org/nonav/source/browse/*checkout*/viewvc/trunk/docs/url-reference.html
+
+# The license-1.html file.
+RedirectPermanent /license-1.html http://viewvc.tigris.org/nonav/source/browse/*checkout*/viewvc/trunk/LICENSE.html
+
+
--- a/viewvc.org/contact.html
+++ b/viewvc.org/contact.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>ViewVC: Contact</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<link rel="stylesheet" type="text/css" href="./styles.css"/>
+<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+</head>
+
+<body>
+
+<div id="title">
+<a href="http://www.viewvc.org/"><img 
+   src="./images/title.jpg" alt="ViewVC: Repository Browsing"/></a>
+</div>
+
+<div id="menu">
+<p><a href="./index.html">Home</a> |
+   <a href="http://viewvc.tigris.org/">Project Page</a> |
+   <a href="./download.html">Download</a> |
+   <a href="./contributing.html">Contributing</a> |
+   <a href="./faq.html">FAQ</a> |
+   <a href="http://viewvc.tigris.org/nonav/source/browse/*checkout*/viewvc/trunk/LICENSE.html">License</a> |
+   <a href="./contact.html">Contact</a> |
+   <a href="./who.html">About</a>
+</p>
+</div>
+
+<table id="pagetable">
+<tr>
+<td id="pagecolumn1">
+
+<h4>On this page:</h4>
+
+<ul id="bookmarks">
+  <li><a href="#sec-contacting-us">Contacting Us</a></li>
+</ul>
+
+<p><a href="http://validator.w3.org/check?uri=referer"><img
+       src="http://www.w3.org/Icons/valid-xhtml10"
+       alt="Valid XHTML 1.0 Strict" height="31" width="88" /></a>
+</p>
+
+</td>
+<td id="pagecolumn2">
+
+<div class="section">
+
+<h2 id="sec-contacting-us">Contacting Us</h2>
+
+<div class="section-body">
+
+<p>ViewVC is an <a href="http://www.opensource.org/">Open Source</a>
+   project, and all <a href="./contributing.html">contributions</a>
+   are welcome.  Please send any comments, questions, or suggestions
+   to the <a
+   href="mailto:&#117;&#115;&#101;&#114;&#115;&#64;&#118;&#105;&#101;&#119;&#118;&#99;&#46;&#116;&#105;&#103;&#114;&#105;&#115;&#46;&#111;&#114;&#103;">ViewVC
+   users mailing list</a>.  There is also a <a
+   href="mailto:&#100;&#101;&#118;&#64;&#118;&#105;&#101;&#119;&#118;&#99;&#46;&#116;&#105;&#103;&#114;&#105;&#115;&#46;&#111;&#114;&#103;">mailing
+   list specifically for ViewVC developers</a>.  You can subscribe to
+   these lists (and other project lists), as well view the list
+   archives, <a
+   href="http://viewvc.tigris.org/servlets/ProjectMailingListList"
+   >here</a>.  If you are having problems with ViewVC, consider
+   checking our <a href="./faq.html">Frequently Asked Questions</a>
+   page and list of <a
+   href="http://viewvc.tigris.org/issues/buglist.cgi?component=viewvc&amp;issue_status=UNCONFIRMED&amp;issue_status=NEW&amp;issue_status=STARTED&amp;issue_status=REOPENED"
+   >open issues</a> before mail our users@ list &mdash; perhaps the
+   information you need is already available in one of those
+   places.</p>
+
+<p>If you prefer interaction that's a little more real-time, use your
+   favorite IRC client to pop into <tt><a
+   href="irc://irc.freenode.net/viewvc">#viewvc</a></tt> on
+   irc.freenode.net.</p>
+
+<p>So, to summarize:</p>
+
+<ul>
+<li>To discuss ViewVC installation, configuration, and behavior:  &#117;&#115;&#101;&#114;&#115;&#64;&#118;&#105;&#101;&#119;&#118;&#99;&#46;&#116;&#105;&#103;&#114;&#105;&#115;&#46;&#111;&#114;&#103;</li>
+<li>To discuss the development of ViewVC itself or submit patches:  &#100;&#101;&#118;&#64;&#118;&#105;&#101;&#119;&#118;&#99;&#46;&#116;&#105;&#103;&#114;&#105;&#115;&#46;&#111;&#114;&#103;</li>
+<li>To discussion anything ViewVC-related in real time:  irc.freenode.net, #viewvc</li>
+</ul>
+
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+</td>
+</tr>
+</table>
+</body>
+</html>
--- a/viewvc.org/contributing.html
+++ b/viewvc.org/contributing.html
@@ -0,0 +1,241 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>ViewVC: Contributing</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<link rel="stylesheet" type="text/css" href="./styles.css"/>
+<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+</head>
+
+<body>
+
+<div id="title">
+<a href="http://www.viewvc.org/"><img 
+   src="./images/title.jpg" alt="ViewVC: Repository Browsing"/></a>
+</div>
+
+<div id="menu">
+<p><a href="./index.html">Home</a> |
+   <a href="http://viewvc.tigris.org/">Project Page</a> |
+   <a href="./download.html">Download</a> |
+   <a href="./contributing.html">Contributing</a> |
+   <a href="./faq.html">FAQ</a> |
+   <a href="http://viewvc.tigris.org/nonav/source/browse/*checkout*/viewvc/trunk/LICENSE.html">License</a> |
+   <a href="./contact.html">Contact</a> |
+   <a href="./who.html">About</a>
+</p>
+</div>
+
+<table id="pagetable">
+<tr>
+<td id="pagecolumn1">
+
+<h4>On this page:</h4>
+
+<ul id="bookmarks">
+  <li><a href="#sec-getting-started">Getting Started</a></li>
+  <li><a href="#sec-testing">Testing and Reporting</a></li>
+  <li><a href="#sec-coding-style">Coding Style</a></li>
+  <li><a href="#sec-patches">Submitting Patches</a></li>
+  <li><a href="#sec-security">Security</a></li>
+  <li><a href="#sec-adding-features">Adding Features</a></li>
+  <li><a href="#sec-templates">Hacking on Templates</a></li>
+</ul>
+
+<p><a href="http://validator.w3.org/check?uri=referer"><img
+       src="http://www.w3.org/Icons/valid-xhtml10"
+       alt="Valid XHTML 1.0 Strict" height="31" width="88" /></a>
+</p>
+
+</td>
+<td id="pagecolumn2">
+
+<div class="section">
+
+<h2 id="sec-getting-started">Getting Started</h2>
+
+<div class="section-body">
+
+<p>Some basic knowledge about <a
+   href="http://www.python.org">Python</a> and development tools like
+   <code>diff</code> is required.  Your best bet is to start with a
+   fresh source code snapshot, which you may obtain from our
+   Subversion repository (see instructions <a
+   href="./download.html#sec-subversion">here</a>).</p>
+
+<p>Version control history can be obtained using Subversion clients,
+   but is also browsable using <a
+   href="http://viewvc.tigris.org/source/browse/viewvc/trunk/"
+   >tigris.org's integrated ViewVC tool</a>.</p>
+
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+<div class="section">
+
+<h2 id="sec-testing">Testing and Reporting</h2>
+
+<div class="section-body">
+
+<p>Testing usability and the installation process on different
+   platforms is also a valuable contribution.  Please report your
+   results back to us developers.  Bandwidth is getting cheaper daily,
+   so don't be afraid &mdash; in fact, feel encouraged &mdash; to dump
+   as much detail about the problems you are seeing as possible into
+   your bug reports.  Here are some things you definitely should
+   try to include:</p>
+
+<ul>
+
+  <li>What version of ViewVC you are using (if you are using a source
+      snapshot, tell us the date of that snapshot).</li>
+
+  <li>What operating system your ViewVC is running on.</li>
+
+  <li>What version of Python you are using.</li>
+
+  <li>Whether you are running ViewVC standalone, or as a CGI program
+      under a web server (and if so, what web server).</li>
+
+  <li>The URL of your ViewVC instantiation, if it is public.
+      Sometimes, letting developers see the problem for themselves can
+      save everyone alot of time.</li>
+
+</ul>
+
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+<div class="section">
+      
+<h2 id="sec-coding-style">Coding Style</h2>
+
+<div class="section-body">
+
+<p>Unlike its predecessor, CvsWeb, ViewVC is written in Python, so it
+   doesn't suffer from the "unmaintainable code effect" that hits most
+   Perl projects sooner or later:</p>
+
+<blockquote>
+  
+<p>&quot;[Perl] combines all the worst aspects of C and Lisp: a
+   billion different sublanguages in one monolithic executable.  It
+   combines the power of C with the readability of
+   PostScript.&quot;  &mdash;&nbsp;Jamie&nbsp;Zawinski
+</p>
+
+</blockquote>
+
+<p>Of course, a symphony of insanity can be composed in any language,
+   so we do try to stick to some basic guiding principles.  Maintain
+   whatever style is present in the code being modified.  New code can
+   use anything sane (which generally means <a
+   href="http://www.python.org/dev/peps/pep-0008/">PEP&nbsp;8</a>).
+   Our only real peeve is if someone writes a function call as:
+   <code>some_func&nbsp;(args)</code> &mdash; that space between the
+   function name and opening parenthesis is Huge Badness.  Oh, and we
+   do <strong>not</strong> use Subversion keywords (such as
+   <code>$</code><code>Id$</code>) within the source.</p>
+
+<p>Otherwise&hellip; <em>shrug</em>.</p>
+
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+<div class="section">
+
+<h2 id="sec-patches">Submitting Patches</h2>
+
+<div class="section-body">
+
+<p>Nothing speaks more loudly when bugs or features are the topic than
+   a patch.  And quite frankly, sometimes if you want something done,
+   you gotta do it yourself.  So, patches are always welcome.  If you
+   aren't sure what exactly a &quot;patch&quot; is, or don't know how
+   to generate one, but you've got code contributions to make, please
+   don't hesitate to ask questions on the mailing lists.  Patch
+   generation and application are pretty easy thing to get the hang of,
+   and drastically simplify code submission and review.</p>
+
+<p>Please use the <a
+   href="http://viewvc.tigris.org/servlets/ProjectIssues">Issue
+   Tracker</a> to submit your patches.  Unified contextual diffs
+   against the latest development snapshot are preferred.</p>
+
+<p>If you have commit access, then you should know what you're doing.
+   Just make changes directly.  Subscribing to the <a
+   href="http://viewvc.tigris.org/servlets/ProjectMailingListList"
+   ><tt>dev@</tt> developer mailing list</a> is recommended in any
+   case.</p>
+
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+<div class="section">
+
+<h2 id="sec-security">Security</h2>
+
+<div class="section-body">
+
+<p>Since ViewVC is used on the Internet, security is a major concern.
+   If you need to pass data from the request into an external program,
+   please don't use <code>os.system()</code> or
+   <code>os.popen()</code>.  Please use the module
+   <code>lib/popen.py</code> that is included in the ViewVC
+   distribution instead.</p>
+
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+<div class="section">
+
+<h2 id="sec-adding-features">Adding Features</h2>
+
+<div class="section-body">
+
+<p>If you need a new configuration option think carefully, into which
+   section it belongs.  Try to keep the content of
+   <code>cgi/viewvc.conf.dist</code> file and the library module
+   <code>lib/config.py</code> in sync.</p>
+
+<p>Because ViewVC is a Web-based application, people will have ViewVC
+   URLs hyperlinked from other sites, embedded in emails, bookmarked
+   in their browsers, etc.  It is very important to ensure that those
+   URLs continue to retrieve the information they were intended to
+   retrieve even if ViewVC is upgraded on the hosting server.  In
+   other words, as new features require modifications to the <a
+   href="./url-reference.html">ViewVC URL schema</a>, make sure those
+   modifications preserve the existing functionality of all ViewVC
+   URLs.</p>
+
+<p>The library subdirectory contains a module <code>debug.py</code>,
+   which you may find useful for performance testing.</p>
+
+<p>If a new file or module is added, a new line in the installer
+   program <code>viewvc-install</code> is required.</p>
+
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+<div class="section">
+
+<h2 id="sec-templates">Hacking on Templates</h2>
+
+<div class="section-body">
+
+<p>The library module <code>ezt.py</code> contains a module docstring
+   which describes the directives used in the HTML templates used by
+   ViewVC.  The templates themselves can be found in the
+   <code>templates</code> subdirectory.  We're currently developing a
+   how-to guide for <a href="./template-authoring-guide.html">ViewVC
+   template customization</a>.</p>
+
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+</td>
+</tr>
+</table>
+</body>
+</html>
--- a/viewvc.org/download.html
+++ b/viewvc.org/download.html
@@ -0,0 +1,90 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>ViewVC: Download</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<link rel="stylesheet" type="text/css" href="./styles.css"/>
+<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+</head>
+
+<body>
+
+<div id="title">
+<a href="http://www.viewvc.org/"><img 
+   src="./images/title.jpg" alt="ViewVC: Repository Browsing"/></a>
+</div>
+
+<div id="menu">
+<p><a href="./index.html">Home</a> |
+   <a href="http://viewvc.tigris.org/">Project Page</a> |
+   <a href="./download.html">Download</a> |
+   <a href="./contributing.html">Contributing</a> |
+   <a href="./faq.html">FAQ</a> |
+   <a href="http://viewvc.tigris.org/nonav/source/browse/*checkout*/viewvc/trunk/LICENSE.html">License</a> |
+   <a href="./contact.html">Contact</a> |
+   <a href="./who.html">About</a>
+</p>
+</div>
+
+<table id="pagetable">
+<tr>
+<td id="pagecolumn1">
+
+<h4>On this page:</h4>
+
+<ul id="bookmarks">
+  <li><a href="#sec-download">Downloading</a></li>
+  <li><a href="#sec-subversion">Subversion</a></li>
+</ul>
+
+<p><a href="http://validator.w3.org/check?uri=referer"><img
+       src="http://www.w3.org/Icons/valid-xhtml10"
+       alt="Valid XHTML 1.0 Strict" height="31" width="88" /></a>
+</p>
+
+</td>
+<td id="pagecolumn2">
+
+<div class="section">
+
+<h2 id="sec-download">Downloading</h2>
+
+<div class="section-body">
+
+<p>You can download the latest release of ViewVC (and the older ViewVC
+   and ViewCVS releases, too) from our <a
+   href="http://viewvc.tigris.org/servlets/ProjectDocumentList?folderID=6004"
+   >Documents &amp; Files</a> area.  For information about what has
+   changed in each release, see the <a
+   href="http://viewvc.tigris.org/source/browse/viewvc/trunk/CHANGES?rev=HEAD"
+   >CHANGES</a> file.</p>
+
+<p>We are also making <a href="./nightly/">nightly snapshots</a>
+   available in tar.gz and zip formats.</p>
+
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+<div class="section">
+
+<h2 id="sec-subversion">Subversion</h2>
+
+<div class="section-body">
+
+<p>The source code for ViewVC is maintained in a Subversion repository
+   at Tigris.org.  You can checkout the trunk of our development tree
+   from <a href="http://viewvc.tigris.org/svn/viewvc/trunk/"
+   >http://viewvc.tigris.org/svn/viewvc/trunk/</a>.  You'll
+   need to provide your Tigris.org username and password when so
+   prompted, or, if you don't have a Tigris.org account, use "guest"
+   as the username (with no, or an empty, password).</p>
+  
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+</td>
+</tr>
+</table>
+</body>
+</html>
--- a/viewvc.org/faq.html
+++ b/viewvc.org/faq.html
@@ -0,0 +1,359 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>ViewVC: Frequently Asked Questions (FAQ)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<link rel="stylesheet" type="text/css" href="./styles.css"/>
+<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+</head>
+
+<body>
+
+<div id="title">
+<a href="http://www.viewvc.org/"><img 
+   src="./images/title.jpg" alt="ViewVC: Frequently Asked Questions (FAQ)"/></a>
+</div>
+
+<div id="menu">
+<p><a href="./index.html">Home</a> |
+   <a href="http://viewvc.tigris.org/">Project Page</a> |
+   <a href="./download.html">Download</a> |
+   <a href="./contributing.html">Contributing</a> |
+   <a href="./faq.html">FAQ</a> |
+   <a href="http://viewvc.tigris.org/nonav/source/browse/*checkout*/viewvc/trunk/LICENSE.html">License</a> |
+   <a href="./contact.html">Contact</a> |
+   <a href="./who.html">About</a>
+</p>
+</div>
+
+<table id="pagetable">
+<tr>
+<td id="pagecolumn1">
+
+<h4>On this page:</h4>
+
+<ul id="bookmarks">
+  <li><a href="#faq-q">Questions</a></li>
+  <li><a href="#faq-a">Answers</a></li>
+</ul>
+
+<p><a href="http://validator.w3.org/check?uri=referer"><img
+       src="http://www.w3.org/Icons/valid-xhtml10"
+       alt="Valid XHTML 1.0 Strict" height="31" width="88" /></a>
+</p>
+
+</td>
+<td id="pagecolumn2">
+
+<div class="section">
+
+<!-- ##################################################################### -->
+<h2 id="faq-q">Questions</h2>
+<!-- ##################################################################### -->
+
+<div class="section-body">
+
+<!-- #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# -->
+<h3 class="faq-section" id="faq-q-general">General Usage</h3>
+<!-- #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# -->
+
+<ul>
+
+<li><a href="#installation">Where does the installation documentation,
+    if any, live?</a></li>
+
+<li><a href="#authz-support">Does ViewVC support path-based
+    authorization, such as Subversion's authz-file mechanism?</a></li>
+
+<li><a href="#missing-tmpdir">What causes "Error: OSError: [Errno 2] No such file
+    or directory: '/tmp/tmpGc-Ztj'"?</a></li>
+
+<li><a href="#standalone-only">Why does <em>SOME-FEATURE</em>
+    work under standalone.py, but not under Apache (or IIS or
+    &hellip;)?</a></li>
+
+<li><a href="#rss-support">How do I enable ViewVC's RSS feed
+    capabilities?</a></li>
+
+</ul>
+
+<!-- #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# -->
+<h3 class="faq-section" id="faq-q-cvs">CVS Browsing</h3>
+<!-- #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# -->
+
+<ul>
+
+<li><a href="#rlog-output-ended-early">What causes "Error: Rlog output ended
+    early. Expected RCS file "/opt/cvs/project/file,v""?</a></li>
+
+<li><a href="#comalformedoutput">What causes "Error: COMalformedOutput: Unable to
+    find filename in co output stream"?</a></li>
+
+<li><a href="#error-during-rlog">What causes "Error: error during
+    rlog: 0x100"?</a></li>
+
+<li><a href="#missing-files">Why do my directories have no files in them?</a></li>
+
+<li><a href="#none-match">ViewVC doesn't show files I'm looking for,
+    and instead displays the message "NOTE: There are N files, but
+    none match the current selection criteria".  How can I fix this?</a></li>
+
+</ul>
+
+<!-- #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# -->
+<h3 class="faq-section" id="faq-q-svn">Subversion Browsing</h3>
+<!-- #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# -->
+
+<ul>
+
+<li><a href="#no-module-named-svn">What causes "Error: ImportError: No module named
+    svn"?</a></li>
+
+<li><a href="#remote-svn-access">Can I use ViewVC with remote
+    Subversion repositories?</a></li>
+
+</ul>
+
+<!-- #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# -->
+</div>
+</div>
+
+<div class="section">
+
+<!-- ##################################################################### -->
+<h2 id="faq-a">Answers</h2>
+<!-- ##################################################################### -->
+
+<div class="section-body">
+
+<!-- #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# -->
+<h3 class="faq-section" id="faq-a-general">General Usage</h3>
+<!-- #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# -->
+
+<div id="installation">
+<p class="faq-atitle">Where does the installation documentation, if
+   any, live?</p>
+
+<p>ViewVC's installation how-to documentation lives in the INSTALL
+   file located in the root of the ViewVC source code distribution.
+   The most recent version of this document (which may cover
+   unreleased ViewVC versions) can be found
+   at <a href="http://viewvc.tigris.org/source/browse/*checkout*/viewvc/trunk/INSTALL"
+   >http://viewvc.tigris.org/source/browse/*checkout*/viewvc/trunk/INSTALL</a>.
+   If you are upgrading an existing ViewVC instance, you'll also want
+   to read the upgrade documentation, found
+   at <a href="http://viewvc.tigris.org/source/browse/*checkout*/viewvc/trunk/docs/upgrading-howto.html"
+   >http://viewvc.tigris.org/source/browse/*checkout*/viewvc/trunk/docs/upgrading-howto.html</a>.</p>
+</div>
+
+<div id="authz-support">
+<p class="faq-atitle">Does ViewVC support path-based authorization,
+   such as Subversion's authz-file mechanism?</p>
+
+<p>There are no released versions of ViewVC which have this support
+   built-in.  The feature request is being tracking in <a
+   href="http://viewvc.tigris.org/issues/show_bug.cgi?id=268">issue
+   #268</a>, and we're working to complete it for release in ViewVC
+   1.1.</p>
+
+<p>In the meantime, there are some available workarounds.  For
+   example, if you are running ViewVC under Apache, you can use
+   regular Apache configuration directives to authz-protect areas of
+   your repository &mdash; see the <a
+   href="http://httpd.apache.org/docs/2.2/mod/core.html#location"
+   >Location</a> and <a
+   href="http://httpd.apache.org/docs/2.2/mod/core.html#locationmatch"
+   >LocationMatch</a> directives, as well as the <a
+   href="http://httpd.apache.org/docs/2.2/howto/auth.html"
+   >Authentication, Authorization and Access Control</a> portions of
+   the Apache HTTP Server documentation.  This works best when ViewVC
+   is only serving up a single repository, or when the
+   <code>root_as_url_component</code> option is enabled otherwise.
+   And you might have to disable the checkout view, or at least turn
+   off the use of <code>checkout_magic</code> (see
+   <code>viewvc.conf</code> for details).</p>
+</div>
+
+<div id="missing-tmpdir">
+<p class="faq-atitle">What causes "Error: OSError: [Errno 2] No such
+   file or directory: '/tmp/tmpGc-Ztj'"?</p>
+
+<p>This is tracked in <a
+   href="http://viewvc.tigris.org/issues/show_bug.cgi?id=282">issue
+   #282</a>.  While we haven't figured out how to make the error
+   message more graceful or helpful, the basic problem seems to
+   generally boil down to a misconfiguration of ViewVC.  Make sure
+   your helper applications are in the program search path
+   (<code>$PATH</code>, e.g.) on your ViewVC server, or accurately
+   specified in <code>viewvc.conf</code>.</p>
+</div>
+
+<div id="standalone-only">
+<p class="faq-atitle">Why does <em>SOME-FEATURE</em> work under
+    standalone.py, but not under Apache (or IIS or &hellip;)?</p>
+
+<p>Most of the time folks run standalone.py, they do so as a regular
+   system user, from a shell running with any and all the
+   environmental customizations present in their shell startup
+   scripts.  But most web server packages (like Apache) run as a
+   different, often underprivileged, user, whose environment is
+   stripped down to just the system-wide default state.  This can
+   cause problems for ViewVC's various helper applications, which
+   might reside in a location that's included as part of your (and
+   thus standalone.py's) <code>$PATH</code>, but not that of the user
+   as whom the web server package runs.  The solution might be as
+   simple explicitly configuring the paths of the helper applications
+   in <code>viewvc.conf</code>, or as complex as expanding the program
+   search path used by your web server software.</p>
+</div>
+
+<div id="rss-support">
+<p class="faq-atitle">How do I enable ViewVC's RSS feed capabilities?</p>
+
+<p>ViewVC generates its RSS feeds from repository data mirrored in a
+   database as part of its MySQL integration.  Follow the steps in
+   ViewVC's <code>INSTALL</code> file to setup and configure the MySQL
+   integration and begin mirroring your commit metadata in the
+   database &mdash; the RSS feed feature will then be enabled with no
+   additional configuration.</p>
+</div>
+
+<!-- #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# -->
+<h3 class="faq-section" id="faq-a-cvs">CVS Browsing</h3>
+<!-- #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# -->
+
+<div id="rlog-output-ended-early">
+
+<p class="faq-atitle">What causes "Error: Rlog output ended
+   early. Expected RCS file "/opt/cvs/project/file,v""?</p>
+
+<p>This error generally occurs when ViewVC is unable to locate the
+   rlog tool, one of several in the RCS toolchain.  If the system
+   doesn't have the RCS toolchain installed, you'll need to install
+   it.  If the RCS toolchain is installed, but ViewVC simply can't
+   locate the RCS programs, either ensure that the programs are
+   in the system <code>$PATH</code>, or specify their location in
+   the <code>viewvc.conf</code> file &mdash; the option is
+   <code>utilities/rcs_dir</code> as of ViewVC 1.1,
+   <code>general/rcs_path</code> in earlier versions.</p>
+
+</div>
+
+<div id="comalformedoutput">
+
+<p class="faq-atitle">What causes "Error: COMalformedOutput: Unable to
+   find filename in co output stream"?</p>
+
+<p>This is another symptom of the basic problem described <a
+   href="#rlog-output-ended-early">here</a>.</p>
+
+</div>
+
+<div id="error-during-rlog">
+<p class="faq-atitle">What causes "Error: error during rlog:
+   0x100"?</p>
+
+<p>### TODO ###</p>
+</div>
+
+<div id="missing-files">
+<p class="faq-atitle">Why do my directories have no files in them?</p>
+
+<p>There are a few reasons why this can happen.  Here are some of the
+   most common ones:</p>
+
+<ul>
+<li>Some folks mistakenly point ViewVC's configuration bits to their
+    CVS working copies.  But ViewVC isn't a working copy browser
+    &mdash; it's a <em>repository</em> browser.  If you don't know
+    the difference, here's a tip that might help:  CVS repositories
+    are directories trees filled with files that end with
+    "<code>,v</code>".  If your directory isn't filled with "comma
+    vee" files, it probably is <em>not</em> a CVS repository.</li>
+<li>&hellip; <!-- TODO --></li>
+</ul>
+</div>
+
+<div id="none-match">
+<p class="faq-atitle">ViewVC doesn't show files I'm looking for, and
+   instead displays the message "NOTE: There are N files, but none
+   match the current selection criteria".  How can I fix this?</p>
+
+<p>From time to time, CVS and CVSNT add support for new keywords to
+   the RCS backend used to house repository data.  If you're running a
+   version of ViewVC or ViewCVS that hasn't yet learned to handle
+   those new keywords, you might get the error you're seeing.  The
+   solution is to try to get versions of CVS/CVSNT and ViewVC which
+   are better aligned, which generally means upgrading ViewVC (which
+   is probably less disruptive than downgrading your version control
+   system).</p>
+</div>
+
+<!-- #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# -->
+<h3 class="faq-section" id="faq-a-svn">Subversion Browsing</h3>
+<!-- #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# -->
+
+<div id="no-module-named-svn">
+<p class="faq-atitle">What causes "Error: ImportError: No module named
+   svn"?</p>
+
+<p>ViewVC uses Subversion's Python bindings to interact with and pull
+   information out of your Subversion repositories.  These bindings
+   are not, however, generally provided as part of the ViewVC
+   distribution &mdash; you have to install them yourself some other
+   way.  (For more information, contact the <a
+   href="http://subversion.tigris.org">Subversion</a> community.)  The
+   error you see is Python being asked to import the Subversion Python
+   bindings and being unable to do so, typically because the bindings
+   modules aren't found in the Python library search path.</p>
+</div>
+
+<div id="remote-svn-access">
+
+<p class="faq-atitle">Can I use ViewVC with remote Subversion
+   repositories?</p>
+
+<p>ViewVC prefers to have direct access to the repository (and in
+   fact, <em>must</em> have that for CVS repositories), but there does
+   exist experimental support for remote Subversion repositories.
+   Enabling this is a fairly simple &mdash; just use the URL of the
+   repository where you would use its path in the
+   <code>svn_roots</code> configuration options (sorry, you can't use
+   <code>root_parents</code> for remote repositories because
+   Subversion doesn't expose a repository-listing repository access
+   API).</p>
+
+<p>What you should expect:</p>
+
+<ul>
+  <li><p>Near parity with local-access Subversion in terms of
+         functionality.</p></li>
+
+  <li><p>Known shortcomings:</p>
+      <ul>
+        <li>file sizes aren't reported everywhere</li>
+        <li>the "revision" view lacks/botches some information</li>
+        <li>she ain't the fastest horse on the track&hellip;</li>
+      </ul>
+  </li>
+
+  <li><p>Lack of configury for dealing with the intricacies of remote
+         access.  If the auth credentials and such you need to access
+         the remote repository aren't cached in
+         <code>~VIEWVC_USER/.subversion</code> (where
+         <code>VIEWVC_USER</code> is the system user as whom ViewVC
+         runs), stuff won't work.</p></li>
+</ul>
+
+<!-- #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# -->
+</div>
+</div>
+
+</div> <!-- section -->
+
+</td>
+</tr>
+</table>
+</body>
+</html>
--- a/viewvc.org/favicon.ico
+++ b/viewvc.org/favicon.ico
--- a/viewvc.org/images/bg-grad.jpg
+++ b/viewvc.org/images/bg-grad.jpg
--- a/viewvc.org/images/title.jpg
+++ b/viewvc.org/images/title.jpg
--- a/viewvc.org/images/title.xcf
+++ b/viewvc.org/images/title.xcf
--- a/viewvc.org/index.html
+++ b/viewvc.org/index.html
@@ -0,0 +1,204 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>ViewVC: Repository Browsing</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<link rel="stylesheet" type="text/css" href="./styles.css"/>
+<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+</head>
+
+<body>
+
+<div id="title">
+<a href="http://www.viewvc.org/"><img 
+   src="./images/title.jpg" alt="ViewVC: Repository Browsing"/></a>
+</div>
+
+<div id="menu">
+<p><a href="./index.html">Home</a> |
+   <a href="http://viewvc.tigris.org/">Project Page</a> |
+   <a href="./download.html">Download</a> |
+   <a href="./contributing.html">Contributing</a> |
+   <a href="./faq.html">FAQ</a> |
+   <a href="http://viewvc.tigris.org/nonav/source/browse/*checkout*/viewvc/trunk/LICENSE.html">License</a> |
+   <a href="./contact.html">Contact</a> |
+   <a href="./who.html">About</a>
+</p>
+</div>
+
+<table id="pagetable">
+<tr>
+<td id="pagecolumn1">
+
+<h4>On this page:</h4>
+
+<ul id="bookmarks">
+  <li><a href="#sec-what-is-viewvc">What Is ViewVC?</a></li>
+  <li><a href="#sec-requirements">Requirements</a></li>
+  <li><a href="#sec-future">Future Plans</a></li>
+</ul>
+
+<p><a href="http://validator.w3.org/check?uri=referer"><img
+       src="http://www.w3.org/Icons/valid-xhtml10"
+       alt="Valid XHTML 1.0 Strict" height="31" width="88" /></a>
+</p>
+
+</td>
+<td id="pagecolumn2">
+
+<div class="section">
+
+<h2 id="sec-what-is-viewvc">What Is ViewVC?</h2>
+
+<div class="section-body">
+
+<p>ViewVC is a browser interface for CVS and Subversion version
+   control repositories.  It generates templatized HTML to present
+   navigable directory, revision, and change log listings.  It can
+   display specific versions of files as well as diffs between those
+   versions.  Basically, ViewVC provides the bulk of the report-like
+   functionality you expect out of your version control tool, but much
+   more prettily than the average textual command-line program
+   output.</p>
+
+<p>Here are some of the additional features of ViewVC:</p>
+
+<ul>
+
+  <li>Support for filesystem-accessible CVS and Subversion repositories.</li>
+
+  <li>Individually configurable virtual host support.</li>
+
+  <li>Line-based annotation/blame display.</li>
+
+  <li>Revision graph capabilities (via integration with <a
+      href="http://www.akhphd.au.dk/~bertho/cvsgraph/">CvsGraph</a>)
+      (<em>CVS only</em>).</li>
+
+  <li>Syntax highlighting support.</li>
+
+  <li><a href="http://www.mozilla.org/projects/bonsai/">Bonsai</a>-like
+      repository query facilities.</li>
+
+  <li>Template-driven output generation.</li>
+
+  <li>Colorized, side-by-side differences.</li>
+
+  <li>Tarball generation (by tag/branch for CVS, by revision for
+      Subversion).</li>
+
+  <li>I18N support based on the Accept-Language request header.</li>
+
+  <li>Ability to run either as CGI script or as a standalone
+      server.</li>
+  
+  <li>Regexp-based file searching.</li>
+
+  <li>INI-like configuration file (as opposed to requiring actual code
+      tweaks).</li>
+
+</ul>
+
+<p>For a complete list of changes present in each release, see
+   ViewVC's <a
+   href="http://viewvc.tigris.org/source/browse/viewvc/trunk/CHANGES?rev=HEAD"
+   >CHANGES</a> file.</p>
+
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+<div class="section">
+
+<h2 id="sec-requirements">Requirements</h2>
+
+<div class="section-body">
+
+<p>The only hard software requirement for running ViewVC is <a
+   href="http://www.python.org/">Python 1.5.2</a> or later.  All other
+   requirements depend on what you want to do with the tool.</p>
+
+<p>If you plan to use ViewVC with CVS repositories, you need the
+   following things:</p>
+
+<ul>
+
+  <li><a href="http://www.cs.purdue.edu/homes/trinkle/RCS/">RCS</a>
+      (Revision Control System)</li>
+
+  <li><a href="http://www.gnu.org/software/diffutils/diffutils.html">GNU 
+      diff</a></li>
+ 
+  <li>Read-only, physical access to a CVS repository.</li>
+
+</ul>
+
+<p>For use with Subversion repositories, you need these things:</p>
+
+<ul>
+
+  <li><a href="http://subversion.tigris.org/">Subversion</a> 1.2 or
+      later and its SWIG Python bindings.</li>
+
+  <li><a href="http://www.gnu.org/software/diffutils/diffutils.html">GNU 
+      diff</a></li>
+
+  <li>Physical access to a Subversion repository (though there is
+      limited, use-at-your-risk support for remote access, too).</li>
+
+</ul>
+
+<p>ViewVC integrates with additional pieces of software to provide
+   certain bits of optional functionality:</p>
+
+<ul>
+
+  <li><a href="http://www.mysql.com/">MySQL</a> &mdash; Needed to use
+      the commit database query functionality.</li>
+
+  <li><a href="http://www.codento.com/people/mtr/genscript/">GNU
+      enscript</a> &mdash; Needed for syntax highlighting in versioned
+      file contents displays</li>
+
+  <li><a href="http://www.akhphd.au.dk/~bertho/cvsgraph/">CvsGraph</a>
+      &mdash; Needed for version graph displays.</li>
+
+  <li><a href="http://httpd.apache.org/">Apache HTTP Server</a>, or
+      another server capable of running CGI programs &mdash; unless
+      you just want ViewVC to run in standalone server mode.</li>
+
+</ul>
+
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+<div class="section">
+
+<h2 id="sec-future">Future Plans</h2>
+
+<div class="section-body">
+
+<p>ViewVC is an Open Source project.  So any future development
+   depends on the <a href="./contributing.html">contributions</a> that
+   will be made by its user community.  Certainly working patches have
+   a greater chance to become realized quickly than feature requests,
+   but please don't hesitate to submit your suggestions to our <a
+   href="http://viewvc.tigris.org/servlets/ProjectIssues">issue
+   tracker</a>.</p>
+
+<p>Some things we're thinking about include:</p>
+
+<ul>
+  <li>UI streamlining/simplification.</li>
+  <li>Integration with CVS and Subversion commit mail scripts.</li>
+  <li>Integration with an indexer such as LXR.</li>
+</ul>
+
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+</td>
+</tr>
+</table>
+</body>
+</html>
--- a/viewvc.org/nightly/build-viewvc-snapshot
+++ b/viewvc.org/nightly/build-viewvc-snapshot
@@ -0,0 +1,219 @@
+#!/usr/bin/env python
+
+import sys
+import os
+import time
+import urllib
+import shutil
+import getopt
+import tempfile
+
+  
+class BuildError(Exception):
+  def __init__(self, message):
+    self.message = message
+  def __str__(self):
+    return self.message
+  
+
+def make_release(branch, export_dir, publish_dir, root_url, username, password):
+    
+  # Export the requested ViewVC source tree.
+  cmd = "svn export --quiet '%s/%s' %s " \
+        "--username '%s' --password '%s' --non-interactive --force" \
+        % (root_url, urllib.quote(branch), export_dir, username, password)
+  sys.stdout.write("Running: %s\n" % (cmd))
+  os.system(cmd)
+
+  # Get the version number from ViewVC itself.
+  sys.path.insert(0, os.path.join(export_dir, 'lib'))
+  try:
+    import viewvc
+  except ImportError:
+    raise BuildError("Unable to import viewvc module; export failed?")
+  version = viewvc.__version__
+  del sys.modules['viewvc']
+  del viewvc
+  del sys.path[0]
+
+  # Now, use ViewVC tools to make the distribution archives.
+  localtime = time.localtime()
+  date = "%4d%02d%02d" % (localtime[0], localtime[1], localtime[2])
+  distversion = "viewvc-%s" % (version)
+  distname = "%s-%s" % (distversion, date)
+  gzip_name = distname + '.tar.gz'
+  zip_name = distname + '.zip'
+  curdir = os.getcwd()
+  try:
+    os.chdir(os.path.join(export_dir, 'tools'))
+    os.system('./make-release %s' % (distname))
+  finally:
+    os.chdir(curdir)
+
+  # Finally, return the locations of the archive files we've built.
+  gzip_file = os.path.join(export_dir, 'tools', gzip_name)
+  if not os.path.exists(gzip_file):
+    gzip_file = None
+  zip_file = os.path.join(export_dir, 'tools', zip_name)
+  if not os.path.exists(zip_file):
+    zip_file = None
+
+  # Remove superceded archives.
+  if gzip_file or zip_file:
+    dirents = os.listdir(publish_dir)
+    for dirent in dirents:
+      if dirent.startswith(distversion) \
+             and ((dirent.endswith('.tar.gz') and gzip_file) \
+                  or (dirent.endswith('.zip') and zip_file)):
+        os.unlink(dirent)
+
+  # Install the new archives.
+  if gzip_file:
+    os.rename(gzip_file, os.path.join(publish_dir, gzip_name))
+  if zip_file:
+    os.rename(zip_file, os.path.join(publish_dir, zip_name))
+    
+  # Return our archive names.
+  return gzip_file and gzip_name or None, zip_file and zip_name or None
+
+
+def publish_releases(branches, publish_dir, root_url, username, password):
+  new_index_contents = get_html_index_header()
+  for branch in branches:
+    sys.stdout.write("Beginning build for branch '%s'.\n" % (branch))
+    export_dir = None
+    try:
+      export_dir = tempfile.mkdtemp("", "viewvc-nightly-")
+      gzip_file, zip_file = make_release(branch, export_dir, publish_dir,
+                                         root_url, username, password)
+      new_index_contents = new_index_contents + """
+<p>Build of %s:</p>
+<ul>
+<li><a href="%s">%s</a></li>
+<li><a href="%s">%s</a></li>
+</ul>
+""" % (branch, urllib.quote(gzip_file), gzip_file,
+       urllib.quote(zip_file), zip_file)
+    finally:
+      if export_dir:
+        sys.stdout.write("Removing temporary directory '%s'.\n" % (export_dir))
+        shutil.rmtree(export_dir)
+    sys.stdout.write("Finished build for branch '%s'.\n" % (branch))
+
+  new_index_contents = new_index_contents + get_html_index_footer()
+  open(os.path.join(publish_dir, 'index.html'), 'w').write(new_index_contents)
+       
+
+def get_html_index_header():
+  return """
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>ViewVC: Nightly Snapshots</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<link rel="stylesheet" type="text/css" href="../styles.css"/>
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
+</head>
+
+<body>
+
+<div id="title">
+<a href="http://www.viewvc.org/"><img 
+   src="../images/title.jpg" alt="ViewVC: Repository Browsing"/></a>
+</div>
+
+<div id="menu">
+<p><a href="../index.html">Home</a> |
+   <a href="http://viewvc.tigris.org/">Project Page</a> |
+   <a href="../download.html">Download</a> |
+   <a href="../contributing.html">Contributing</a> |
+   <a href="./faq.html">FAQ</a> |
+   <a href="http://viewvc.tigris.org/nonav/source/browse/*checkout*/viewvc/trunk/LICENSE.html">License</a> |
+   <a href="../contact.html">Contact</a> |
+   <a href="../who.html">About</a>
+</p>
+</div>
+
+<table id="pagetable">
+<tr>
+<td id="pagecolumn1">
+
+<h4>On this page:</h4>
+
+<ul id="bookmarks">
+  <li><a href="%s">Snapshots</a></li>
+</ul>
+
+<p><a href="http://validator.w3.org/check?uri=referer"><img
+       src="http://www.w3.org/Icons/valid-xhtml10"
+       alt="Valid XHTML 1.0 Strict" height="31" width="88" /></a>
+</p>
+
+</td>
+<td id="pagecolumn2">
+
+<div class="section">
+<h2 id="sec-snapshots">Snapshots</h2>
+<div class="section-body">
+""" % ("#sec-snapshots")
+
+
+def get_html_index_footer():
+  return """
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+</td>
+</tr>
+</table>
+</body>
+</html>
+"""
+
+
+def usage_and_exit(errmsg=None):
+  stream = errmsg and sys.stderr or sys.stdout
+  progname = os.path.basename(sys.argv[0])
+  stream.write("""%s -- nightly ViewVC build generation
+  
+Usage: %s [OPTIONS] PUBLISH-DIR BRANCH ...
+
+Build an archive from one or more BRANCH in the ViewVC source
+repository, dropping them into PUBLISH-DIR alongside an index.html
+file that name and links to them.
+
+Options:
+   --help (-h, -?)  : Show this usage message
+   --username       : Username used for source export
+   --password       : Password used for source export
+   --root-url       : Alternative source repository root URL
+
+""" % (progname, progname))
+  if errmsg:
+    stream.write("ERROR: %s\n" % (errmsg))
+  sys.exit(errmsg and 1 or 0)
+
+
+if __name__ == "__main__":
+  root_url = "http://viewvc.tigris.org/svn/viewvc"
+  username = password = ""
+  opts, args = getopt.getopt(sys.argv[1:], 'h?',
+                             ['help', 'username=', 'password=', 'root-url='])
+  for name, value in opts:
+    if name == '-h' or name == '-?' or name == '--help':
+      usage_and_exit()
+    elif name == '--username':
+      username = value
+    elif name == '--password':
+      password = value
+    elif name == '--root-url':
+      root_url = value
+  argc = len(args)
+  if argc < 2:
+    usage_and_exit("Not enough arguments")
+  try:
+    publish_releases(args[1:], args[0], root_url, username, password)
+  except BuildError, e:
+    sys.stderr.write(str(e) + "\n")
+    sys.exit(1)
--- a/viewvc.org/styles.css
+++ b/viewvc.org/styles.css
@@ -0,0 +1,169 @@
+body {
+    background-color: #b2d388;
+    color: black;
+    font-family: trebuchet ms, arial, sans-serif;
+    margin: 0;
+}
+
+#title {
+    background-color: #739c3e;
+    height: 70px;
+}
+
+img {
+    border: none;
+}
+
+hr {
+    width: 95%;
+    height: 1px;
+}
+
+address {
+    font-size: 60%;
+    font-style: normal;
+}
+
+h2 {
+    background-color: #94bd5e;
+    padding: 2px 0.5em 2px 0.5em;
+    margin: 0;
+    border-bottom: dotted 1px rgb(180,193,205);
+    font-size: 110%;
+}
+
+h3 {
+    margin: 0;
+    font-size: 100%;
+    font-weight: bold;
+    border-bottom: dotted 1px rgb(180,193,205);
+}
+
+h4 {
+    padding: 2px 0.5em 2px 0.5em;
+    margin: 0;
+    font-size: 90%;
+    font-weight: bold;
+}
+
+p, dl {
+    padding: 0.5em;
+    margin: 0;
+    font-size: 90%;
+}
+
+ul, ol {
+    font-size: 90%;
+    padding: 0.5em;
+    margin: 0 0 0 0.25in;
+}
+
+code {
+    font-size: 105%;
+    font-style: italic;
+    font-family: monospace;
+}
+
+blockquote {
+    text-align: justify;
+    font-style: italic;
+    margin: 0 0.5in 0 0.5in;
+    padding: 5px;
+    border: 1px dotted black;
+}
+
+.section {
+    background: white;
+    border-color: rgb(24,24,24);
+    border-width: 1px;
+    border-style: solid;
+    padding: 0;
+    margin-bottom: 0.5em;
+}
+
+.section-body {
+    padding: 0 1em;
+}
+
+.section p, .section dl, .section ul, .section ol { 
+    padding: 0.5em 0;
+}
+
+#menu {
+    background: black;
+    color: white;
+}
+
+#menu a, #menu a:visited {
+    background: black;
+    color: white;
+    text-decoration: none;
+}
+
+#menu a:hover {
+    background: black;
+    color: white;
+    text-decoration: underline;
+}
+
+#submenu {
+    background: rgb(90%,97%,99%);
+    font-size: 80%;
+}
+
+#pagetable tr {
+    vertical-align: top;
+}
+
+#pagetable {
+    width: 100%;
+}
+
+#pagecolumn1 {
+    width: 175px;
+    padding: 1em 0 0 0;
+}
+
+#pagecolumn1 a, #pagecolumn1 a:visited {
+    color: rgb(0,0,164);
+    text-decoration: none;
+}
+
+#pagecolumn1 a:hover {
+    text-decoration: underline;
+}
+
+#pagecolumn2 {
+    padding: 1em 2em;
+}
+
+#pagecolumn2 a, #pagecolumn2 a:visited {
+    color: rgb(0,0,164);
+    text-decoration: underline;
+}
+
+#pagecolumn2 a:hover {
+    background-color: rgb(180,193,205);
+    text-decoration: underline;
+}
+
+#bookmarks {
+    padding-left: 0.5em;
+    font-size: 80%;
+    white-space: nowrap;
+}
+
+.notice {
+    border: 1px solid black;
+    margin-bottom: 0.5em;
+    background: yellow;
+}
+
+.faq-section {
+    margin-top: 1em;
+}
+
+.faq-atitle {
+    font-weight: bold;
+}
+
--- a/viewvc.org/who.html
+++ b/viewvc.org/who.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>ViewVC: About</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<link rel="stylesheet" type="text/css" href="./styles.css"/>
+<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+</head>
+
+<body>
+
+<div id="title">
+<a href="http://www.viewvc.org/"><img 
+   src="./images/title.jpg" alt="ViewVC: Repository Browsing"/></a>
+</div>
+
+<div id="menu">
+<p><a href="./index.html">Home</a> |
+   <a href="http://viewvc.tigris.org/">Project Page</a> |
+   <a href="./download.html">Download</a> |
+   <a href="./contributing.html">Contributing</a> |
+   <a href="./faq.html">FAQ</a> |
+   <a href="http://viewvc.tigris.org/nonav/source/browse/*checkout*/viewvc/trunk/LICENSE.html">License</a> |
+   <a href="./contact.html">Contact</a> |
+   <a href="./who.html">About</a>
+</p>
+</div>
+
+<table id="pagetable">
+<tr>
+<td id="pagecolumn1">
+
+<h4>On this page:</h4>
+
+<ul id="bookmarks">
+  <li><a href="#sec-history">The History of ViewVC</a></li>
+  <li><a href="#sec-viewcvs-group">The ViewCVS Group</a></li>
+  <li><a href="#sec-site-credits">About This Site</a></li>
+</ul>
+
+<p><a href="http://validator.w3.org/check?uri=referer"><img
+       src="http://www.w3.org/Icons/valid-xhtml10"
+       alt="Valid XHTML 1.0 Strict" height="31" width="88" /></a>
+</p>
+
+</td>
+<td id="pagecolumn2">
+
+<div class="section">
+
+<h2 id="sec-history">The History of ViewVC</h2>
+
+<div class="section-body">
+
+<p>The ViewVC software was inspired by early versions of cvsweb
+   (originally written by Bill Fenner, further developed by Henner
+   Zeller, and now maintained as <a
+   href="http://www.freebsd.org/projects/cvsweb.html">CVSweb</a> by
+   the FreeBSD community).  Greg Stein wanted to make some changes and
+   updates, but cvsweb was implemented in Perl.  He wrote:</p>
+
+<blockquote>
+
+<p>&quot;While I can manage some Perl, cvsweb was rather
+   unmaintainable for me. So I undertook the task to convert the
+   software to Python. As a result, I've actually been able to go
+   <strong>way</strong> beyond the simple changes that I had
+   envisioned.&quot;
+</p>
+
+</blockquote>
+
+<p>So ViewVC started out as just a port of the cvsweb script,
+   originally called ViewCVS.  Along the way, it has had numerous
+   cleanups and other modifications, a process simplified by the
+   elegance of the <a href="http://www.python.org/">Python</a>
+   language.</p>
+
+<p>In 2001, the ViewCVS project was moved to <a
+   href="http://www.sourceforge.net">SourceForge</a>, a popular
+   software collaboration environment.  There the project continued to
+   mature, releasing several stable-yet-pre-1.0 versions.  In 2002,
+   C. Michael Pilato began implementing support for Subversion in
+   ViewCVS, taking advantage of a version control abstraction layer
+   begun by Lucas Bruand.  Along the way, Russell Yanofsky delivered
+   large improvements to that abstraction, and to ViewCVS as whole.
+   ViewCVS was well on its way to releasing a 1.0 version.</p>
+
+<p>Of course, now that ViewCVS could browse Subversion repositories as
+   easily as CVS ones, the ViewCVS name seemed inappropriate.  Also,
+   the active ViewCVS developers at the time were growing frustrated
+   with SourceForge as a project hosting environment &mdash;
+   Subversion wasn't yet available as an option for version control,
+   the CVS service was always down at just the wrong moment, the bug
+   trackers were painful to use, and so on.  So in late 2005, the
+   decision was made to rename the project to ViewVC, to convert the
+   project's CVS data to Subversion, and to move the project and its
+   version controlled and open issue data to <a
+   href="http://www.tigris.org">Tigris.org</a>.</p>
+
+<p>Today, ViewVC is being developed at <a
+   href="http://viewvc.tigris.org">http://viewvc.tigris.org</a> by a
+   small community of folks.</p>
+
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+<div class="section">
+
+<h2 id="sec-viewcvs-group">The ViewCVS Group</h2>
+
+<div class="section-body">
+
+<p>The ViewCVS Group is an informal group of people working on and
+   developing the ViewVC package. The current set of members are
+   listed below with some of their notable contributions:</p>
+
+<dl>
+  <dt><a href="http://www.lyra.org/greg/">Greg Stein</a></dt>
+  <dd>original python port of Henner Zeller's cvsweb, secure popen
+      implementation, configuration file implementation, rcsparse
+      module, and EZT template engine</dd>
+
+  <dt>Jay Painter</dt>
+  <dd>CVSdb query engine</dd>
+
+  <dt>Tanaka Akira</dt> 
+  <dd>enscript colorization and tarball generation</dd>
+
+  <dt>Tim Cera</dt>
+  <dd>CvsGraph support, log_table template, regular expression search,
+      and paging capability</dd>
+
+  <dt>Peter Funk</dt> 
+  <dd>standalone server, blimp logo, and numerous improvements to
+      ViewVC's interfaces and documentation</dd>
+
+  <dt>Lucas Bruand</dt>
+  <dd>C++ RCS parser (tparse) and vclib module for supporting new
+      version control systems</dd>
+
+  <dt><a href="http://www.cmichaelpilato.com/">C. Michael Pilato</a></dt>
+  <dd>Subversion support, root_as_url alternative URL scheme,
+      templatization work, website design, documentation</dd>
+
+  <dt>Russell Yanofsky</dt>
+  <dd>Windows support and the sapi module for supporting multiple web
+      server interfaces, sweeping abstraction and UI improvements</dd>
+
+  <dt>James Henstridge</dt>
+  <dd>integrated query interface, support for querying Subversion
+      repositories, caching support, CSS formatting, and the EZT
+      &quot;define&quot; directive</dd>
+
+</dl>
+
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+<div class="section">
+
+<h2 id="sec-site-credits">About This Site</h2>
+
+<div class="section-body">
+
+<p>The ViewVC website was designed by <a
+   href="http://www.cmichaelpilato.com/">C. Michael Pilato</a>.  All
+   HTML was hand-edited in Emacs, and the little splashes of graphical
+   goodness owe their existence to Open Office and the Gimp.  Textual
+   content for the site is mostly the work of Greg Stein, but has been
+   tweaked through the ages by various ViewVC contributors.</p>
+
+</div> <!-- section-body -->
+</div> <!-- section -->
+
+</td>
+</tr>
+</table>
+</body>
+</html>