Merge "Update documentation for log related classes"

diff --cc includes/logging/LogEntry.php
Simple merge

diff --cc includes/logging/LogEventsList.php
index d316c5d,d018b3c..c069fdb
--- 1/includes/logging/LogEventsList.php
--- 2/includes/logging/LogEventsList.php
+++ b/includes/logging/LogEventsList.php
@@@ -60,10 -61,9 +61,10 @@@ class LogEventsList extends ContextSour
         * Deprecated alias for getTitle(); do not use.
         *
         * @deprecated in 1.20; use getTitle() instead.
-        * @return Title object
+        * @return Title
         */
        public function getDisplayTitle() {
 +              wfDeprecated( __METHOD__, '1.20' );
                return $this->getTitle();
        }
  
@@@ -89,18 -89,17 +90,18 @@@
        /**
         * Show options for the log list
         *
-        * @param string $types or Array
-        * @param $user String
-        * @param $page String
-        * @param $pattern String
-        * @param $year Integer: year
-        * @param $month Integer: month
-        * @param $filter: array
-        * @param $tagFilter: array?
+        * @param array|string $types
+        * @param string $user
+        * @param string $page
+        * @param string $pattern
+        * @param int $year Year
+        * @param int $month Month
+        * @param array $filter
+        * @param string $tagFilter Tag to select by default
         */
 -      public function showOptions( $types = array(), $user = '', $page = '', $pattern = '', $year = '',
 -              $month = '', $filter = null, $tagFilter = '' ) {
 +      public function showOptions( $types = array(), $user = '', $page = '', $pattern = '', $year = 0,
 +              $month = 0, $filter = null, $tagFilter = ''
 +      ) {
                global $wgScript, $wgMiserMode;
  
                $title = SpecialPage::getTitleFor( 'Log' );

diff --cc includes/logging/LogPage.php
Simple merge