Latest wiki doc

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1207338 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/button.html b/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/button.html
index 94b45ce..6cb5991 100644
--- a/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/button.html
+++ b/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/button.html
@@ -1,5 +1,5 @@
+<!-- ads start -->
 <html><head>
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"><!-- ads start -->
-</head><body><a href="http://www.us.apachecon.com/c/acus2009/" target="_blank"><img src="button_data/2009-usa-125x125.png" title="ApacheCon US 2009" border="0" width="125" height="125"></a>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8"></head><body><a href="http://na11.apachecon.com/%22" target="_blank"><img src="button_data/2011-na-125x125.png" title="ApacheCon NA 2011" border="0" height="125" width="125"></a>
 <!-- ads end -->
 </body></html>
\ No newline at end of file
diff --git a/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/button_data/2011-na-125x125.png b/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/button_data/2011-na-125x125.png
new file mode 100644
index 0000000..a50281a
--- /dev/null
+++ b/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/button_data/2011-na-125x125.png
Binary files differ
diff --git a/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/check.gif b/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/check.gif
new file mode 100644
index 0000000..28bb999
--- /dev/null
+++ b/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/check.gif
Binary files differ
diff --git a/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/site.css b/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/site.css
index 959ab0a..36314aa 100644
--- a/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/site.css
+++ b/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/site.css
@@ -1,13 +1,13 @@
 /* @override http://felix.apache.org/site/media.data/site.css */
 
 body { background-color: #ffffff; color: #3b3b3b; font-family: Tahoma, Arial, sans-serif; font-size: 10pt; line-height: 140% }
-h1, h2, h3, h4, h5, h6 { font-weight: normal; color: #000000; line-height: 100%; margin-top: 0px}
+h1, h2, h3, h4, h5, h6 { font-weight: bold; color: #000000; line-height: 100% }
 h1 { font-size: 200% }
 h2 { font-size: 175% }
 h3 { font-size: 150% }
-h4 { font-size: 140% }
-h5 { font-size: 130% }
-h6 { font-size: 120% }
+h4 { font-size: 140%; font-weight: normal }
+h5 { font-size: 130%; font-weight: normal }
+h6 { font-size: 120%; font-weight: normal }
 a { color: #1980af }
 a:visited { color: #1980af }
 a:hover { color: #1faae9 }
@@ -22,4 +22,22 @@
 .code-keyword { color: #880000 }
 .code-quote { color: #008800 }
 .code-object { color: #0000dd }
-.code-java { margin: 0em }
\ No newline at end of file
+.code-java { margin: 0em }
+.code-xml { margin: 0em }
+table.confluenceTable { border-collapse: collapse; margin: 10px 0 10px 0 }
+td.confluenceTd { border:1px solid #CCCCCC; padding:5px; vertical-align:top; }
+
+/** Last modification information at the botton of each page */
+.timestamp {
+    margin-top: 30px;
+    font-size: 80%;
+    text-align: right;
+}
+
+/** Trademark text at the bottom of each page */
+.trademarkFooter {
+    font-size: 80%;
+    font-style: italic;
+    margin-top: 10px;
+    text-align: left;
+}