diff --git a/lucene/src/site/build/site/contributions.html b/lucene/src/site/build/site/contributions.html
index 1e2ecc0a4dd..04494a18a2b 100644
--- a/lucene/src/site/build/site/contributions.html
+++ b/lucene/src/site/build/site/contributions.html
@@ -199,6 +199,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">
@@ -727,5 +730,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
 </body>
 </html>
diff --git a/lucene/src/site/build/site/demo.html b/lucene/src/site/build/site/demo.html
index 90373dfe61e..f179d9cf685 100644
--- a/lucene/src/site/build/site/demo.html
+++ b/lucene/src/site/build/site/demo.html
@@ -199,6 +199,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">
@@ -342,5 +345,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
 </body>
 </html>
diff --git a/lucene/src/site/build/site/demo2.html b/lucene/src/site/build/site/demo2.html
index df64e9576f3..cac36e4ead4 100644
--- a/lucene/src/site/build/site/demo2.html
+++ b/lucene/src/site/build/site/demo2.html
@@ -199,6 +199,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">
@@ -392,5 +395,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
 </body>
 </html>
diff --git a/lucene/src/site/build/site/fileformats.html b/lucene/src/site/build/site/fileformats.html
index a8e75bbb731..30e38b0fb11 100644
--- a/lucene/src/site/build/site/fileformats.html
+++ b/lucene/src/site/build/site/fileformats.html
@@ -199,6 +199,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">
@@ -2623,5 +2626,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
 </body>
 </html>
diff --git a/lucene/src/site/build/site/gettingstarted.html b/lucene/src/site/build/site/gettingstarted.html
index a50a3581ede..75988472620 100644
--- a/lucene/src/site/build/site/gettingstarted.html
+++ b/lucene/src/site/build/site/gettingstarted.html
@@ -199,6 +199,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">
@@ -281,5 +284,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
 </body>
 </html>
diff --git a/lucene/src/site/build/site/index.html b/lucene/src/site/build/site/index.html
index bd258d4fd1d..32eb2ec7284 100644
--- a/lucene/src/site/build/site/index.html
+++ b/lucene/src/site/build/site/index.html
@@ -197,6 +197,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div id="credit">
 <hr>
@@ -251,5 +254,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
 </body>
 </html>
diff --git a/lucene/src/site/build/site/linkmap.html b/lucene/src/site/build/site/linkmap.html
index c4b46090f85..f43b0badef2 100644
--- a/lucene/src/site/build/site/linkmap.html
+++ b/lucene/src/site/build/site/linkmap.html
@@ -197,6 +197,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">
@@ -421,6 +424,12 @@ document.write("Last Published: " + document.lastModified);
 <a href="http://wiki.apache.org/lucene-java">Wiki</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>wiki</em>
 </li>
 </ul>
+      
+<ul>
+<li>
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>privacy</em>
+</li>
+</ul>
   
 </ul>
 </ul>
@@ -455,5 +464,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
 </body>
 </html>
diff --git a/lucene/src/site/build/site/lucene-contrib/index.html b/lucene/src/site/build/site/lucene-contrib/index.html
index d0edfaa0547..f09b622345f 100644
--- a/lucene/src/site/build/site/lucene-contrib/index.html
+++ b/lucene/src/site/build/site/lucene-contrib/index.html
@@ -199,6 +199,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div id="credit">
 <hr>
@@ -400,5 +403,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
 </body>
 </html>
diff --git a/lucene/src/site/build/site/queryparsersyntax.html b/lucene/src/site/build/site/queryparsersyntax.html
index ba748aa2262..a79ec6b79c8 100644
--- a/lucene/src/site/build/site/queryparsersyntax.html
+++ b/lucene/src/site/build/site/queryparsersyntax.html
@@ -199,6 +199,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">
@@ -507,5 +510,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
 </body>
 </html>
diff --git a/lucene/src/site/build/site/scoring.html b/lucene/src/site/build/site/scoring.html
index 4fe632a7665..7bb98c91f93 100644
--- a/lucene/src/site/build/site/scoring.html
+++ b/lucene/src/site/build/site/scoring.html
@@ -199,6 +199,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">
@@ -570,5 +573,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
 </body>
 </html>
diff --git a/lucene/src/site/build/site/systemrequirements.html b/lucene/src/site/build/site/systemrequirements.html
index 94e98b7a3fd..25b460d3b6b 100644
--- a/lucene/src/site/build/site/systemrequirements.html
+++ b/lucene/src/site/build/site/systemrequirements.html
@@ -197,6 +197,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">
@@ -270,5 +273,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
 </body>
 </html>
diff --git a/lucene/src/site/src/documentation/content/xdocs/site.xml b/lucene/src/site/src/documentation/content/xdocs/site.xml
index 224e4f347fa..fe05ec4ead5 100755
--- a/lucene/src/site/src/documentation/content/xdocs/site.xml
+++ b/lucene/src/site/src/documentation/content/xdocs/site.xml
@@ -78,6 +78,7 @@ See http://forrest.apache.org/docs/linking.html for more info
       <query-syntax label="Query Syntax" href="queryparsersyntax.html"/>
       <scoring label="Scoring" href="scoring.html"/>
       <wiki        label="Wiki"             href="ext:wiki" />
+      <privacy label="Privacy Policy" href="ext:privacy"/>
   </docs>
   
   <!--
@@ -113,7 +114,7 @@ See http://forrest.apache.org/docs/linking.html for more info
       <webapp href="docs/your-project.html#webapp"/>
       <dtd-docs href="docs/dtd-docs.html"/>
     </forrest>
-
+    <privacy href="http://lucene.apache.org/privacy.html"/>
     <cocoon href="http://cocoon.apache.org/"/>
     <xml.apache.org href="http://xml.apache.org/"/>
     <issues href="http://issues.apache.org/jira/browse/LUCENE"/>
diff --git a/lucene/src/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl b/lucene/src/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl
index c92975643e2..fe245e1eb11 100644
--- a/lucene/src/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl
+++ b/lucene/src/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl
@@ -374,6 +374,19 @@ footer, searchbar, css etc.  As input, it takes XML of the form:
     |end bottomstrip
     +</xsl:comment>
         </div>
+        <script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
       </body>
     </html>
   </xsl:template>
diff --git a/solr/site-src/src/documentation/content/xdocs/site.xml b/solr/site-src/src/documentation/content/xdocs/site.xml
index ab7660d175a..594c551397c 100755
--- a/solr/site-src/src/documentation/content/xdocs/site.xml
+++ b/solr/site-src/src/documentation/content/xdocs/site.xml
@@ -39,6 +39,7 @@ See http://forrest.apache.org/docs/linking.html for more info
   <about label="About">
     <index label="Welcome" href="index.html" description="Welcome to Solr"/>
     <index label="Who We Are" href="ext:lucene_who" description="Lucene/Solr Committers"/>
+    <privacy label="Privacy Policy" href="ext:privacy"/>
   </about>
 
   <docs label="Documentation">
@@ -81,7 +82,7 @@ See http://forrest.apache.org/docs/linking.html for more info
     </forrest>
     <cocoon href="http://cocoon.apache.org/"/>
     <xml.apache.org href="http://xml.apache.org/"/>
-
+    <privacy href="http://lucene.apache.org/privacy.html"/>
     <lucene      href="http://lucene.apache.org/java/" />
     <lucene_who  href="http://lucene.apache.org/java/docs/whoweare.html" />
     <nutch     href="http://lucene.apache.org/nutch/" />
diff --git a/solr/site-src/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl b/solr/site-src/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl
index bbac540b143..43ab2622618 100644
--- a/solr/site-src/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl
+++ b/solr/site-src/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl
@@ -379,6 +379,19 @@ footer, searchbar, css etc.  As input, it takes XML of the form:
     |end bottomstrip
     +</xsl:comment>
         </div>
+        <script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+        </script>
       </body>
     </html>
   </xsl:template>
diff --git a/solr/site/features.html b/solr/site/features.html
index d1df892a090..5fd98fb1b43 100755
--- a/solr/site/features.html
+++ b/solr/site/features.html
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="lucene">
 <title>Introduction to The Solr Enterprise Search Server</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -109,6 +109,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://lucene.apache.org/java/docs/whoweare.html" title="Lucene/Solr Committers">Who We Are</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', 'skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -255,7 +258,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 
 
-<a name="N1000D"></a><a name="Solr+in+a+Nutshell"></a>
+<a name="N1000E"></a><a name="Solr+in+a+Nutshell"></a>
 <h2 class="boxed">Solr in a Nutshell</h2>
 <div class="section">
 <p>
@@ -283,7 +286,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 
 
-<a name="N10032"></a><a name="Solr+Uses+the+Lucene+Search+Library+and+Extends+it%21"></a>
+<a name="N10033"></a><a name="Solr+Uses+the+Lucene+Search+Library+and+Extends+it%21"></a>
 <h2 class="boxed">Solr Uses the Lucene Search Library and Extends it!</h2>
 <div class="section">
 <ul>
@@ -326,10 +329,10 @@ document.write("Last Published: " + document.lastModified);
 </div>
 
 
-<a name="N1006F"></a><a name="Detailed+Features"></a>
+<a name="N10070"></a><a name="Detailed+Features"></a>
 <h2 class="boxed">Detailed Features</h2>
 <div class="section">
-<a name="N10075"></a><a name="Schema"></a>
+<a name="N10076"></a><a name="Schema"></a>
 <h3 class="boxed">Schema</h3>
 <ul>
       
@@ -350,7 +353,7 @@ document.write("Last Published: " + document.lastModified);
 <li>Many additional text analysis components including word splitting, regex and sounds-like filters</li>
     
 </ul>
-<a name="N10096"></a><a name="Query"></a>
+<a name="N10097"></a><a name="Query"></a>
 <h3 class="boxed">Query</h3>
 <ul>
       
@@ -390,7 +393,7 @@ document.write("Last Published: " + document.lastModified);
 <li>Performance Optimizations</li>
     
 </ul>
-<a name="N100D2"></a><a name="Core"></a>
+<a name="N100D3"></a><a name="Core"></a>
 <h3 class="boxed">Core</h3>
 <ul>
       
@@ -415,7 +418,7 @@ document.write("Last Published: " + document.lastModified);
 <li>"Luke" request handler for corpus information</li>
     
 </ul>
-<a name="N100F9"></a><a name="Caching"></a>
+<a name="N100FA"></a><a name="Caching"></a>
 <h3 class="boxed">Caching</h3>
 <ul>
       
@@ -449,7 +452,7 @@ document.write("Last Published: " + document.lastModified);
 <li>User level caching with autowarming support</li>
     
 </ul>
-<a name="N1011E"></a><a name="Replication"></a>
+<a name="N1011F"></a><a name="Replication"></a>
 <h3 class="boxed">Replication</h3>
 <ul>
       
@@ -462,7 +465,7 @@ document.write("Last Published: " + document.lastModified);
 <li>Replication and automatic reloading of configuration files</li>
     
 </ul>
-<a name="N10133"></a><a name="Admin+Interface"></a>
+<a name="N10134"></a><a name="Admin+Interface"></a>
 <h3 class="boxed">Admin Interface</h3>
 <ul>
       
@@ -516,5 +519,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+        </script>
 </body>
 </html>
diff --git a/solr/site/features.pdf b/solr/site/features.pdf
index b8369357749..8449514b80e 100755
Binary files a/solr/site/features.pdf and b/solr/site/features.pdf differ
diff --git a/solr/site/index.html b/solr/site/index.html
index 25a85a5975d..aff3b285f73 100755
--- a/solr/site/index.html
+++ b/solr/site/index.html
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="lucene">
 <title>Welcome to Solr</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -109,6 +109,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://lucene.apache.org/java/docs/whoweare.html" title="Lucene/Solr Committers">Who We Are</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
 <div id="menu_1.2" class="menuitemgroup">
@@ -320,7 +323,7 @@ document.write("Last Published: " + document.lastModified);
 </ul>
 </div> 
     
-<a name="N1000D"></a><a name="intro"></a>
+<a name="N1000E"></a><a name="intro"></a>
 <h2 class="boxed">What Is Solr?</h2>
 <div class="section">
 <p>
@@ -351,7 +354,7 @@ customization is required.
       </p>
 </div>
     
-<a name="N10030"></a><a name="getstarted"></a>
+<a name="N10031"></a><a name="getstarted"></a>
 <h2 class="boxed">Get Started</h2>
 <div class="section">
 <ul>
@@ -373,10 +376,10 @@ customization is required.
 </ul>
 </div>
     
-<a name="N10059"></a><a name="news"></a>
+<a name="N1005A"></a><a name="news"></a>
 <h2 class="boxed">News</h2>
 <div class="section">
-<a name="N1005F"></a><a name="27+November+2011+-+Solr+3.5.0+Released"></a>
+<a name="N10060"></a><a name="27+November+2011+-+Solr+3.5.0+Released"></a>
 <h3 class="boxed">27 November 2011 - Solr 3.5.0 Released</h3>
 <p>
           The Lucene PMC is pleased to announce the release of
@@ -434,7 +437,7 @@ customization is required.
           </li>
         
 </ul>
-<a name="N100C5"></a><a name="18+November+2011+-+2nd+edition+of+the+first+book+on+Solr+published%21"></a>
+<a name="N100C6"></a><a name="18+November+2011+-+2nd+edition+of+the+first+book+on+Solr+published%21"></a>
 <h3 class="boxed">18 November 2011 - 2nd edition of the first book on Solr published!</h3>
 <p>
 <img alt="Apache Solr 3 Enterprise Search Server cover" class="float-right" src="images/as3ess_book.jpg">
@@ -461,7 +464,7 @@ customization is required.
           and at <a href="http://www.solrenterprisesearchserver.com">the authors' site</a>, including a free chapter and
           search parameter quick-reference sheet (the appendix).
         </p>
-<a name="N100E9"></a><a name="26+October+2011+-+Java+7u1+fixes+index+corruption+and+crash+bugs+in+Apache+Lucene+Core+and+Apache+Solr"></a>
+<a name="N100EA"></a><a name="26+October+2011+-+Java+7u1+fixes+index+corruption+and+crash+bugs+in+Apache+Lucene+Core+and+Apache+Solr"></a>
 <h3 class="boxed">26 October 2011 - Java 7u1 fixes index corruption and crash bugs in Apache Lucene Core and Apache Solr</h3>
 <p>Oracle released <a href="http://www.oracle.com/technetwork/java/javase/7u1-relnotes-507962.html">Java 7u1</a> on October 19.
           According to the release notes and tests done by the Lucene committers, all bugs reported on July 28 are fixed in this release,
@@ -475,7 +478,7 @@ customization is required.
           version shipped with Java 7 changed and tokenization behaves differently
           (e.g. lowercasing). For more information, read <span class="codefrag">JRE_VERSION_MIGRATION.txt</span>
           in your distribution package!</p>
-<a name="N10112"></a><a name="14+September+2011+-+Solr+3.4.0+Released"></a>
+<a name="N10113"></a><a name="14+September+2011+-+Solr+3.4.0+Released"></a>
 <h3 class="boxed">14 September 2011 - Solr 3.4.0 Released</h3>
 <p>The Lucene PMC is pleased to announce the release of <a href="http://www.apache.org/dyn/closer.cgi/lucene/solr">Apache Solr 3.4.0</a>!
 	</p>
@@ -539,7 +542,7 @@ customization is required.
 </ul>
 <p>See the <a href="http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_3_4_0/solr/CHANGES.txt">release notes</a> for a more complete list of all the new features, improvements, and bugfixes.
 	</p>
-<a name="N1019F"></a><a name="28+July+2011+-+WARNING%3A+Index+corruption+and+crashes+in+Apache+Lucene+Core+%2F+Apache+Solr+with+Java+7"></a>
+<a name="N101A0"></a><a name="28+July+2011+-+WARNING%3A+Index+corruption+and+crashes+in+Apache+Lucene+Core+%2F+Apache+Solr+with+Java+7"></a>
 <h3 class="boxed">28 July 2011 - WARNING: Index corruption and crashes in Apache Lucene Core / Apache Solr with Java 7</h3>
 <p>Oracle released <a href="http://www.oracle.com/technetwork/java/javase/jdk7-relnotes-429209.html">Java 7</a> today.
   Unfortunately it contains hotspot compiler optimizations, which miscompile some loops.
@@ -577,13 +580,13 @@ customization is required.
   version shipped with Java 7 changed and tokenization behaves differently
   (e.g. lowercasing). For more information, read <span class="codefrag">JRE_VERSION_MIGRATION.txt</span>
   in your distribution package!</p>
-<a name="N101EF"></a><a name="22+July+2011+-+Solr+3.1+cookbook+published%21"></a>
+<a name="N101F0"></a><a name="22+July+2011+-+Solr+3.1+cookbook+published%21"></a>
 <h3 class="boxed">22 July 2011 - Solr 3.1 cookbook published!</h3>
 <p>
 <img alt="Solr Cookbook cover" class="float-right" src="images/solr_31_cookbook.jpg">Rafał Kuć is proud to introduce a new book on Solr, <a href="http://www.packtpub.com/solr-3-1-enterprise-search-server-cookbook/book" title="PACKT:Apache Solr 3.1 Cookbook">"Apache Solr 3.1 Cookbook"</a> from Packt Publishing.</p>
 <p>The Solr 3.1 Cookbook will make your everyday work easier by using real-life examples that show you how to deal with the most common problems that can arise while using the Apache Solr search engine.</p>
 <p>This cookbook will show you how to get the most out of your search engine. Each chapter covers a different aspect of working with Solr from analyzing your text data through querying, performance improvement, and developing your own modules. The practical recipes will help you to quickly solve common problems with data analysis, show you how to use faceting to collect data and to speed up the performance of Solr. You will learn about functionalities that most newbies are unaware of, such as sorting results by a function value, highlighting matched words, and computing statistics to make your work with Solr easy and stress free.</p>
-<a name="N10208"></a><a name="July+2011+-+Solr+3.3+Released"></a>
+<a name="N10209"></a><a name="July+2011+-+Solr+3.3+Released"></a>
 <h3 class="boxed">July 2011 - Solr 3.3 Released</h3>
 <p>The Lucene PMC is pleased to announce the release of <a href="http://www.apache.org/dyn/closer.cgi/lucene/solr">Apache Solr 3.3</a>!
   </p>
@@ -613,7 +616,7 @@ customization is required.
 </ul>
 <p>See the <a href="http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_3_3/solr/CHANGES.txt">release notes</a> for a more complete list of all the new features, improvements, and bugfixes.
  </p>
-<a name="N1023C"></a><a name="May+2011+-+Solr+3.2+Released"></a>
+<a name="N1023D"></a><a name="May+2011+-+Solr+3.2+Released"></a>
 <h3 class="boxed">May 2011 - Solr 3.2 Released</h3>
 <p>The Lucene PMC is pleased to announce the release of <a href="http://www.apache.org/dyn/closer.cgi/lucene/solr">Apache Solr 3.2</a>!
   </p>
@@ -639,7 +642,7 @@ customization is required.
 </ul>
 <p>See the <a href="http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_3_2/solr/CHANGES.txt">release notes</a> for a more complete list of all the new features, improvements, and bugfixes.
  </p>
-<a name="N10269"></a><a name="March+2011+-+Solr+3.1+Released"></a>
+<a name="N1026A"></a><a name="March+2011+-+Solr+3.1+Released"></a>
 <h3 class="boxed">March 2011 - Solr 3.1 Released</h3>
 <p>The Lucene PMC is pleased to announce the release of <a href="http://www.apache.org/dyn/closer.cgi/lucene/solr">Apache Solr 3.1</a>!
   </p>
@@ -687,7 +690,7 @@ customization is required.
 </ul>
 <p>See the <a href="http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_3_1/solr/CHANGES.txt">release notes</a> for a more complete list of all the new features, improvements, and bugfixes.
  </p>
-<a name="N102D4"></a><a name="25+June+2010+-+Solr+1.4.1+Released"></a>
+<a name="N102D5"></a><a name="25+June+2010+-+Solr+1.4.1+Released"></a>
 <h3 class="boxed">25 June 2010 - Solr 1.4.1 Released</h3>
 <p>
            Solr 1.4.1 has been released and is now available for public
@@ -700,7 +703,7 @@ customization is required.
           See the <a href="http://svn.apache.org/repos/asf/lucene/solr/tags/release-1.4.1/CHANGES.txt">release notes</a>
           for more details.
           </p>
-<a name="N102E9"></a><a name="7+May+2010+-+Apache+Lucene+Eurocon+2010+Coming+to+Prague+May+18-21"></a>
+<a name="N102EA"></a><a name="7+May+2010+-+Apache+Lucene+Eurocon+2010+Coming+to+Prague+May+18-21"></a>
 <h3 class="boxed">7 May 2010 - Apache Lucene Eurocon 2010 Coming to Prague May 18-21</h3>
 <p>
           On May 18th to the 21st Prague will play host to the first
@@ -772,7 +775,7 @@ customization is required.
 </li>
         
 </ul>
-<a name="N10335"></a><a name="10+November+2009+-+Solr+1.4+Released"></a>
+<a name="N10336"></a><a name="10+November+2009+-+Solr+1.4+Released"></a>
 <h3 class="boxed">10 November 2009 - Solr 1.4 Released</h3>
 <p>
      Solr 1.4 has been released and is now available for public <a href="http://www.apache.org/dyn/closer.cgi/lucene/solr/">download</a>!
@@ -804,12 +807,12 @@ customization is required.
 </ul>
 <p>See the <a href="http://svn.apache.org/repos/asf/lucene/solr/tags/release-1.4.0/CHANGES.txt">release notes</a> for more details.
  </p>
-<a name="N10365"></a><a name="20+August+2009+-+Solr%27s+first+book+is+published%21"></a>
+<a name="N10366"></a><a name="20+August+2009+-+Solr%27s+first+book+is+published%21"></a>
 <h3 class="boxed">20 August 2009 - Solr's first book is published!</h3>
 <p>
    
-<a href="http://www.packtpub.com/solr-1-4-enterprise-search-server?utm_source=http%3A%2F%2Flucene.apache.org%2Fsolr%2F&utm_medium=spons&utm_content=pod&utm_campaign=mdb_000275" title="PACKT:Solr 1.4 Enterprise Search Server"><img alt="Solr book cover" class="float-right" src="images/solr-book-image.jpg"></a>
-   David Smiley and Eric Pugh are proud to introduce the first book on Solr, <strong><a href="http://www.packtpub.com/solr-1-4-enterprise-search-server?utm_source=http%3A%2F%2Flucene.apache.org%2Fsolr%2F&utm_medium=spons&utm_content=pod&utm_campaign=mdb_000275">"Solr 1.4 Enterprise Search Server"</a></strong> from Packt Publishing.
+<a href="http://www.packtpub.com/solr-1-4-enterprise-search-server?utm_source=http%3A%2F%2Flucene.apache.org%2Fsolr%2F&amp;utm_medium=spons&amp;utm_content=pod&amp;utm_campaign=mdb_000275" title="PACKT:Solr 1.4 Enterprise Search Server"><img alt="Solr book cover" class="float-right" src="images/solr-book-image.jpg"></a>
+   David Smiley and Eric Pugh are proud to introduce the first book on Solr, <strong><a href="http://www.packtpub.com/solr-1-4-enterprise-search-server?utm_source=http%3A%2F%2Flucene.apache.org%2Fsolr%2F&amp;utm_medium=spons&amp;utm_content=pod&amp;utm_campaign=mdb_000275">"Solr 1.4 Enterprise Search Server"</a></strong> from Packt Publishing.
    </p>
 <p>This book is a comprehensive reference guide for nearly every feature Solr has to offer. It serves the reader right from initiation to development to deployment. It also comes with complete running examples to demonstrate its use and show how to integrate it with other languages and frameworks.
    </p>
@@ -819,7 +822,7 @@ customization is required.
    </p>
 <p>Finally, this book covers various deployment considerations to include indexing strategies and performance-oriented configuration that will enable you to scale Solr to meet the needs of a high-volume site.
    </p>
-<a name="N10385"></a><a name="18+August+2009+-+Lucene+at+US+ApacheCon"></a>
+<a name="N10386"></a><a name="18+August+2009+-+Lucene+at+US+ApacheCon"></a>
 <h3 class="boxed">18 August 2009 - Lucene at US ApacheCon</h3>
 <p>
  
@@ -895,7 +898,7 @@ Be sure not to miss:
     Search</a> - Jason Rutherglen @ 15:00</li>
 
 </ul>
-<a name="N103F9"></a><a name="09+February+2009+-+Lucene+at+ApacheCon+Europe+2009+in+Amsterdam"></a>
+<a name="N103FA"></a><a name="09+February+2009+-+Lucene+at+ApacheCon+Europe+2009+in+Amsterdam"></a>
 <h3 class="boxed">09 February 2009 - Lucene at ApacheCon Europe 2009 in Amsterdam</h3>
 <p>
                
@@ -933,23 +936,23 @@ Be sure not to miss:
 
 							              
 </ul>
-<a name="N10442"></a><a name="19+December+2008+-+Solr+Logo+Contest+Results"></a>
+<a name="N10443"></a><a name="19+December+2008+-+Solr+Logo+Contest+Results"></a>
 <h3 class="boxed">19 December 2008 - Solr Logo Contest Results</h3>
 <p>Many great logos were submitted, but only one could be chosen.  Congratulations Michiel,
 	the creator of the winning logo that is proudly displayed at the top of this page.  
 	</p>
-<a name="N1044B"></a><a name="03+October+2008+-+Solr+Logo+Contest"></a>
+<a name="N1044C"></a><a name="03+October+2008+-+Solr+Logo+Contest"></a>
 <h3 class="boxed">03 October 2008 - Solr Logo Contest</h3>
 <p>By popular demand, Solr is holding a contest to pick a new Solr logo.  Details about how to submit an entry can be found <a href="http://wiki.apache.org/solr/LogoContest">on the wiki</a>.  The Deadline for submissions is November 20th, 2008 @ 11:59PM GMT.
 	</p>
-<a name="N10458"></a><a name="15+September+2008+-+Solr+1.3.0+Available"></a>
+<a name="N10459"></a><a name="15+September+2008+-+Solr+1.3.0+Available"></a>
 <h3 class="boxed">15 September 2008 - Solr 1.3.0 Available</h3>
 <p>Solr 1.3.0 is available for public download.  This version contains many enhancements and bug fixes, including distributed search capabilities,
 			Lucene 2.3.x performance improvements and many others.
 		</p>
 <p>See the <a href="http://svn.apache.org/repos/asf/lucene/solr/tags/release-1.3.0/CHANGES.txt">release notes</a> for more details.  Download is
     available from a <a href="http://www.apache.org/dyn/closer.cgi/lucene/solr/">Apache Mirror</a>.</p>
-<a name="N1046C"></a><a name="28+August+2008+-+Lucene%2FSolr+at+ApacheCon+New+Orleans"></a>
+<a name="N1046D"></a><a name="28+August+2008+-+Lucene%2FSolr+at+ApacheCon+New+Orleans"></a>
 <h3 class="boxed">28 August 2008 - Lucene/Solr at ApacheCon New Orleans</h3>
 <p>
 	         
@@ -971,7 +974,7 @@ Be sure not to miss:
 <li>An <a href="http://us.apachecon.com/c/acus2008/schedule/2008/11/05">entire day of Lucene sessions</a> on November 5th</li>
 	        
 </ul>
-<a name="N1049A"></a><a name="03+September+2007+-+Lucene+at+ApacheCon+Atlanta"></a>
+<a name="N1049B"></a><a name="03+September+2007+-+Lucene+at+ApacheCon+Atlanta"></a>
 <h3 class="boxed">03 September 2007 - Lucene at ApacheCon Atlanta</h3>
 <p>
 <a href="http://www.us.apachecon.com"><img alt="ApacheCon US logo" class="float-right" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png"></a>
@@ -991,7 +994,7 @@ Be sure not to miss:
 <li>November 16, 4:00 pm: <a href="http://us.apachecon.com/us2007/program/talk/2017"> Advanced Indexing Techniques with Apache Lucene</a> by Michael Busch. Information on payloads and advanced indexing techniques.</li>
               
 </ul>
-<a name="N104D3"></a><a name="06+June+2007%3A+Release+1.2+available"></a>
+<a name="N104D4"></a><a name="06+June+2007%3A+Release+1.2+available"></a>
 <h3 class="boxed">06 June 2007: Release 1.2 available</h3>
 <p>
         This is the first release since Solr graduated from the Incubator,
@@ -1001,40 +1004,40 @@ Be sure not to miss:
         and more flexible plugins.
       </p>
 <p>See the <a href="http://svn.apache.org/repos/asf/lucene/solr/tags/release-1.2.0/CHANGES.txt">release notes</a> for more details.</p>
-<a name="N104E4"></a><a name="17+January+2007%3A+Solr+graduates+from+Incubator"></a>
+<a name="N104E5"></a><a name="17+January+2007%3A+Solr+graduates+from+Incubator"></a>
 <h3 class="boxed">17 January 2007: Solr graduates from Incubator</h3>
 <p>
         Solr has graduated from the Apache Incubator, and is now a sub-project of Lucene.
       </p>
-<a name="N104EE"></a><a name="22+December+2006%3A+Release+1.1.0+available"></a>
+<a name="N104EF"></a><a name="22+December+2006%3A+Release+1.1.0+available"></a>
 <h3 class="boxed">22 December 2006: Release 1.1.0 available</h3>
 <p>
         This is the first release since Solr joined the Incubator, and brings
         many new features and performance optimizations including highlighting,
         faceted search, and JSON/Python/Ruby response formats.
       </p>
-<a name="N104F8"></a><a name="15+August+2006%3A+Solr+at+ApacheCon+US"></a>
+<a name="N104F9"></a><a name="15+August+2006%3A+Solr+at+ApacheCon+US"></a>
 <h3 class="boxed">15 August 2006: Solr at ApacheCon US</h3>
 <p>Chris Hostetter will be presenting
         <strong><a href="http://www.apachecon.com/2006/US/html/sessions.html#FR26">"Faceted Searching With Apache Solr"</a></strong>  
         at ApacheCon US 2006, on October 13th at 4:30pm.
         See the <a href="http://www.us.apachecon.com/">ApacheCon</a> website for more details.
       </p>
-<a name="N1050B"></a><a name="21+April+2006%3A+Solr+at+ApacheCon"></a>
+<a name="N1050C"></a><a name="21+April+2006%3A+Solr+at+ApacheCon"></a>
 <h3 class="boxed">21 April 2006: Solr at ApacheCon</h3>
 <p>Yonik Seeley will be presenting
         <strong>"Apache Solr, a Full-Text Search Server based on Lucene"</strong>  
         at ApacheCon Europe 2006, on June 29th at 5:30pm.
         See the <a href="http://www.eu.apachecon.com/">ApacheCon</a> website for more details.
       </p>
-<a name="N1051C"></a><a name="21+February+2006%3A+nightly+builds"></a>
+<a name="N1051D"></a><a name="21+February+2006%3A+nightly+builds"></a>
 <h3 class="boxed">21 February 2006: nightly builds</h3>
 <p>Solr now has nightly builds.  This automatically creates a
       <a href="http://people.apache.org/builds/lucene/solr/nightly/">downloadable version of Solr every
       night</a>.  All unit tests must pass, or a message is sent to
       the developers mailing list and no new version is created.  This
       also updates the <a href="api/index.html">javadoc</a>.</p>
-<a name="N1052E"></a><a name="17+January+2006%3A+Solr+Joins+Apache+Incubator"></a>
+<a name="N1052F"></a><a name="17+January+2006%3A+Solr+Joins+Apache+Incubator"></a>
 <h3 class="boxed">17 January 2006: Solr Joins Apache Incubator</h3>
 <p>Solr, a search server based on Lucene, has been accepted into the Apache Incubator.
             Solr was originally developed by CNET Networks, and is widely used within CNET
@@ -1067,5 +1070,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+        </script>
 </body>
 </html>
diff --git a/solr/site/index.pdf b/solr/site/index.pdf
index 0b94db3be03..cc58ed1237e 100755
Binary files a/solr/site/index.pdf and b/solr/site/index.pdf differ
diff --git a/solr/site/issue_tracking.html b/solr/site/issue_tracking.html
index 53b2963a376..3b0ec34a8ef 100755
--- a/solr/site/issue_tracking.html
+++ b/solr/site/issue_tracking.html
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="lucene">
 <title>Solr Issue Tracking</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -109,6 +109,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://lucene.apache.org/java/docs/whoweare.html" title="Lucene/Solr Committers">Who We Are</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
 <div id="menu_1.2" class="menuitemgroup">
@@ -251,5 +254,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+        </script>
 </body>
 </html>
diff --git a/solr/site/issue_tracking.pdf b/solr/site/issue_tracking.pdf
index 885cba949d8..c6fbea71752 100755
Binary files a/solr/site/issue_tracking.pdf and b/solr/site/issue_tracking.pdf differ
diff --git a/solr/site/linkmap.html b/solr/site/linkmap.html
index fc40a200d63..098241a02b6 100755
--- a/solr/site/linkmap.html
+++ b/solr/site/linkmap.html
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="lucene">
 <title>Site Linkmap Table of Contents</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -109,6 +109,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://lucene.apache.org/java/docs/whoweare.html" title="Lucene/Solr Committers">Who We Are</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
 <div id="menu_1.2" class="menuitemgroup">
@@ -245,6 +248,12 @@ document.write("Last Published: " + document.lastModified);
 <li>
 <a href="http://lucene.apache.org/java/docs/whoweare.html">Who We Are</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>index</em>&nbsp;: Lucene/Solr Committers</li>
 </ul>
+    
+<ul>
+<li>
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>privacy</em>
+</li>
+</ul>
   
 </ul>
 </ul>
@@ -393,5 +402,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+        </script>
 </body>
 </html>
diff --git a/solr/site/linkmap.pdf b/solr/site/linkmap.pdf
index f9c9701df83..30e6097db98 100755
Binary files a/solr/site/linkmap.pdf and b/solr/site/linkmap.pdf differ
diff --git a/solr/site/mailing_lists.html b/solr/site/mailing_lists.html
index 9add1be7d1b..70f2eff6425 100755
--- a/solr/site/mailing_lists.html
+++ b/solr/site/mailing_lists.html
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="lucene">
 <title>Solr Mailing Lists</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -109,6 +109,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://lucene.apache.org/java/docs/whoweare.html" title="Lucene/Solr Committers">Who We Are</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
 <div id="menu_1.2" class="menuitemgroup">
@@ -235,7 +238,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 
     
-<a name="N1000D"></a><a name="Users"></a>
+<a name="N1000E"></a><a name="Users"></a>
 <h2 class="boxed">Users</h2>
 <div class="section">
 <p>If you use Solr, please subscribe to the Solr user mailing list.</p>
@@ -265,7 +268,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 
     
-<a name="N10038"></a><a name="Developers"></a>
+<a name="N10039"></a><a name="Developers"></a>
 <h2 class="boxed">Developers</h2>
 <div class="section">
 <p>If you'd like to contribute to Solr, please subscribe to the
@@ -301,7 +304,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 
     
-<a name="N10069"></a><a name="Commits"></a>
+<a name="N1006A"></a><a name="Commits"></a>
 <h2 class="boxed">Commits</h2>
 <div class="section">
 <p>If you'd like to see changes made in Solr's <a href="version_control.html">version control system</a>
@@ -343,5 +346,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+        </script>
 </body>
 </html>
diff --git a/solr/site/mailing_lists.pdf b/solr/site/mailing_lists.pdf
index 7cb3882545b..5a3e256c614 100755
Binary files a/solr/site/mailing_lists.pdf and b/solr/site/mailing_lists.pdf differ
diff --git a/solr/site/skin/basic.css b/solr/site/skin/basic.css
index 4ed58b99ae7..eb24c326c6c 100755
--- a/solr/site/skin/basic.css
+++ b/solr/site/skin/basic.css
@@ -163,4 +163,4 @@ p {
 .codefrag {
   font-family: "Courier New", Courier, monospace;
   font-size: 110%;
-}
+}
\ No newline at end of file
diff --git a/solr/site/skin/print.css b/solr/site/skin/print.css
index 8916b9fc01e..aaa99319acd 100755
--- a/solr/site/skin/print.css
+++ b/solr/site/skin/print.css
@@ -51,4 +51,4 @@ a:link, a:visited {
 
 acronym {
   border: 0;
-}
+}
\ No newline at end of file
diff --git a/solr/site/skin/profile.css b/solr/site/skin/profile.css
index ca72cdbd10b..2ed95546ec6 100755
--- a/solr/site/skin/profile.css
+++ b/solr/site/skin/profile.css
@@ -172,4 +172,4 @@ a:hover { color:#6587ff}
     }
       
     
-  
+  
\ No newline at end of file
diff --git a/solr/site/skin/screen.css b/solr/site/skin/screen.css
index 4e2e040c84a..ef5215306db 100755
--- a/solr/site/skin/screen.css
+++ b/solr/site/skin/screen.css
@@ -584,4 +584,4 @@ p.instruction {
   list-style-image: url('../images/instruction_arrow.png');
   list-style-position: outside;
   margin-left: 2em;
-} 
+} 
\ No newline at end of file
diff --git a/solr/site/tutorial.html b/solr/site/tutorial.html
index bb1e9d80bc0..94d391b46d3 100755
--- a/solr/site/tutorial.html
+++ b/solr/site/tutorial.html
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="lucene">
 <title>Solr tutorial</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -109,6 +109,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://lucene.apache.org/java/docs/whoweare.html" title="Lucene/Solr Committers">Who We Are</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_selected_1.2', 'skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
 <div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
@@ -274,7 +277,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
 
 
-<a name="N1000D"></a><a name="Overview"></a>
+<a name="N1000E"></a><a name="Overview"></a>
 <h2 class="boxed">Overview</h2>
 <div class="section">
 <p>
@@ -284,7 +287,7 @@ schema, and some sample data.
 </div>
 
 
-<a name="N10017"></a><a name="Requirements"></a>
+<a name="N10018"></a><a name="Requirements"></a>
 <h2 class="boxed">Requirements</h2>
 <div class="section">
 <p>
@@ -308,7 +311,7 @@ To follow along with this tutorial, you will need...
 </div>
 
 
-<a name="N1003F"></a><a name="Getting+Started"></a>
+<a name="N10040"></a><a name="Getting+Started"></a>
 <h2 class="boxed">Getting Started</h2>
 <div class="section">
 <p>
@@ -356,7 +359,7 @@ You can see that the Solr is running by loading <a href="http://localhost:8983/s
 
 
 
-<a name="N10077"></a><a name="Indexing+Data"></a>
+<a name="N10078"></a><a name="Indexing+Data"></a>
 <h2 class="boxed">Indexing Data</h2>
 <div class="section">
 <p>
@@ -391,7 +394,7 @@ Clicking the "Search" button should take you to the following URL...
 </p>
 <p>
 
-<a href="http://localhost:8983/solr/select/?q=solr&start=0&rows=10&indent=on">http://localhost:8983/solr/select/?q=solr&amp;start=0&amp;rows=10&amp;indent=on</a>
+<a href="http://localhost:8983/solr/select/?q=solr&amp;start=0&amp;rows=10&amp;indent=on">http://localhost:8983/solr/select/?q=solr&amp;start=0&amp;rows=10&amp;indent=on</a>
 
 </p>
 <p>
@@ -471,7 +474,7 @@ SimplePostTool: COMMITting Solr index changes..
 
 
 
-<a name="N100ED"></a><a name="Updating+Data"></a>
+<a name="N100EE"></a><a name="Updating+Data"></a>
 <h2 class="boxed">Updating Data</h2>
 <div class="section">
 <p>
@@ -503,7 +506,7 @@ Go ahead and edit the existing XML files to change some of the data, and re-run
 the <span class="codefrag">java -jar post.jar</span> command, you'll see your changes reflected
 in subsequent searches.
 </p>
-<a name="N1012C"></a><a name="Deleting+Data"></a>
+<a name="N1012D"></a><a name="Deleting+Data"></a>
 <h3 class="boxed">Deleting Data</h3>
 <p>You can delete data by POSTing a delete command to the update URL and specifying the value
       of the document's unique key field, or a query that matches multiple documents (be careful with that one!).  Since these commands
@@ -520,7 +523,7 @@ in subsequent searches.
 <p>Now re-execute the previous search and verify that no matching documents are found.  Also revisit the
     statistics page and observe the changes in both the UPDATE_HANDLERS section and the CORE section.</p>
 <p>Here is an example of using delete-by-query to delete anything with
-      <a href="http://localhost:8983/solr/select?q=name:DDR&fl=name">DDR</a> in the name:</p>
+      <a href="http://localhost:8983/solr/select?q=name:DDR&amp;fl=name">DDR</a> in the name:</p>
 <pre class="code">java -Ddata=args -jar post.jar "&lt;delete&gt;&lt;query&gt;name:DDR&lt;/query&gt;&lt;/delete&gt;"</pre>
 <p>Commit can be an expensive operation so it's best to make many changes to an index in a batch and
       then send the <span class="codefrag">commit</span> command at the end.  There is also an <span class="codefrag">optimize</span> command that does the same thing as <span class="codefrag">commit</span>,
@@ -532,7 +535,7 @@ in subsequent searches.
 </div>
 
 
-<a name="N1017B"></a><a name="Querying+Data"></a>
+<a name="N1017C"></a><a name="Querying+Data"></a>
 <h2 class="boxed">Querying Data</h2>
 <div class="section">
 <p>
@@ -544,26 +547,26 @@ in subsequent searches.
 <ul>
       
 <li>
-<a href="http://localhost:8983/solr/select/?indent=on&q=video&fl=name,id">q=video&amp;fl=name,id</a>       (return only name and id fields)   </li>
+<a href="http://localhost:8983/solr/select/?indent=on&amp;q=video&amp;fl=name,id">q=video&amp;fl=name,id</a>       (return only name and id fields)   </li>
       
 <li>
-<a href="http://localhost:8983/solr/select/?indent=on&q=video&fl=name,id,score">q=video&amp;fl=name,id,score</a>  (return relevancy score as well) </li>
+<a href="http://localhost:8983/solr/select/?indent=on&amp;q=video&amp;fl=name,id,score">q=video&amp;fl=name,id,score</a>  (return relevancy score as well) </li>
       
 <li>
-<a href="http://localhost:8983/solr/select/?indent=on&q=video&fl=*,score">q=video&amp;fl=*,score</a>        (return all stored fields, as well as relevancy score)  </li>
+<a href="http://localhost:8983/solr/select/?indent=on&amp;q=video&amp;fl=*,score">q=video&amp;fl=*,score</a>        (return all stored fields, as well as relevancy score)  </li>
       
 <li>
-<a href="http://localhost:8983/solr/select/?indent=on&q=video&sort=price desc&fl=name,id,price">q=video&amp;sort=price desc&amp;fl=name,id,price</a>  (add sort specification: sort by price descending) </li>
+<a href="http://localhost:8983/solr/select/?indent=on&amp;q=video&amp;sort=price desc&amp;fl=name,id,price">q=video&amp;sort=price desc&amp;fl=name,id,price</a>  (add sort specification: sort by price descending) </li>
       
 <li>
-<a href="http://localhost:8983/solr/select/?indent=on&q=video&wt=json">q=video&amp;wt=json</a> (return response in JSON format)  </li>
+<a href="http://localhost:8983/solr/select/?indent=on&amp;q=video&amp;wt=json">q=video&amp;wt=json</a> (return response in JSON format)  </li>
     
 </ul>
 <p>
     Solr provides a <a href="http://localhost:8983/solr/admin/form.jsp">query form</a> within the web admin interface
     that allows setting the various request parameters and is useful when testing or debugging queries.
   </p>
-<a name="N101B9"></a><a name="Sorting"></a>
+<a name="N101BA"></a><a name="Sorting"></a>
 <h3 class="boxed">Sorting</h3>
 <p>
       Solr provides a simple method to sort on one or more indexed fields.
@@ -572,15 +575,15 @@ in subsequent searches.
 <ul>
       
 <li>
-<a href="http://localhost:8983/solr/select/?indent=on&q=video&sort=price+desc">q=video&amp;sort=price desc</a>
+<a href="http://localhost:8983/solr/select/?indent=on&amp;q=video&amp;sort=price+desc">q=video&amp;sort=price desc</a>
 </li>
       
 <li>
-<a href="http://localhost:8983/solr/select/?indent=on&q=video&sort=price+asc">q=video&amp;sort=price asc</a>
+<a href="http://localhost:8983/solr/select/?indent=on&amp;q=video&amp;sort=price+asc">q=video&amp;sort=price asc</a>
 </li>
       
 <li>
-<a href="http://localhost:8983/solr/select/?indent=on&q=video&sort=inStock+asc,price+desc">q=video&amp;sort=inStock asc, price desc</a>
+<a href="http://localhost:8983/solr/select/?indent=on&amp;q=video&amp;sort=inStock+asc,price+desc">q=video&amp;sort=inStock asc, price desc</a>
 </li>
     
 </ul>
@@ -590,11 +593,11 @@ in subsequent searches.
 <ul>
       
 <li>
-<a href="http://localhost:8983/solr/select/?indent=on&q=video&sort=score+desc">q=video&amp;sort=score desc</a>
+<a href="http://localhost:8983/solr/select/?indent=on&amp;q=video&amp;sort=score+desc">q=video&amp;sort=score desc</a>
 </li>
       
 <li>
-<a href="http://localhost:8983/solr/select/?indent=on&q=video&sort=inStock+asc,score+desc">q=video&amp;sort=inStock asc, score desc</a>
+<a href="http://localhost:8983/solr/select/?indent=on&amp;q=video&amp;sort=inStock+asc,score+desc">q=video&amp;sort=inStock asc, score desc</a>
 </li>
     
 </ul>
@@ -604,7 +607,7 @@ in subsequent searches.
 <ul>
       
 <li>
-<a href="http://localhost:8983/solr/select/?indent=on&q=*:*&sort=div(popularity,add(price,1))+desc">q=video&amp;sort=div(popularity,add(price,1)) desc</a>
+<a href="http://localhost:8983/solr/select/?indent=on&amp;q=*:*&amp;sort=div(popularity,add(price,1))+desc">q=video&amp;sort=div(popularity,add(price,1)) desc</a>
 </li>
     
 </ul>
@@ -615,7 +618,7 @@ in subsequent searches.
 
 
 
-<a name="N101FD"></a><a name="Highlighting"></a>
+<a name="N101FE"></a><a name="Highlighting"></a>
 <h2 class="boxed">Highlighting</h2>
 <div class="section">
 <p>
@@ -631,7 +634,7 @@ in subsequent searches.
   </p>
 <p>
     
-<a href="http://localhost:8983/solr/select/?wt=json&indent=on&q=video+card&fl=name,id&hl=true&hl.fl=name,features">...&amp;q=video card&amp;fl=name,id&amp;hl=true&amp;hl.fl=name,features</a>
+<a href="http://localhost:8983/solr/select/?wt=json&amp;indent=on&amp;q=video+card&amp;fl=name,id&amp;hl=true&amp;hl.fl=name,features">...&amp;q=video card&amp;fl=name,id&amp;hl=true&amp;hl.fl=name,features</a>
   
 </p>
 <p>
@@ -642,7 +645,7 @@ in subsequent searches.
 
 
 
-<a name="N10226"></a><a name="Faceted+Search"></a>
+<a name="N10227"></a><a name="Faceted+Search"></a>
 <h2 class="boxed">Faceted Search</h2>
 <div class="section">
 <p>
@@ -656,7 +659,7 @@ in subsequent searches.
   </p>
 <p>
     
-<a href="http://localhost:8983/solr/select/?wt=json&indent=on&q=*:*&fl=name&facet=true&facet.field=cat">...&amp;q=*:*&amp;facet=true&amp;facet.field=cat</a>
+<a href="http://localhost:8983/solr/select/?wt=json&amp;indent=on&amp;q=*:*&amp;fl=name&amp;facet=true&amp;facet.field=cat">...&amp;q=*:*&amp;facet=true&amp;facet.field=cat</a>
   
 </p>
 <p>
@@ -669,7 +672,7 @@ in subsequent searches.
   </p>
 <p>
     
-<a href="http://localhost:8983/solr/select/?wt=json&indent=on&q=*:*&fl=name&facet=true&facet.field=cat&facet.field=inStock">...&amp;q=*:*&amp;facet=true&amp;facet.field=cat&amp;facet.field=inStock</a>
+<a href="http://localhost:8983/solr/select/?wt=json&amp;indent=on&amp;q=*:*&amp;fl=name&amp;facet=true&amp;facet.field=cat&amp;facet.field=inStock">...&amp;q=*:*&amp;facet=true&amp;facet.field=cat&amp;facet.field=inStock</a>
   
 </p>
 <p>
@@ -679,7 +682,7 @@ in subsequent searches.
   </p>
 <p>
     
-<a href="http://localhost:8983/solr/select/?wt=json&indent=on&q=ipod&fl=name&facet=true&facet.query=price:[0+TO+100]&facet.query=price:[100+TO+*]">...&amp;q=ipod&amp;facet=true&amp;facet.query=price:[0 TO 100]&amp;facet.query=price:[100 TO *]</a>
+<a href="http://localhost:8983/solr/select/?wt=json&amp;indent=on&amp;q=ipod&amp;fl=name&amp;facet=true&amp;facet.query=price:[0+TO+100]&amp;facet.query=price:[100+TO+*]">...&amp;q=ipod&amp;facet=true&amp;facet.query=price:[0 TO 100]&amp;facet.query=price:[100 TO *]</a>
   
 </p>
 <p>
@@ -687,7 +690,7 @@ in subsequent searches.
   </p>
 <p>
     
-<a href="http://localhost:8983/solr/select/?wt=json&indent=on&q=*:*&fl=name,manufacturedate_dt&facet=true&facet.date=manufacturedate_dt&facet.date.start=2004-01-01T00:00:00Z&facet.date.end=2010-01-01T00:00:00Z&facet.date.gap=%2b1YEAR">...&amp;q=*:*&amp;facet=true&amp;facet.date=manufacturedate_dt&amp;facet.date.start=2004-01-01T00:00:00Z&amp;facet.date.end=2010-01-01T00:00:00Z&amp;facet.date.gap=+1YEAR</a>
+<a href="http://localhost:8983/solr/select/?wt=json&amp;indent=on&amp;q=*:*&amp;fl=name,manufacturedate_dt&amp;facet=true&amp;facet.date=manufacturedate_dt&amp;facet.date.start=2004-01-01T00:00:00Z&amp;facet.date.end=2010-01-01T00:00:00Z&amp;facet.date.gap=%2b1YEAR">...&amp;q=*:*&amp;facet=true&amp;facet.date=manufacturedate_dt&amp;facet.date.start=2004-01-01T00:00:00Z&amp;facet.date.end=2010-01-01T00:00:00Z&amp;facet.date.gap=+1YEAR</a>
   
 </p>
 <p>
@@ -701,7 +704,7 @@ in subsequent searches.
 
 
 
-<a name="N10277"></a><a name="Search+UI"></a>
+<a name="N10278"></a><a name="Search+UI"></a>
 <h2 class="boxed">Search UI</h2>
 <div class="section">
 <p>
@@ -719,7 +722,7 @@ in subsequent searches.
 
 
 
-<a name="N1028A"></a><a name="Text+Analysis"></a>
+<a name="N1028B"></a><a name="Text+Analysis"></a>
 <h2 class="boxed">Text Analysis</h2>
 <div class="section">
 <p>
@@ -747,23 +750,23 @@ in subsequent searches.
 <ul>
     
 <li>A search for
-       <a href="http://localhost:8983/solr/select/?indent=on&q=power-shot&fl=name">power-shot</a>
+       <a href="http://localhost:8983/solr/select/?indent=on&amp;q=power-shot&amp;fl=name">power-shot</a>
        matches <span class="codefrag">PowerShot</span>, and
-      <a href="http://localhost:8983/solr/select/?indent=on&q=adata&fl=name">adata</a>
+      <a href="http://localhost:8983/solr/select/?indent=on&amp;q=adata&amp;fl=name">adata</a>
       matches <span class="codefrag">A-DATA</span> due to the use of <span class="codefrag">WordDelimiterFilter</span> and <span class="codefrag">LowerCaseFilter</span>.
     </li>
 
     
 <li>A search for
-      <a href="http://localhost:8983/solr/select/?indent=on&q=features:recharging&fl=name,features">features:recharging</a>
+      <a href="http://localhost:8983/solr/select/?indent=on&amp;q=features:recharging&amp;fl=name,features">features:recharging</a>
        matches <span class="codefrag">Rechargeable</span> due to stemming with the <span class="codefrag">EnglishPorterFilter</span>.
     </li>
 
     
 <li>A search for
-       <a href="http://localhost:8983/solr/select/?indent=on&q=%221 gigabyte%22&fl=name">"1 gigabyte"</a>
+       <a href="http://localhost:8983/solr/select/?indent=on&amp;q=%221 gigabyte%22&amp;fl=name">"1 gigabyte"</a>
        matches things with <span class="codefrag">GB</span>, and the misspelled
-      <a href="http://localhost:8983/solr/select/?indent=on&q=pixima&fl=name">pixima</a>
+      <a href="http://localhost:8983/solr/select/?indent=on&amp;q=pixima&amp;fl=name">pixima</a>
        matches <span class="codefrag">Pixma</span> due to use of a <span class="codefrag">SynonymFilter</span>.
     </li>
 
@@ -772,7 +775,7 @@ in subsequent searches.
 <p>A full description of the analysis components, Analyzers, Tokenizers, and TokenFilters
     available for use is <a href="http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters">here</a>.
   </p>
-<a name="N1030A"></a><a name="Analysis+Debugging"></a>
+<a name="N1030B"></a><a name="Analysis+Debugging"></a>
 <h3 class="boxed">Analysis Debugging</h3>
 <p>There is a handy <a href="http://localhost:8983/solr/admin/analysis.jsp">analysis</a>
       debugging page where you can see how a text value is broken down into words,
@@ -780,28 +783,28 @@ in subsequent searches.
     </p>
 <p>
       
-<a href="http://localhost:8983/solr/admin/analysis.jsp?name=name&val=Canon+Power-Shot+SD500">This</a>
+<a href="http://localhost:8983/solr/admin/analysis.jsp?name=name&amp;val=Canon+Power-Shot+SD500">This</a>
       shows how "<span class="codefrag">Canon Power-Shot SD500</span>" would be indexed as a value in the name field.  Each row of
       the table shows the resulting tokens after having passed through the next <span class="codefrag">TokenFilter</span> in the analyzer for the <span class="codefrag">name</span> field.
       Notice how both <span class="codefrag">powershot</span> and <span class="codefrag">power</span>, <span class="codefrag">shot</span> are indexed.  Tokens generated at the same position
       are shown in the same column, in this case <span class="codefrag">shot</span> and <span class="codefrag">powershot</span>.
     </p>
-<p>Selecting <a href="http://localhost:8983/solr/admin/analysis.jsp?name=name&verbose=on&val=Canon+Power-Shot+SD500">verbose output</a>
+<p>Selecting <a href="http://localhost:8983/solr/admin/analysis.jsp?name=name&amp;verbose=on&amp;val=Canon+Power-Shot+SD500">verbose output</a>
     will show more details, such as the name of each analyzer component in the chain, token positions, and the start and end positions
     of the token in the original text.
     </p>
-<p>Selecting <a href="http://localhost:8983/solr/admin/analysis.jsp?name=name&highlight=on&val=Canon+Power-Shot+SD500&qval=Powershot sd-500">highlight matches</a>
+<p>Selecting <a href="http://localhost:8983/solr/admin/analysis.jsp?name=name&amp;highlight=on&amp;val=Canon+Power-Shot+SD500&amp;qval=Powershot sd-500">highlight matches</a>
     when both index and query values are provided will take the resulting terms from the query value and highlight
     all matches in the index value analysis.
     </p>
 <p>
-<a href="http://localhost:8983/solr/admin/analysis.jsp?name=text&highlight=on&val=Four+score+and+seven+years+ago+our+fathers+brought+forth+on+this+continent+a+new+nation%2C+conceived+in+liberty+and+dedicated+to+the+proposition+that+all+men+are+created+equal.+&qval=liberties+and+equality">Here</a>
+<a href="http://localhost:8983/solr/admin/analysis.jsp?name=text&amp;highlight=on&amp;val=Four+score+and+seven+years+ago+our+fathers+brought+forth+on+this+continent+a+new+nation%2C+conceived+in+liberty+and+dedicated+to+the+proposition+that+all+men+are+created+equal.+&amp;qval=liberties+and+equality">Here</a>
     is an example of stemming and stop-words at work.
     </p>
 </div>
 
 
-<a name="N1034C"></a><a name="Conclusion"></a>
+<a name="N1034D"></a><a name="Conclusion"></a>
 <h2 class="boxed">Conclusion</h2>
 <div class="section">
 <p>
@@ -859,5 +862,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+        </script>
 </body>
 </html>
diff --git a/solr/site/tutorial.pdf b/solr/site/tutorial.pdf
index 8918d10d039..84df7a5aee9 100755
Binary files a/solr/site/tutorial.pdf and b/solr/site/tutorial.pdf differ
diff --git a/solr/site/version_control.html b/solr/site/version_control.html
index 64774408d77..ca835b2eab3 100755
--- a/solr/site/version_control.html
+++ b/solr/site/version_control.html
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-version" content="0.9">
 <meta name="Forrest-skin-name" content="lucene">
 <title>Solr Version Control System</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -109,6 +109,9 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="http://lucene.apache.org/java/docs/whoweare.html" title="Lucene/Solr Committers">Who We Are</a>
 </div>
+<div class="menuitem">
+<a href="http://lucene.apache.org/privacy.html">Privacy Policy</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
 <div id="menu_1.2" class="menuitemgroup">
@@ -238,7 +241,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
   
     
-<a name="N1000D"></a><a name="Overview"></a>
+<a name="N1000E"></a><a name="Overview"></a>
 <h2 class="boxed">Overview</h2>
 <div class="section">
 <p>
@@ -251,7 +254,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
     
     
-<a name="N1002F"></a><a name="Web+Access+%28read-only%29"></a>
+<a name="N10030"></a><a name="Web+Access+%28read-only%29"></a>
 <h2 class="boxed">Web Access (read-only)</h2>
 <div class="section">
 <p>
@@ -262,7 +265,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
     
     
-<a name="N1003D"></a><a name="Anonymous+Access+%28read-only%29"></a>
+<a name="N1003E"></a><a name="Anonymous+Access+%28read-only%29"></a>
 <h2 class="boxed">Anonymous Access (read-only)</h2>
 <div class="section">
 <p>
@@ -274,7 +277,7 @@ document.write("Last Published: " + document.lastModified);
 </div>
     
     
-<a name="N1004F"></a><a name="Committer+Access+%28read-write%29"></a>
+<a name="N10050"></a><a name="Committer+Access+%28read-write%29"></a>
 <h2 class="boxed">Committer Access (read-write)</h2>
 <div class="section">
 <p>
@@ -309,5 +312,18 @@ document.write("Last Published: " + document.lastModified);
     |end bottomstrip
     +-->
 </div>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-94576-12']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+        </script>
 </body>
 </html>
diff --git a/solr/site/version_control.pdf b/solr/site/version_control.pdf
index e917b70899d..97eb0ff972c 100755
Binary files a/solr/site/version_control.pdf and b/solr/site/version_control.pdf differ