Merge "servers => serves"

diff --combined includes/DefaultSettings.php
index 4d971db,b30a068..5d051d7
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -973,7 -973,7 +973,7 @@@ $wgUseImageResize = true
  $wgEnableAutoRotation = null;
  
  /**
-  * Internal name of virus scanner. This servers as a key to the
+  * Internal name of virus scanner. This serves as a key to the
   * $wgAntivirusSetup array. Set this to NULL to disable virus scanning. If not
   * null, every file uploaded will be scanned for viruses.
   */
@@@ -3204,7 -3204,7 +3204,7 @@@ $wgInterwikiFallbackSite = 'wiki'
  /** @} */ # end of Interwiki caching settings.
  
  /**
 - * If local interwikies are set up which allow redirects,
 + * If local interwikis are set up which allow redirects,
   * set this regexp to restrict URLs which will be displayed
   * as 'redirected from' links.
   *