Merge commit '5ec5bf62' into develop

examples/4.3-extending-usage.php

@@ -24,7 +24,7 @@ class ProductQuery extends Solarium_Query_Select{
 
 }
 
-// This query inherits all of the query params of it's parent (using parent::_init) and adds some more
+// This query inherits all of the query params of its parent (using parent::_init) and adds some more
 // Ofcourse it could also alter or remove settings
 class ProductPriceLimitedQuery extends ProductQuery{
 

examples/7.1-plugin-loadbalancer.php

@@ -25,7 +25,7 @@ for($i=1; $i<=8; $i++) {
     echo 'Server: ' . $loadbalancer->getLastServerKey() .'<hr/>';
 }
 
-// force a server for a query (normally solr 3 is extremely unlikely based on it's weight)
+// Force a server for a query (normally solr 3 is extremely unlikely based on its weight).
 $loadbalancer->setForcedServerForNextQuery('solr3');
 $resultset = $client->select($query);
 echo 'Query execution with server forced to solr3<br/>';
@@ -44,4 +44,4 @@ $client->ping($query);
 echo 'Non-loadbalanced ping query, should not display a loadbalancing server:<br/>';
 echo 'Ping server: ' . $loadbalancer->getLastServerKey() .'<hr/>';
 
-htmlFooter();
+htmlFooter();
\ No newline at end of file

library/Solarium/Configurable.php

@@ -79,8 +79,8 @@ class Solarium_Configurable
     /**
      * Set options
      *
-     * If $options is an object it will be converted into an array by called
-     * it's toArray method. This is compatible with the Zend_Config classes in
+     * If $options is an object, it will be converted into an array by calling
+     * its toArray method. This is compatible with the Zend_Config classes in
      * Zend Framework, but can also easily be implemented in any other object.
      *
      * @throws Solarium_Exception
@@ -175,4 +175,4 @@ class Solarium_Configurable
         return $this->_options;
     }
 
-}
+}
\ No newline at end of file

library/Solarium/Plugin/CustomizeRequest.php

@@ -183,7 +183,7 @@ class Solarium_Plugin_CustomizeRequest extends Solarium_Plugin_Abstract
     /**
      * Remove a single Customization
      *
-     * You can remove a Customization by passing it's key, or by passing the Customization instance
+     * You can remove a Customization by passing its key, or by passing the Customization instance.
      *
      * @param string|Solarium_Plugin_CustomizeRequest_Customization $customization
      * @return Solarium_Plugin_CustomizeRequest Provides fluent interface
@@ -262,4 +262,4 @@ class Solarium_Plugin_CustomizeRequest extends Solarium_Plugin_Abstract
         }
     }
 
-}
+}
\ No newline at end of file

library/Solarium/Plugin/Loadbalancer.php

@@ -99,8 +99,8 @@ class Solarium_Plugin_Loadbalancer extends Solarium_Plugin_Abstract
     /**
      * Presets of the client adapter
      *
-     * These settings are used to restore the adapter to it's original status for queries
-     * that cannot be loadbalanced (for instance update queries that need to go to the master)
+     * These settings are used to restore the adapter to its original status for queries
+     * that cannot be loadbalanced (for instance, update queries that need to go to the master)
      *
      * @var array
      */
@@ -540,4 +540,4 @@ class Solarium_Plugin_Loadbalancer extends Solarium_Plugin_Abstract
         return $this->_randomizer;
     }
 
-}
+}
\ No newline at end of file

library/Solarium/Query/Select.php

@@ -707,7 +707,7 @@ class Solarium_Query_Select extends Solarium_Query
     /**
      * Remove a single filterquery
      *
-     * You can remove a filterquery by passing it's key, or by passing the filterquery instance
+     * You can remove a filterquery by passing its key, or by passing the filterquery instance
      *
      * @param string|Solarium_Query_Select_FilterQuery $filterQuery
      * @return Solarium_Query_Select Provides fluent interface
@@ -838,7 +838,7 @@ class Solarium_Query_Select extends Solarium_Query
     /**
      * Remove a component instance
      *
-     * You can remove a component by passing it's key or the component instance
+     * You can remove a component by passing its key or the component instance.
      *
      * @param string|Solarium_Query_Select_Component $component
      * @return Solarium_Query_Select Provides fluent interface

library/Solarium/Query/Select/Component/Facet/MultiQuery.php

@@ -192,7 +192,7 @@ class Solarium_Query_Select_Component_Facet_MultiQuery extends Solarium_Query_Se
     /**
      * Remove a single facetquery
      *
-     * You can remove a facetquery by passing it's key or the facetquery instance
+     * You can remove a facetquery by passing its key or the facetquery instance.
      *
      * @param string|Solarium_Query_Select_Component_Facet_Query $query
      * @return Solarium_Query_Select_Component_Facet_MultiQuery Provides fluent interface
@@ -297,4 +297,4 @@ class Solarium_Query_Select_Component_Facet_MultiQuery extends Solarium_Query_Se
         return parent::clearExcludes();
     }
 
-}
+}
\ No newline at end of file

library/Solarium/Query/Select/Component/FacetSet.php

@@ -326,7 +326,7 @@ class Solarium_Query_Select_Component_FacetSet extends Solarium_Query_Select_Com
     /**
      * Remove a single facet
      *
-     * You can remove a facet by passing it's key or the facet instance
+     * You can remove a facet by passing its key or the facet instance
      *
      * @param string|Solarium_Query_Select_Component_Facet $facet
      * @return Solarium_Query Provides fluent interface

library/Solarium/Query/Select/Component/Stats.php

@@ -200,7 +200,7 @@ class Solarium_Query_Select_Component_Stats extends Solarium_Query_Select_Compon
     /**
      * Remove a single field
      *
-     * You can remove a field by passing it's key, or by passing the field instance
+     * You can remove a field by passing its key, or by passing the field instance
      *
      * @param string|Solarium_Query_Select_Component_Stats_Field $field
      * @return Solarium_Query_Select_Component_Stats Provides fluent interface

library/Solarium/Query/Update.php

@@ -199,7 +199,7 @@ class Solarium_Query_Update extends Solarium_Query
     /**
      * Remove a command
      *
-     * You can remove a command by passing it's key or by passing the command instance
+     * You can remove a command by passing its key or by passing the command instance.
      *
      * @param string|Solarium_Query_Update_Command $command
      * @return Solarium_Query_Update Provides fluent interface
@@ -391,7 +391,7 @@ class Solarium_Query_Update extends Solarium_Query
     * Set a custom document class for use in the createDocument method
     *
     * This class should extend Solarium_Document_ReadWrite or
-    * at least be compatible with it's interface
+    * at least be compatible with its interface.
     *
     * @param string $value classname
     * @return Solarium_Query
@@ -432,4 +432,4 @@ class Solarium_Query_Update extends Solarium_Query
         return new $class($fields, $boosts);
     }
 
-}
+}
\ No newline at end of file

library/Solarium/Result/Select/Facet/Field.php

@@ -40,7 +40,7 @@
  * Select field facet result
  *
  * A field facet will usually return a dataset of multiple rows, in each row a
- * value and it's count. You can access the values as an array using
+ * value and its count. You can access the values as an array using
  * {@link getValues()} or iterate this object.
  *
  * @package Solarium

library/Solarium/Result/Select/Facet/MultiQuery.php

@@ -40,7 +40,7 @@
  * Select multiquery facet result
  *
  * A multiquery facet will usually return a dataset of multiple rows, in each
- * row a query key and it's count. You can access the values as an array using
+ * row a query key and its count. You can access the values as an array using
  * {@link getValues()} or iterate this object.
  *
  * @package Solarium

library/Solarium/Result/Select/Facet/Range.php

@@ -40,7 +40,7 @@
  * Select range facet result
  *
  * A multiquery facet will usually return a dataset of multiple count, in each
- * row a range as key and it's count. You can access the values as an array using
+ * row a range as key and its count. You can access the values as an array using
  * {@link getValues()} or iterate this object.
  *
  * The extra counts 'before', 'between' and 'after' are only available if the