diff --git a/reference/solr/solrclient/adddocument.xml b/reference/solr/solrclient/adddocument.xml
index 1a169ffbb3..c3362fa1ba 100644
--- a/reference/solr/solrclient/adddocument.xml
+++ b/reference/solr/solrclient/adddocument.xml
@@ -11,9 +11,9 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>SolrUpdateResponse</type><methodname>SolrClient::addDocument</methodname>
-   <methodparam><type>SolrInputDocument</type><parameter role="reference">doc</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>allowDups</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>commitWithin</parameter></methodparam>
+   <methodparam><type>SolrInputDocument</type><parameter>doc</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>allowDups</parameter><initializer>false</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>commitWithin</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    This method adds a document to the index.
@@ -37,7 +37,7 @@
      <term><parameter>allowDups</parameter></term>
      <listitem>
       <para>
-       If &false; duplicates will be overwritten. Default value is &false;
+       If &false; duplicates will be overwritten.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/solr/solrclient/adddocuments.xml b/reference/solr/solrclient/adddocuments.xml
index 3d6a392889..f40dfd9562 100644
--- a/reference/solr/solrclient/adddocuments.xml
+++ b/reference/solr/solrclient/adddocuments.xml
@@ -11,9 +11,9 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>void</type><methodname>SolrClient::addDocuments</methodname>
-   <methodparam><type>array</type><parameter role="reference">docs</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>allowDups</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>commitWithin</parameter></methodparam>
+   <methodparam><type>array</type><parameter>docs</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>allowDups</parameter><initializer>false</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>commitWithin</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Adds a collection of documents to the index.
@@ -37,7 +37,7 @@
      <term><parameter>allowDups</parameter></term>
      <listitem>
       <para>
-       If &false; duplicates will be overwritten. Default value is &false;
+       If &false; duplicates will be overwritten.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/solr/solrclient/commit.xml b/reference/solr/solrclient/commit.xml
index 095056a2f3..8335b86b6e 100644
--- a/reference/solr/solrclient/commit.xml
+++ b/reference/solr/solrclient/commit.xml
@@ -11,9 +11,9 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>SolrUpdateResponse</type><methodname>SolrClient::commit</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>maxSegments</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>waitFlush</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>waitSearcher</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>maxSegments</parameter><initializer>"1"</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>waitFlush</parameter><initializer>true</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>waitSearcher</parameter><initializer>true</initializer></methodparam>
   </methodsynopsis>
   <para>
    This method finalizes all add/deletes made to the index.
diff --git a/reference/solr/solrclient/optimize.xml b/reference/solr/solrclient/optimize.xml
index 051d302e41..e20ac2d50e 100644
--- a/reference/solr/solrclient/optimize.xml
+++ b/reference/solr/solrclient/optimize.xml
@@ -11,9 +11,9 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>SolrUpdateResponse</type><methodname>SolrClient::optimize</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>maxSegments</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>waitFlush</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>waitSearcher</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>maxSegments</parameter><initializer>"1"</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>waitFlush</parameter><initializer>true</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>waitSearcher</parameter><initializer>true</initializer></methodparam>
   </methodsynopsis>
   <para>
    Defragments the index for faster search performance.
diff --git a/reference/solr/solrclient/query.xml b/reference/solr/solrclient/query.xml
index 14fd75f5cd..f5c9ed22f1 100644
--- a/reference/solr/solrclient/query.xml
+++ b/reference/solr/solrclient/query.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>SolrQueryResponse</type><methodname>SolrClient::query</methodname>
-   <methodparam><type>SolrParams</type><parameter role="reference">query</parameter></methodparam>
+   <methodparam><type>SolrParams</type><parameter>query</parameter></methodparam>
   </methodsynopsis>
   <para>
    Sends a query to the server.
diff --git a/reference/solr/solrdocument/merge.xml b/reference/solr/solrdocument/merge.xml
index d40a1a1e79..bb55515c4b 100644
--- a/reference/solr/solrdocument/merge.xml
+++ b/reference/solr/solrdocument/merge.xml
@@ -10,9 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrDocument::merge</methodname>
-   <methodparam><type>SolrDocument</type><parameter role="reference">sourceDoc</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::merge</methodname>
+   <methodparam><type>SolrDocument</type><parameter>sourceDoc</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter><initializer>true</initializer></methodparam>
   </methodsynopsis>
   <para>
    Merges source to the current SolrDocument.
diff --git a/reference/solr/solrdocument/set.xml b/reference/solr/solrdocument/set.xml
index d1da93b3ae..d4193185f2 100644
--- a/reference/solr/solrdocument/set.xml
+++ b/reference/solr/solrdocument/set.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrDocument::__set</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::__set</methodname>
    <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
    <methodparam><type>string</type><parameter>fieldValue</parameter></methodparam>
   </methodsynopsis>
@@ -47,7 +47,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   No return values.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/solr/solrdocument/sort.xml b/reference/solr/solrdocument/sort.xml
index 55fb6974b4..594221ea90 100644
--- a/reference/solr/solrdocument/sort.xml
+++ b/reference/solr/solrdocument/sort.xml
@@ -10,9 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrDocument::sort</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::sort</methodname>
    <methodparam><type>int</type><parameter>sortOrderBy</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sortDirection</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>sortDirection</parameter><initializer>SolrDocument::SORT_ASC</initializer></methodparam>
   </methodsynopsis>
   <para>
  <![CDATA[
diff --git a/reference/solr/solrdocument/unset.xml b/reference/solr/solrdocument/unset.xml
index 1daa443920..83df0b2da6 100644
--- a/reference/solr/solrdocument/unset.xml
+++ b/reference/solr/solrdocument/unset.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrDocument::__unset</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::__unset</methodname>
    <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   None.
+   &return.success;
   </para>
  </refsect1>
 
diff --git a/reference/solr/solrinputdocument/addfield.xml b/reference/solr/solrinputdocument/addfield.xml
index c926b4d278..59a4403767 100644
--- a/reference/solr/solrinputdocument/addfield.xml
+++ b/reference/solr/solrinputdocument/addfield.xml
@@ -13,7 +13,7 @@
    <modifier>public</modifier> <type>bool</type><methodname>SolrInputDocument::addField</methodname>
    <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
    <methodparam><type>string</type><parameter>fieldValue</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>fieldBoostValue</parameter></methodparam>
+   <methodparam choice="opt"><type>float</type><parameter>fieldBoostValue</parameter><initializer>0.0</initializer></methodparam>
   </methodsynopsis>
   <para>
    For multi-value fields, if a valid boost value is specified, the specified value will be multiplied by the current boost value for this field.
diff --git a/reference/solr/solrinputdocument/merge.xml b/reference/solr/solrinputdocument/merge.xml
index 4cc1524629..62cc2d17ce 100644
--- a/reference/solr/solrinputdocument/merge.xml
+++ b/reference/solr/solrinputdocument/merge.xml
@@ -11,8 +11,8 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>SolrInputDocument::merge</methodname>
-   <methodparam><type>SolrInputDocument</type><parameter role="reference">sourceDoc</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter></methodparam>
+   <methodparam><type>SolrInputDocument</type><parameter>sourceDoc</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter><initializer>true</initializer></methodparam>
   </methodsynopsis>
   <para>
    Merges one input document into another.
diff --git a/reference/solr/solrinputdocument/sort.xml b/reference/solr/solrinputdocument/sort.xml
index f8345d3d54..df23ee6f6b 100644
--- a/reference/solr/solrinputdocument/sort.xml
+++ b/reference/solr/solrinputdocument/sort.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>SolrInputDocument::sort</methodname>
    <methodparam><type>int</type><parameter>sortOrderBy</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sortDirection</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>sortDirection</parameter><initializer>SolrInputDocument::SORT_ASC</initializer></methodparam>
   </methodsynopsis>
   <para>
 <![CDATA[
diff --git a/reference/solr/solrinputdocument/toarray.xml b/reference/solr/solrinputdocument/toarray.xml
index cb3d08d0d6..023cbeab32 100644
--- a/reference/solr/solrinputdocument/toarray.xml
+++ b/reference/solr/solrinputdocument/toarray.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrInputDocument::toArray</methodname>
+   <modifier>public</modifier> <type>array</type><methodname>SolrInputDocument::toArray</methodname>
    <void />
   </methodsynopsis>
   <para>
diff --git a/reference/solr/solrparams/getparam.xml b/reference/solr/solrparams/getparam.xml
index 6c1b733dcd..73f20731ee 100644
--- a/reference/solr/solrparams/getparam.xml
+++ b/reference/solr/solrparams/getparam.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>SolrParams::getParam</methodname>
-   <methodparam><type>string</type><parameter>param_name</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>param_name</parameter></methodparam>
   </methodsynopsis>
   <para>
   Returns a parameter with name param_name
diff --git a/reference/solr/solrparams/tostring.xml b/reference/solr/solrparams/tostring.xml
index 17e930656c..18703b2dae 100644
--- a/reference/solr/solrparams/tostring.xml
+++ b/reference/solr/solrparams/tostring.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>SolrParams::toString</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>url_encode</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>url_encode</parameter><initializer>false</initializer></methodparam>
   </methodsynopsis>
   <para>
    Returns all the name-value pair parameters in the object
diff --git a/reference/solr/solrquery/addsortfield.xml b/reference/solr/solrquery/addsortfield.xml
index 07784f5770..14619dcdd1 100644
--- a/reference/solr/solrquery/addsortfield.xml
+++ b/reference/solr/solrquery/addsortfield.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <modifier>public</modifier><type>SolrQuery</type><methodname>SolrQuery::addSortField</methodname>
    <methodparam><type>string</type><parameter>field</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>order</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>order</parameter><initializer>SolrQuery::ORDER_DESC</initializer></methodparam>
   </methodsynopsis>
   <para>
    Used to control how the results should be sorted.
diff --git a/reference/solr/solrquery/getfacetdateother.xml b/reference/solr/solrquery/getfacetdateother.xml
index daa60dc3e8..6ca48db04d 100644
--- a/reference/solr/solrquery/getfacetdateother.xml
+++ b/reference/solr/solrquery/getfacetdateother.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getFacetDateOther</methodname>
+   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getFacetDateOther</methodname>
    <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/solr/solrquery/setfacetdatehardend.xml b/reference/solr/solrquery/setfacetdatehardend.xml
index 7ed1dae162..f1d056ec80 100644
--- a/reference/solr/solrquery/setfacetdatehardend.xml
+++ b/reference/solr/solrquery/setfacetdatehardend.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier><type>SolrQuery</type><methodname>SolrQuery::setFacetDateHardEnd</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
+   <methodparam><type>bool</type><parameter>value</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/solr/solrresponse/setparsemode.xml b/reference/solr/solrresponse/setparsemode.xml
index a67788852a..671a062bc3 100644
--- a/reference/solr/solrresponse/setparsemode.xml
+++ b/reference/solr/solrresponse/setparsemode.xml
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>SolrResponse::setParseMode</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>parser_mode</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>parser_mode</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    Sets the parse mode.
diff --git a/reference/solr/solrutils/digestxmlresponse.xml b/reference/solr/solrutils/digestxmlresponse.xml
index 933fe1701f..931410ce6a 100644
--- a/reference/solr/solrutils/digestxmlresponse.xml
+++ b/reference/solr/solrutils/digestxmlresponse.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>SolrObject</type><methodname>SolrUtils::digestXmlResponse</methodname>
    <methodparam><type>string</type><parameter>xmlresponse</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>parse_mode</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>parse_mode</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    This method parses an response XML string from the Apache Solr server into a SolrObject. It throws a SolrException if there was an error.