Wikimedia Bugzilla is closed!

includes/DefaultSettings.php has two different defaults for $wgPasswordSender:

a) (line 520 in 1.16):

/**
 * Password reminder email address
 * The address we should use as sender when a user is requesting his password
 * Default to apache@SERVER_NAME
 */
$wgPasswordSender   = 'MediaWiki Mail <apache@' . $wgServerName . '>';

Note: this was changed in SVN trunk r76234 to:
$wgPasswordSender = 'apache@' . $serverName;

b) (line 1720 in 1.16):
/** For email notification on page changes */
$wgPasswordSender = $wgEmergencyContact;

This is highly confusing for people who read DefaultSettings.php. Even http://www.mediawiki.org/wiki/Manual:$wgPasswordSender 
has a section saying so ;-)

Please remove the first setting (it's always overriddenAFAIK) to remove that confusion.

Bonus points if you move the second/remaining one near the definition of $wgEmergencyContact so that it's easyer to see what the actual default value 
is ;-)