Update changelog and docs.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1052944 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main/doc/apache-felix-framework-configuration-properties_files/button.html b/main/doc/apache-felix-framework-configuration-properties_files/button.html
new file mode 100644
index 0000000..8503c58
--- /dev/null
+++ b/main/doc/apache-felix-framework-configuration-properties_files/button.html
@@ -0,0 +1,5 @@
+<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/" target="_blank"><img src="button_data/2010-na-125x125.png" title="ApacheCon NA 2010" border="0" height="125" width="125"></a>
+<!-- ads end -->
+</body></html>
\ No newline at end of file