Merge branch 'release' and resolve conficts.

This commit is contained in:
Gary Gregory 2020-08-30 11:33:31 -04:00
commit 21fe158cb2
2 changed files with 3 additions and 2 deletions

View File

@ -27,7 +27,8 @@
<item name="Overview" href="/index.html"/>
<item name="Download" href="/download_lang.cgi"/>
<item name="Users guide" href="/userguide.html"/>
<item name="Javadoc (Latest release)" href="javadocs/api-release/index.html"/>
<item name="Release History" href="/changes-report.html"/>
<item name="Javadoc" href="javadocs/api-release/index.html"/>
</menu>
<menu name="Development">

View File

@ -50,7 +50,7 @@ and various <a href="project-reports.html">project reports</a> are provided.
The Javadoc API documents are available online:
</p>
<ul>
<li>The <a href="javadocs/api-3.12/index.html">current stable release 3.12</a> [Java 8 and up]</li>
<li>The <a href="javadocs/api-release/index.html">current release</a> [Java 8 and up]</li>
<li>The <a href="javadocs/api-2.6/index.html">legacy release 2.6</a> [Java 1.2 and up]</li>
<li>Older releases - see the <a href="changes-report.html">Release History</a> page</li>
</ul>