diff --git a/reference/solr/solrclient/setservlet.xml b/reference/solr/solrclient/setservlet.xml
index 38d9638ba8..3e527979a8 100644
--- a/reference/solr/solrclient/setservlet.xml
+++ b/reference/solr/solrclient/setservlet.xml
@@ -54,7 +54,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrdocument/addfield.xml b/reference/solr/solrdocument/addfield.xml
index 13ce7511fc..cf3408a39a 100644
--- a/reference/solr/solrdocument/addfield.xml
+++ b/reference/solr/solrdocument/addfield.xml
@@ -47,7 +47,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrdocument/clear.xml b/reference/solr/solrdocument/clear.xml
index ed306481b9..095b3ce5d6 100644
--- a/reference/solr/solrdocument/clear.xml
+++ b/reference/solr/solrdocument/clear.xml
@@ -27,7 +27,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrdocument/deletefield.xml b/reference/solr/solrdocument/deletefield.xml
index e308cf1bb4..b0184edfde 100644
--- a/reference/solr/solrdocument/deletefield.xml
+++ b/reference/solr/solrdocument/deletefield.xml
@@ -40,7 +40,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrdocument/isset.xml b/reference/solr/solrdocument/isset.xml
index fc47b09c88..014f8cec3a 100644
--- a/reference/solr/solrdocument/isset.xml
+++ b/reference/solr/solrdocument/isset.xml
@@ -40,7 +40,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrdocument/merge.xml b/reference/solr/solrdocument/merge.xml
index 75e08b428d..d40a1a1e79 100644
--- a/reference/solr/solrdocument/merge.xml
+++ b/reference/solr/solrdocument/merge.xml
@@ -47,7 +47,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrdocument/offsetexists.xml b/reference/solr/solrdocument/offsetexists.xml
index 89d4d3a86d..6a3fb405f6 100644
--- a/reference/solr/solrdocument/offsetexists.xml
+++ b/reference/solr/solrdocument/offsetexists.xml
@@ -38,7 +38,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrdocument/offsetset.xml b/reference/solr/solrdocument/offsetset.xml
index 79d88fada9..04f0a6a29b 100644
--- a/reference/solr/solrdocument/offsetset.xml
+++ b/reference/solr/solrdocument/offsetset.xml
@@ -47,7 +47,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrdocument/reset.xml b/reference/solr/solrdocument/reset.xml
index 7f85d87d1a..93b175edf7 100644
--- a/reference/solr/solrdocument/reset.xml
+++ b/reference/solr/solrdocument/reset.xml
@@ -29,7 +29,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrdocument/sort.xml b/reference/solr/solrdocument/sort.xml
index dfc0adaa1c..55fb6974b4 100644
--- a/reference/solr/solrdocument/sort.xml
+++ b/reference/solr/solrdocument/sort.xml
@@ -64,7 +64,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrinputdocument/addfield.xml b/reference/solr/solrinputdocument/addfield.xml
index eeaf333f08..c926b4d278 100644
--- a/reference/solr/solrinputdocument/addfield.xml
+++ b/reference/solr/solrinputdocument/addfield.xml
@@ -56,7 +56,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrinputdocument/clear.xml b/reference/solr/solrinputdocument/clear.xml
index 52f62c91c5..a59b5fd8a3 100644
--- a/reference/solr/solrinputdocument/clear.xml
+++ b/reference/solr/solrinputdocument/clear.xml
@@ -27,7 +27,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrinputdocument/deletefield.xml b/reference/solr/solrinputdocument/deletefield.xml
index a3c4f91e34..3b996f38e4 100644
--- a/reference/solr/solrinputdocument/deletefield.xml
+++ b/reference/solr/solrinputdocument/deletefield.xml
@@ -38,7 +38,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrinputdocument/merge.xml b/reference/solr/solrinputdocument/merge.xml
index 6369a263c0..4cc1524629 100644
--- a/reference/solr/solrinputdocument/merge.xml
+++ b/reference/solr/solrinputdocument/merge.xml
@@ -47,7 +47,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure. In the future, this will be modified to return the number of fields in the new document.
+ &return.success; In the future, this will be modified to return the number of fields in the new document.
diff --git a/reference/solr/solrinputdocument/reset.xml b/reference/solr/solrinputdocument/reset.xml
index 8ca9c018b1..47f3412889 100644
--- a/reference/solr/solrinputdocument/reset.xml
+++ b/reference/solr/solrinputdocument/reset.xml
@@ -29,7 +29,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrinputdocument/setboost.xml b/reference/solr/solrinputdocument/setboost.xml
index ef52151b09..d07c63c5f3 100644
--- a/reference/solr/solrinputdocument/setboost.xml
+++ b/reference/solr/solrinputdocument/setboost.xml
@@ -38,7 +38,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrinputdocument/sort.xml b/reference/solr/solrinputdocument/sort.xml
index d20dc19d35..f8345d3d54 100644
--- a/reference/solr/solrinputdocument/sort.xml
+++ b/reference/solr/solrinputdocument/sort.xml
@@ -67,7 +67,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrobject/offsetexists.xml b/reference/solr/solrobject/offsetexists.xml
index 9e4c0ee72c..aafcf862f8 100644
--- a/reference/solr/solrobject/offsetexists.xml
+++ b/reference/solr/solrobject/offsetexists.xml
@@ -38,7 +38,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrobject/offsetunset.xml b/reference/solr/solrobject/offsetunset.xml
index c893743e45..a64dc1d6da 100644
--- a/reference/solr/solrobject/offsetunset.xml
+++ b/reference/solr/solrobject/offsetunset.xml
@@ -38,7 +38,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;
diff --git a/reference/solr/solrresponse/setparsemode.xml b/reference/solr/solrresponse/setparsemode.xml
index 7e976a443f..90a9450aa2 100644
--- a/reference/solr/solrresponse/setparsemode.xml
+++ b/reference/solr/solrresponse/setparsemode.xml
@@ -38,7 +38,7 @@
&reftitle.returnvalues;
- Returns &true; on success and &false; on failure.
+ &return.success;