Clean up docs in preparation for release.
diff --git a/NOTICE.txt b/NOTICE.txt
index 0812044..db74d1d 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache Commons VFS Project
-Copyright 2002-2020 The Apache Software Foundation
+Copyright 2002-2021 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
diff --git a/README.md b/README.md
index effbbbc..c7e0249 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@
 [![GitHub Actions Status](https://github.com/apache/commons-vfs/workflows/Java%20CI/badge.svg)](https://github.com/apache/commons-vfs/actions)
 [![Coverage Status](https://coveralls.io/repos/apache/commons-vfs/badge.svg)](https://coveralls.io/r/apache/commons-vfs)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-vfs2/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-vfs2/)
-[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-vfs2/2.7.0.svg)](https://javadoc.io/doc/org.apache.commons/commons-vfs2/2.7.0)
+[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-vfs2/2.8.0.svg)](https://javadoc.io/doc/org.apache.commons/commons-vfs2/2.8.0)
 
 Apache Commons VFS is a Virtual File System library.
 
@@ -68,7 +68,7 @@
 <dependency>
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-vfs2</artifactId>
-  <version>2.7.0</version>
+  <version>2.8.0</version>
 </dependency>
 ```
 
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 2cd7171..13b19a6 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,3 +1,93 @@
+            Apache Commons VFS Project 2.8.0
+            RELEASE NOTES
+            2021-03-06
+
+The Apache Commons VFS Project team is pleased to announce the release of Apache Commons VFS Project 2.8.0.
+
+Apache Commons VFS is a Virtual File System library.
+
+Feature and maintenance release. Requires Java 8.
+
+Changes in this version include:
+
+New features:
+o           Add ability to remove a provider from DefaultFileSystemManager #149. Thanks to Boris Petrov, Gary Gregory.
+o           Add and use VFS.close(). Thanks to Gary Gregory.
+o           [FTP] Add support for ControlKeepAliveReplyTimeout and ControlKeepAliveTimeout. Thanks to Gary Gregory, xiaqingyun.
+o           [FTP] Tests can be configured with a custom FTP server command factory. Thanks to Gary Gregory, Michael Graham.
+o VFS-257:  [FTP] Add support for MDTM to get more accurate last modified times. Thanks to Andrew Franklin, Michael Graham, Gary Gregory.
+o           [FTP] Add FtpFileSystemConfigBuilder.setConnectTimeout(FileSystemOptions, Duration) and deprecate Integer version. Thanks to Gary Gregory.
+o           [FTP] Add FtpFileSystemConfigBuilder.setDataTimeout(FileSystemOptions, Duration) and deprecate Integer version. Thanks to Gary Gregory.
+o           [FTP] Add FtpFileSystemConfigBuilder.setSoTimeout(FileSystemOptions, Duration) and deprecate Integer version. Thanks to Gary Gregory.
+o           [FTP] Add FtpFileSystemConfigBuilder.getConnectTimeoutDuration(FileSystemOptions) and deprecate Integer version. Thanks to Gary Gregory.
+o           [FTP] Add FtpFileSystemConfigBuilder.getDataTimeoutDuration(FileSystemOptions) and deprecate Integer version. Thanks to Gary Gregory.
+o           [FTP] Add FtpFileSystemConfigBuilder.getSoTimeoutDuration(FileSystemOptions) and deprecate Integer version. Thanks to Gary Gregory.
+o           [FTP] Add FtpFileSystemConfigBuilder.getSoTimeoutDuration(FileSystemOptions) and deprecate Integer version. Thanks to Gary Gregory.
+o           [HTTP] Add HttpFileSystemConfigBuilder.setConnectionTimeout(FileSystemOptions, Duration) and deprecate Integer version. Thanks to Gary Gregory.
+o           [HTTP] Add HttpFileSystemConfigBuilder.setSoTimeout(FileSystemOptions, Duration) and deprecate Integer version. Thanks to Gary Gregory.
+o           [HTTP] Add HttpFileSystemConfigBuilder.getConnectionTimeout(FileSystemOptions) and deprecate Integer version. Thanks to Gary Gregory.
+o           [HTTP] Add HttpFileSystemConfigBuilder.getSoTimeoutDuration(FileSystemOptions) and deprecate Integer version. Thanks to Gary Gregory.
+o           [SFTP] Add SftpFileSystemConfigBuilder.setConnectTimeout(FileSystemOptions, Duration) and deprecate Integer version. Thanks to Gary Gregory.
+o           [SFTP] Add SftpFileSystemConfigBuilder.setSessionTimeout(FileSystemOptions, Duration) and deprecate Integer version. Thanks to Gary Gregory.
+o           [SFTP] Add SftpFileSystemConfigBuilder.getConnectTimeout(FileSystemOptions) and deprecate Integer version. Thanks to Gary Gregory.
+o           [SFTP] Add SftpFileSystemConfigBuilder.getSessionTimeout(FileSystemOptions) and deprecate Integer version. Thanks to Gary Gregory.
+o           [HTTP4] Add Http4FileSystemConfigBuilder.setConnectionTimeout(FileSystemOptions, Duration) and deprecate Integer version. Thanks to Gary Gregory.
+o           [HTTP4] Add Http4FileSystemConfigBuilder.setSoTimeout(FileSystemOptions, Duration) and deprecate Integer version. Thanks to Gary Gregory.
+o           [HTTP4] Add Http4FileSystemConfigBuilder.getConnectionTimeoutDuration(FileSystemOptions) and deprecate Integer version. Thanks to Gary Gregory.
+o           [HTTP4] Add Http4FileSystemConfigBuilder.getSoTimeoutDuration(FileSystemOptions) and deprecate Integer version. Thanks to Gary Gregory.
+o           [HTTP5] Add Http5FileSystemConfigBuilder.setConnectionTimeout(FileSystemOptions, Duration) and deprecate Integer version. Thanks to Gary Gregory.
+o           [HTTP5] Add Http5FileSystemConfigBuilder.setSoTimeout(FileSystemOptions, Duration) and deprecate Integer version. Thanks to Gary Gregory.
+o           [HTTP5] Add Http5FileSystemConfigBuilder.getConnectionTimeoutDuration(FileSystemOptions) and deprecate Integer version. Thanks to Gary Gregory.
+o           [HTTP5] Add Http5FileSystemConfigBuilder.getSoTimeoutDuration(FileSystemOptions) and deprecate Integer version. Thanks to Gary Gregory.
+o           Add AbstractFileSystem.AbstractFileSystem() for Serializable subclasses (PMD). Thanks to PMD, Gary Gregory.
+
+Fixed Bugs:
+o VFS-783:  Based on WEBDAV4 vs. WEBDAV4S set back-end http scheme #118. Thanks to satish-csi, Michael Osipov, Woonsan Ko, Gary Gregory.
+o VFS-783:  Proper http scheme setting on webdav/webdav2 with unit tests #143. Thanks to satish-csi, Woonsan Ko, Gary Gregory.
+o VFS-783:  [SFTP] SftpFileSystem.executeCommand() should use UTF-8 instead of the platform default. Thanks to Gary Gregory.
+o           FileContentThreadData: lazy ArrayList initialization to save memory #155. Thanks to Max Kellermann.
+o           Fix possible ClassCastException in DefaultFileSystemManager.freeUnusedResources(). Thanks to Gary Gregory.
+o VFS-748:  TarProvider Incorrectly marks file IMAGINARY after garbage collection with WeakRefFilesCache, #97. Thanks to PeterAlfredLee, Gary Gregory.
+o VFS-794:  Fix file resource leak in CombinedResources (properties file) which keeps the Commons VFS jar file open. Thanks to Gary Gregory.
+o           Rework SoftRefFilesCache locking part 1 #158. Thanks to Max Kellermann, Bruno P. Kinoshita, Gary Gregory.
+o VFS-785:  [HTTP4][HTTP5] Credentials conflict when root and proxy hosts are same name but different ports, #120. Thanks to satish bhor, Michael Osipov, Gary Gregory.
+o           Rework SoftRefFilesCache locking #154. Thanks to Max Kellermann, Gary Gregory, Florent Guillaume, Bruno P. Kinoshita, Bernd.
+o VFS-782:  Pass correct proxy authentication credentials #117. Thanks to satish-csi, Gary Gregory.
+
+Changes:
+o           Modify some code use for-each loop and stream API #142. Thanks to PeterAlfredLee.
+o           Simplify some String tests in method Os#determineOsFamily #147. Thanks to PeterAlfredLee.
+o           Update org.mockito:mockito-core 3.5.13 -> 3.8.0. Thanks to Gary Gregory.
+o           Update org.apache.jackrabbit:jackrabbit-* 2.21.3 -> 2.21.5. Thanks to Gary Gregory.
+o           Bump actions/checkout from v2.3.3 to v2.3.4 #144. Thanks to Dependabot.
+o           Update tests from Log4j 2.13.3 to 2.14.0. Thanks to Gary Gregory.
+o           Update com.puppycrawl.tools:checkstyle 8.36.2 -> 8.41. Thanks to Gary Gregory.
+o           Update maven-checkstyle-plugin 3.1.1 -> 3.1.2. Thanks to Gary Gregory.
+o           Update org.apache.httpcomponents:httpcore-nio 4.4.13 -> 4.4.14. Thanks to Gary Gregory.
+o           Modify some calls of method Collection.toArray #145. Thanks to PeterAlfredLee, Gary Gregory.
+o           Update commons.japicmp.version 0.14.3 -> 0.15.2. Thanks to Gary Gregory.
+o           Minor Improvements, #152, #156, #160. Thanks to Arturo Bernal.
+o           Update commons.spotbugs.version 4.1.4 -> 4.2.0. Thanks to Gary Gregory.
+o           Update commons.spotbugs.impl.version 4.1.3 -> 4.2.0. Thanks to Gary Gregory.
+o           Bump actions/cache from v2 to v2.1.4 #159. Thanks to Dependabot.
+o           Update commons-net:commons-net 3.7.2-> 3.8.0. Thanks to Gary Gregory.
+o           Update junit 4.13.1 -> 4.13.2. Thanks to Gary Gregory.
+o           Update maven-pmd-plugin 3.13.0 -> 3.14.0. Thanks to Gary Gregory.
+o VFS-795:  Code improvements for SoftRefFilesCache (simplify loop, use isEmpty, ...). Thanks to Max Kellermann.
+o           Update commons-lang3 3.11 -> 3.12.0. Thanks to Gary Gregory.
+
+
+Historical list of changes: http://commons.apache.org/proper/commons-vfs/changes-report.html
+
+For complete information on Apache Commons VFS Project, including instructions on how to submit bug reports,
+patches, or suggestions for improvement, see the Apache Apache Commons VFS Project website:
+
+http://commons.apache.org/proper/commons-vfs/
+
+Download page: http://commons.apache.org/proper/commons-vfs/download_vfs.cgi
+
+-----------------------------------------------------------------------------
+
             Apache Commons VFS Project 2.7.0
             RELEASE NOTES
             2020-10-19
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/function/package.html b/commons-vfs2/src/main/java/org/apache/commons/vfs2/function/package.html
index 7b78ba7..0cccf19 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/function/package.html
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/function/package.html
@@ -15,5 +15,5 @@
     limitations under the License.
 -->
 <body>
-<p>Functional interface types à la java.util.function.</p>
+<p>Functional interface types in the style of java.util.function.</p>
 </body>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3ac8b4f..e9837db 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -45,7 +45,7 @@
   </properties>
 
   <body>
-    <release version="2.8.0" date="2021-MM-DD" description="Feature and maintenance release. Requires Java 8.">
+    <release version="2.8.0" date="2021-03-06" description="Feature and maintenance release. Requires Java 8.">
 <!--       <action issue="VFS-443" dev="ggregory" type="update" due-to="nickallen"> -->
 <!--        [Local] Need an easy way to convert from a FileObject to a File. -->
 <!--       </action> -->
@@ -204,7 +204,7 @@
         Modify some calls of method Collection.toArray #145.
       </action>
       <action dev="ggregory" due-to="Gary Gregory" type="update">
-        Update commons.japicmp.version 0.14.3 -> 0.15.2.
+        Update commons.japicmp.version 0.14.3 -> 0.15.3.
       </action>
       <action dev="ggregory" due-to="Arturo Bernal" type="update">
         Minor Improvements, #152, #156, #160.
diff --git a/src/site/site.xml b/src/site/site.xml
index 2eda83b..636389d 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -27,7 +27,8 @@
 
     <menu name="Commons&#xA0;VFS" inherit="top">
       <item name="Overview"                href="/index.html"/>
-      <item name="Download and Build"      href="/download.html"/>
+      <item name="Download"                href="/download_vfs.html"/>
+      <item name="Build"                   href="/build.html"/>
       <item name="Using the API"           href="/api.html"/>
       <item name="Javadocs"                href="/commons-vfs2/apidocs/index.html"/>
       <item name="Javadocs Archive"        href="https://javadoc.io/doc/org.apache.commons/commons-vfs2/latest/index.html"/>
diff --git a/src/site/xdoc/api.xml b/src/site/xdoc/api.xml
index 978f295..8156100 100644
--- a/src/site/xdoc/api.xml
+++ b/src/site/xdoc/api.xml
@@ -45,8 +45,7 @@
 
             <source><![CDATA[
 FileSystemManager fsManager = VFS.getManager();
-FileObject jarFile = fsManager.resolveFile( "jar:lib/aJarFile.jar" );
-                ]]></source>
+FileObject jarFile = fsManager.resolveFile("jar:lib/aJarFile.jar");]]></source>
 
             <p>
                 Each file is represented by a
@@ -59,16 +58,14 @@
             <source><![CDATA[
 // Locate the Jar file
 FileSystemManager fsManager = VFS.getManager();
-FileObject jarFile = fsManager.resolveFile( "jar:lib/aJarFile.jar" );
+FileObject jarFile = fsManager.resolveFile("jar:lib/aJarFile.jar");
 
 // List the children of the Jar file
 FileObject[] children = jarFile.getChildren();
-System.out.println( "Children of " + jarFile.getName().getURI() );
-for ( int i = 0; i < children.length; i++ )
-{
-    System.out.println( children[ i ].getName().getBaseName() );
-}
-]]></source>
+System.out.println("Children of " + jarFile.getName().getURI());
+for (int i = 0; i < children.length; i++) {
+    System.out.println(children[i].getName().getBaseName());
+}]]></source>
 
             <p>
                 In some cases you might want to explicitely free resources allocated by the filesystem.
@@ -122,8 +119,7 @@
 FileSystemOptions opts = new FileSystemOptions();
 DefaultFileSystemConfigBuilder.getInstance().setUserAuthenticator(opts, auth);
 
-FileObject fo = VFS.getManager().resolveFile("smb://host/anyshare/dir", opts);
-]]></source>
+FileObject fo = VFS.getManager().resolveFile("smb://host/anyshare/dir", opts);]]></source>
                 <p>
                     Internally the UserAuthenticator uses char arrays which will be zeroed before it is
                     freed for garbage collection.Unhappily none of the current libraries use char
@@ -371,8 +367,7 @@
         <if-available class-name="org.apache.commons.net.ftp.FTPFile"/>
     </provider>
     <default-provider class-name="org.apache.commons.vfs2.provider.url.UrlFileProvider"/>
-</providers>
-]]></source>
+</providers>]]></source>
             </subsection>
         </section>
     </body>
diff --git a/src/site/xdoc/download.xml b/src/site/xdoc/build.xml
similarity index 91%
rename from src/site/xdoc/download.xml
rename to src/site/xdoc/build.xml
index cefdb3a..2698806 100644
--- a/src/site/xdoc/download.xml
+++ b/src/site/xdoc/build.xml
@@ -38,31 +38,37 @@
                 </tr>
                 <tr>
                     <td>
-                        <a href="http://commons.apache.org/logging/">Commons Logging</a>
+                        <a href="http://commons.apache.org/logging/">Apache Commons Logging</a>
                     </td>
                     <td>All</td>
                 </tr>
                 <tr>
                     <td>
-                        <a href="http://commons.apache.org/collections/">Commons Collections</a>
+                        <a href="http://commons.apache.org/lang/">Apache Commons Lang</a>
+                    </td>
+                    <td>All</td>
+                </tr>
+                <tr>
+                    <td>
+                        <a href="http://commons.apache.org/collections/">Apache Commons Collections</a>
                     </td>
                     <td>LRU Cache (optional)</td>
                 </tr>
                 <tr>
                     <td>
-                        <a href="http://commons.apache.org/compress/">Commons Compress</a>
+                        <a href="http://commons.apache.org/compress/">Apache Commons Compress</a>
                     </td>
                     <td>TAR, Bzip2</td>
                 </tr>
                 <tr>
                     <td>
-                        <a href="http://commons.apache.org/net/">Commons Net</a>
+                        <a href="http://commons.apache.org/net/">Apache Commons Net</a>
                     </td>
                     <td>FTP</td>
                 </tr>
                 <tr>
                     <td>
-                        <a href="http://commons.apache.org/httpclient/">Commons Httpclient</a><br/>
+                        <a href="http://commons.apache.org/httpclient/">Apache Commons Httpclient</a><br/>
                         Requires <a href="http://commons.apache.org/proper/commons-codec/">Commons Codec</a>
                     </td>
                     <td>WebDAV, HTTP, URI Utils</td>
@@ -105,7 +111,7 @@
         </section>
         <section name="Building Commons VFS">
             <p>
-                To build Commons VFS, get the <a href="scm.html">sources</a> and use <a href="http://maven.apache.org">Maven</a> 3.2.5 or later.
+                To build Commons VFS, get the <a href="scm.html">sources</a> and use <a href="http://maven.apache.org">Apache Maven</a> 3.2.5 or later.
                 You need to use Java 8 or later. Production builds can be done with the
                 <code>-Pjava-1.8</code> profile from Commons Parent (which will compile and test with a JDK
                 from the JAVA_1_8_HOME environment variable).
diff --git a/src/site/xdoc/download_vfs.xml b/src/site/xdoc/download_vfs.xml
index 27da2ad..a039a54 100644
--- a/src/site/xdoc/download_vfs.xml
+++ b/src/site/xdoc/download_vfs.xml
@@ -113,44 +113,44 @@
       </p>

     </subsection>

     </section>

-    <section name="Apache Commons VFS Project 2.7.0 (requires Java 8)">
-      <subsection name="Binaries">
-        <table>
-          <tr>
-              <td><a href="[preferred]/commons/vfs/binaries/commons-vfs-2.7.0-bin.tar.gz">commons-vfs-2.7.0-bin.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.7.0-bin.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.7.0-bin.tar.gz.asc">pgp</a></td>
-          </tr>
-          <tr>
-              <td><a href="[preferred]/commons/vfs/binaries/commons-vfs-2.7.0-bin.zip">commons-vfs-2.7.0-bin.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.7.0-bin.zip.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.7.0-bin.zip.asc">pgp</a></td>
-          </tr>
-        </table>
-      </subsection>
-      <subsection name="Source">
-        <table>
-          <tr>
-              <td><a href="[preferred]/commons/vfs/source/commons-vfs-2.7.0-src.tar.gz">commons-vfs-2.7.0-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs/source/commons-vfs-2.7.0-src.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs/source/commons-vfs-2.7.0-src.tar.gz.asc">pgp</a></td>
-          </tr>
-          <tr>
-              <td><a href="[preferred]/commons/vfs/source/commons-vfs-2.7.0-src.zip">commons-vfs-2.7.0-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs/source/commons-vfs-2.7.0-src.zip.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs/source/commons-vfs-2.7.0-src.zip.asc">pgp</a></td>
-          </tr>
-        </table>
-      </subsection>
-    </section>
-    <section name="Archives">
-        <p>
-          Older releases can be obtained from the archives.
-        </p>
-        <ul>
-          <li class="download"><a href="[preferred]/commons/vfs/">browse download area</a></li>
-          <li><a href="https://archive.apache.org/dist/commons/vfs/">archives...</a></li>
-        </ul>
-    </section>
-  </body>
-</document>
+    <section name="Apache Commons VFS Project 2.8.0 (requires Java 8)">

+      <subsection name="Binaries">

+        <table>

+          <tr>

+              <td><a href="[preferred]/commons/vfs/binaries/commons-vfs-2.8.0-bin.tar.gz">commons-vfs-2.8.0-bin.tar.gz</a></td>

+              <td><a href="https://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.8.0-bin.tar.gz.sha512">sha512</a></td>

+              <td><a href="https://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.8.0-bin.tar.gz.asc">pgp</a></td>

+          </tr>

+          <tr>

+              <td><a href="[preferred]/commons/vfs/binaries/commons-vfs-2.8.0-bin.zip">commons-vfs-2.8.0-bin.zip</a></td>

+              <td><a href="https://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.8.0-bin.zip.sha512">sha512</a></td>

+              <td><a href="https://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.8.0-bin.zip.asc">pgp</a></td>

+          </tr>

+        </table>

+      </subsection>

+      <subsection name="Source">

+        <table>

+          <tr>

+              <td><a href="[preferred]/commons/vfs/source/commons-vfs-2.8.0-src.tar.gz">commons-vfs-2.8.0-src.tar.gz</a></td>

+              <td><a href="https://www.apache.org/dist/commons/vfs/source/commons-vfs-2.8.0-src.tar.gz.sha512">sha512</a></td>

+              <td><a href="https://www.apache.org/dist/commons/vfs/source/commons-vfs-2.8.0-src.tar.gz.asc">pgp</a></td>

+          </tr>

+          <tr>

+              <td><a href="[preferred]/commons/vfs/source/commons-vfs-2.8.0-src.zip">commons-vfs-2.8.0-src.zip</a></td>

+              <td><a href="https://www.apache.org/dist/commons/vfs/source/commons-vfs-2.8.0-src.zip.sha512">sha512</a></td>

+              <td><a href="https://www.apache.org/dist/commons/vfs/source/commons-vfs-2.8.0-src.zip.asc">pgp</a></td>

+          </tr>

+        </table>

+      </subsection>

+    </section>

+    <section name="Archives">

+        <p>

+          Older releases can be obtained from the archives.

+        </p>

+        <ul>

+          <li class="download"><a href="[preferred]/commons/vfs/">browse download area</a></li>

+          <li><a href="https://archive.apache.org/dist/commons/vfs/">archives...</a></li>

+        </ul>

+    </section>

+  </body>

+</document>

diff --git a/src/site/xdoc/filesystems.xml b/src/site/xdoc/filesystems.xml
index 8df73e1..2bf731d 100644
--- a/src/site/xdoc/filesystems.xml
+++ b/src/site/xdoc/filesystems.xml
@@ -759,7 +759,7 @@
             </ul>
         </section>
 
-        <section name="res">
+        <section name="Resource">
 
             <p>
                 This is not really a filesystem, it just tries to lookup a resource using javas <code>ClassLoader.getResource()</code>
@@ -789,7 +789,7 @@
             </ul>
         </section>
 
-        <section name="ram">
+        <section name="RAM">
 
             <p>
                 A filesystem which stores all the data in memory (one byte array for each file content).
@@ -823,7 +823,7 @@
             </ul>
         </section>
 
-        <section name="mime">
+        <section name="MIME">
 
             <p>
                 This (sandbox) filesystem can read mails and its attachements like archives.<br />
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 07689fe..bc2b1f1 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -56,9 +56,8 @@
                     Utilities for integrating Commons VFS into applications,
                     such as a VFS-aware ClassLoader and URLStreamHandlerFactory.
                 </li>
-                <li>A set of VFS-enabled
-                    <a href="anttasks.html">Ant tasks</a>
-                    .
+                <li>
+                    A set of VFS-enabled<a href="anttasks.html">Ant tasks</a>.
                 </li>
             </ul>
 
@@ -113,7 +112,7 @@
             </tr>
             <tr>
               <td>1.0</td>
-              <td>5?</td>
+              <td>1.3</td>
             </tr>
           </table>          
         </section>