Hi, Just found out that our confluence wiki includes the gliffy plugin for diagrams - created a test page at http://cwiki.apache.org/confluence/display/SLING/Testing%20gliffy%20diagrams if you want to play with it.
(Didn't test if such diagrams would make it to the website though) -Bertrand