diff --git a/framework/doc/launching-and-embedding-apache-felix.html b/framework/doc/launching-and-embedding-apache-felix.html
index 60c7d56..3b0ff28 100644
--- a/framework/doc/launching-and-embedding-apache-felix.html
+++ b/framework/doc/launching-and-embedding-apache-felix.html
@@ -1,35 +1,30 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html><head><title>Apache Felix - Launching and Embedding Apache Felix</title><link rel="stylesheet" href="launching-and-embedding-apache-felix_files/site.css" type="text/css" media="all"><link rel="stylesheet" href="launching-and-embedding-apache-felix_files/print.css" type="text/css" media="print"><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"></head><body linkifying="true">&amp;t
+<html><head><title>Apache Felix - Launching and Embedding Apache Felix</title>
 
 
   
     
-    
-    
-    
-  
-    <div class="title">
-      <a href="http://cwiki.apache.org/FELIX/index.html"><img alt="Apache Felix" src="launching-and-embedding-apache-felix_files/felix_logo.png" align="left" border="0"></a><a href="http://www.apache.org/"><img alt="Apache" src="launching-and-embedding-apache-felix_files/apache.png" align="right" border="0"></a>
-    </div>
+    <link rel="stylesheet" href="launching-and-embedding-apache-felix_files/site.css" type="text/css" media="all">
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"></head><body>
+    <div class="title"><div class="logo"><a href="http://felix.apache.org/site/index.html"><img alt="Apache Felix" src="launching-and-embedding-apache-felix_files/logo.png" border="0"></a></div><div class="header"><a href="http://www.apache.org/"><img alt="Apache" src="launching-and-embedding-apache-felix_files/apache.png" border="0"></a></div></div>
     <div class="menu">
-      <ul>
-        <li><a href="http://cwiki.apache.org/FELIX/index.html">home</a></li>
-        <li><a href="http://cwiki.apache.org/FELIX/news.html">news</a></li>
-        <li><a href="http://cwiki.apache.org/FELIX/status.html">status</a></li>
-        <li><a href="http://cwiki.apache.org/FELIX/license.html">license</a></li>
-        <li><a href="http://cwiki.apache.org/FELIX/downloads.html">downloads</a></li>
-        <li><a href="http://cwiki.apache.org/FELIX/documentation.html">documentation</a></li>
-        <li><a href="http://cwiki.apache.org/confluence/x/O-">wiki</a></li>
-        <li><a href="http://cwiki.apache.org/FELIX/committers.html">committers</a></li>
-        <li><a href="http://cwiki.apache.org/FELIX/mailinglists.html">mailing lists</a></li>
-        <li><a href="http://cwiki.apache.org/FELIX/faq.html">faq</a></li>
-        <li><a href="http://cwiki.apache.org/FELIX/roadmap.html">roadmap</a></li>
-        <li><a href="http://cwiki.apache.org/FELIX/sourcecode.html">source code</a></li>
-        <li><a href="http://cwiki.apache.org/FELIX/codingstandards.html">coding standards</a></li>
-        <li><a href="http://cwiki.apache.org/FELIX/issuetracking.html">issue tracking</a></li>
-        <li><a href="http://cwiki.apache.org/FELIX/dependencies.html">dependencies</a></li>
-      </ul>
-    </div>
+<ul>
+	<li><a href="http://felix.apache.org/site/index.html" title="Index">home</a></li>
+	<li><a href="http://felix.apache.org/site/news.html" title="news">news</a></li>
+	<li><a href="http://felix.apache.org/site/status.html" title="status">status</a></li>
+	<li><a href="http://felix.apache.org/site/license.html" title="license">license</a></li>
+	<li><span class="nobr"><a href="http://felix.apache.org/site/downloads.cgi" title="Visit page outside Confluence" rel="nofollow">downloads<sup><img class="rendericon" src="launching-and-embedding-apache-felix_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span></li>
+	<li><a href="http://felix.apache.org/site/documentation.html" title="documentation">documentation</a></li>
+	<li><a href="http://felix.apache.org/site/mailinglists.html" title="mailinglists">mailing lists</a></li>
+	<li><span class="nobr"><a href="http://cwiki.apache.org/confluence/x/O-" title="Visit page outside Confluence" rel="nofollow">wiki<sup><img class="rendericon" src="launching-and-embedding-apache-felix_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span></li>
+	<li><a href="http://felix.apache.org/site/committers.html" title="committers">committers</a></li>
+	<li><a href="http://felix.apache.org/site/faq.html" title="faq">faq</a></li>
+	<li><a href="http://felix.apache.org/site/roadmap.html" title="roadmap">roadmap</a></li>
+	<li><a href="http://felix.apache.org/site/sourcecode.html" title="sourcecode">source code</a></li>
+	<li><a href="http://felix.apache.org/site/codingstandards.html" title="codingstandards">coding standards</a></li>
+	<li><a href="http://felix.apache.org/site/issuetracking.html" title="issuetracking">issue tracking</a></li>
+	<li><a href="http://felix.apache.org/site/dependencies.html" title="dependencies">dependencies</a></li>
+</ul> </div>
     <div class="main">
 <h1><a name="LaunchingandEmbeddingApacheFelix-LaunchingandEmbeddingApacheFelix"></a>Launching and Embedding Apache Felix</h1>
 
@@ -55,6 +50,7 @@
 	</ul>
 	</li>
 	<li><a href="#LaunchingandEmbeddingApacheFelix-caveat" title="caveat on Launching and Embedding Apache Felix">Caveat</a></li>
+	<li><a href="#LaunchingandEmbeddingApacheFelix-feedback" title="feedback on Launching and Embedding Apache Felix">Feedback</a></li>
 </ul>
 
 
@@ -145,9 +141,9 @@
 profile directory where installed bundles will be cached. Felix' bundle
 cache implementation allows you to configure the location where bundles
 are cached using configuration properties. At a minimum, either a
-bundle cache profile name or directory must be specified; see the <a href="http://cwiki.apache.org/FELIX/apache-felix-bundle-cache.html" title="Apache Felix Bundle Cache">bundle cache document</a> for more detailed information on configuring the bundle cache.</p>
+bundle cache profile name or directory must be specified; see the <a href="http://felix.apache.org/site/apache-felix-bundle-cache.html" title="Apache Felix Bundle Cache">bundle cache document</a> for more detailed information on configuring the bundle cache.</p>
 
-<p>Besides configuration properties for the bundle cache, it is usually necessary to set the <tt>org.osgi.framework.system.packages</tt> configuration property to export packages from the class path, such as the OSGi interface classes (e.g., <tt>org.osgi.framework</tt>) on which all bundles depend. If you are creating a launcher for Felix, then the <tt>felix.auto.start</tt> configuration property may also be used to automatically install and start various bundles; see the <a href="http://cwiki.apache.org/FELIX/apache-felix-usage-documentation.html#ApacheFelixUsageDocumentation-configuringfelix" title="configuring-felix on Apache Felix Usage Documentation">usage document</a> for more information on configuring Felix and on the various configuration properties.</p>
+<p>Besides configuration properties for the bundle cache, it is usually necessary to set the <tt>org.osgi.framework.system.packages</tt> configuration property to export packages from the class path, such as the OSGi interface classes (e.g., <tt>org.osgi.framework</tt>) on which all bundles depend. If you are creating a launcher for Felix, then the <tt>felix.auto.start</tt> configuration property may also be used to automatically install and start various bundles; see the <a href="http://felix.apache.org/site/apache-felix-usage-documentation.html#ApacheFelixUsageDocumentation-configuringfelix" title="configuring-felix on Apache Felix Usage Documentation">usage document</a> for more information on configuring Felix and on the various configuration properties.</p>
 
 <p>The remainder of this section describes how the standard Felix
 launcher works as well as how to create a custom launcher for Felix.</p>
@@ -247,7 +243,7 @@
 properties that are set as system properties will be copied into the
 set of configuration properties to provide an easy way to add to or
 override configuration properties specified in the <tt>config.properties</tt> file.</li>
-	<li>Try to load the profile name or profile directory configuration properties. At least one of these must be specified so that the <a href="http://cwiki.apache.org/FELIX/apache-felix-bundle-cache.html" title="Apache Felix Bundle Cache">bundle cache</a> knows where to save installed bundles.</li>
+	<li>Try to load the profile name or profile directory configuration properties. At least one of these must be specified so that the <a href="http://felix.apache.org/site/apache-felix-bundle-cache.html" title="Apache Felix Bundle Cache">bundle cache</a> knows where to save installed bundles.</li>
 	<li>If
 either the profile name or profile directory configuration property has
 not been specified, then ask the user to specify a profile name and add
@@ -934,5 +930,12 @@
 compiled and may be out of date with respect to the current Felix
 source code. If you find errors please report them so the that they can
 be corrected.</p>
+
+<p><a name="LaunchingandEmbeddingApacheFelix-feedback"></a></p>
+
+<h2><a name="LaunchingandEmbeddingApacheFelix-Feedback"></a>Feedback</h2>
+
+<p>Subscribe to the Felix users mailing list by sending a message to <span class="nobr"><a href="mailto:users-subscribe@felix.apache.org" title="Send mail to users-subscribe@felix.apache.org" rel="nofollow">users-subscribe@felix.apache.org<sup><img class="rendericon" src="launching-and-embedding-apache-felix_files/mail_small.gif" alt="" align="absmiddle" border="0" height="12" width="13"></sup></a></span>; after subscribing, email questions or feedback to <span class="nobr"><a href="mailto:users@felix.apache.org" title="Send mail to users@felix.apache.org" rel="nofollow">users@felix.apache.org<sup><img class="rendericon" src="launching-and-embedding-apache-felix_files/mail_small.gif" alt="" align="absmiddle" border="0" height="12" width="13"></sup></a></span>.</p>
     </div>
-  </body></html>
\ No newline at end of file
+  
+</body></html>
diff --git a/framework/doc/launching-and-embedding-apache-felix_files/apache.png b/framework/doc/launching-and-embedding-apache-felix_files/apache.png
index 1bcce23..5132f65 100644
--- a/framework/doc/launching-and-embedding-apache-felix_files/apache.png
+++ b/framework/doc/launching-and-embedding-apache-felix_files/apache.png
Binary files differ
diff --git a/framework/doc/launching-and-embedding-apache-felix_files/felix_logo.png b/framework/doc/launching-and-embedding-apache-felix_files/felix_logo.png
deleted file mode 100644
index d653a06..0000000
--- a/framework/doc/launching-and-embedding-apache-felix_files/felix_logo.png
+++ /dev/null
Binary files differ
diff --git a/framework/doc/launching-and-embedding-apache-felix_files/linkext7.gif b/framework/doc/launching-and-embedding-apache-felix_files/linkext7.gif
new file mode 100644
index 0000000..f2dd2dc
--- /dev/null
+++ b/framework/doc/launching-and-embedding-apache-felix_files/linkext7.gif
Binary files differ
diff --git a/framework/doc/launching-and-embedding-apache-felix_files/logo.png b/framework/doc/launching-and-embedding-apache-felix_files/logo.png
new file mode 100644
index 0000000..dccbddc
--- /dev/null
+++ b/framework/doc/launching-and-embedding-apache-felix_files/logo.png
Binary files differ
diff --git a/framework/doc/launching-and-embedding-apache-felix_files/site.css b/framework/doc/launching-and-embedding-apache-felix_files/site.css
index d60ada8..959ab0a 100644
--- a/framework/doc/launching-and-embedding-apache-felix_files/site.css
+++ b/framework/doc/launching-and-embedding-apache-felix_files/site.css
@@ -1,5 +1,7 @@
+/* @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% }
+h1, h2, h3, h4, h5, h6 { font-weight: normal; color: #000000; line-height: 100%; margin-top: 0px}
 h1 { font-size: 200% }
 h2 { font-size: 175% }
 h3 { font-size: 150% }
@@ -9,11 +11,13 @@
 a { color: #1980af }
 a:visited { color: #1980af }
 a:hover { color: #1faae9 }
-.title { position: absolute; left: 0px; right: 0px; top: 0px; height: 107px; background: url(bg_header.png) repeat-x }
-.menu { position: absolute; top: 107px; left: 0px; width: 198px; bottom: 0px; padding: 0px; background-color: #fcfcfc }
-.menu ul { background-image: url(bg_menu.png); list-style: none; padding-left: 80px; margin-top: 0px; padding-top: 20px; padding-bottom: 20px; color: #4a4a43 }
+.title { position: absolute; left: 1px; right: 1px; top:25px; height: 81px; background: url(http://felix.apache.org/site/media.data/gradient.png) repeat-x; background-position: bottom; }
+.logo { position: absolute; width: 15em; height: 81px; text-align: center; }
+.header { text-align: right; margin-right: 20pt; margin-top: 30pt;}
+.menu { border-top: 10px solid #f9bb00; position: absolute; top: 107px; left: 1px; width: 15em; bottom: 0px; padding: 0px; background-color: #fcfcfc }
+.menu ul { background-color: #fdf5d9; list-style: none; padding-left: 4em; margin-top: 0px; padding-top: 2em; padding-bottom: 2em; margin-left: 0px; color: #4a4a43}
 .menu a { text-decoration: none; color: #4a4a43 }
-.main { position: absolute; top: 107px; left: 220px; right: 80px }
+.main { position: absolute; border-top: 10px solid #cde0ea; top: 107px; left: 15em; right: 1px; margin-left: 2px; padding-right: 4em; padding-left: 1em; padding-top: 1em;}
 .code { background-color: #eeeeee; border: solid 1px black; padding: 0.5em }
 .code-keyword { color: #880000 }
 .code-quote { color: #008800 }