[Jamwiki-commit] SF.net SVN: jamwiki:[2316] wiki/trunk

[<wr...@us...>]

Revision: 2316
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2316&view=rev
Author:   wrh2
Date:     2008-09-21 18:22:35 +0000 (Sun, 21 Sep 2008)

Log Message:
-----------
Merge changes from the 0.6.7 branch:
  * Resolve a CSS issue that impacted edit links on IE6.  Reported by an
    anonymous user.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/WikiHeadingTag.java
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Heading1
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Heading2
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Heading3
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Heading4
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Heading5
    wiki/trunk/jamwiki-core/src/test/resources/data/results/TableOfContents1
    wiki/trunk/jamwiki-core/src/test/resources/data/results/TableOfContents2
    wiki/trunk/jamwiki-core/src/test/resources/data/results/TableOfContents3
    wiki/trunk/jamwiki-core/src/test/resources/data/results/TableOfContents4
    wiki/trunk/jamwiki-core/src/test/resources/data/results/TableOfContents5
    wiki/trunk/jamwiki-war/src/main/resources/pages/StyleSheet.txt
    wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java

Property Changed:
----------------
    wiki/trunk/
    wiki/trunk/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/
    wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/applicationContext-security.xml
    wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/security.tld
    wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/authentication/JAMWikiExceptionTranslationFilter.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.