From 4e7f77a00255043a098d3324c4c0f83d2f5dbe50 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 26 Jun 2005 08:24:05 +0000
Subject: [PATCH] * Printable link shorter in monobook

---
 RELEASE-NOTES             | 5 +++++
 UPGRADE                   | 5 +++++
 includes/SkinTemplate.php | 2 +-
 languages/Language.php    | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0c0fce96ed..3df597af26 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -340,6 +340,11 @@ Various bugfixes, small features, and a few experimental things:
 * Added a versionRequired() function to OutputPage, useful for extension
   writers that want to control what version of MediaWiki their extension
   can be used with.
+* Serialized user objects now checked for versioning
+* Fix for interwiki link regression
+* Printable link shorter in monobook
+* Experimental Latin-1-and-replication-friendly upgrader script
+
 
 === Caveats ===
 
diff --git a/UPGRADE b/UPGRADE
index 68d2220b26..dffa094f11 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -64,6 +64,11 @@ Note that you can disable/enable several other permissions by modifying
 this configuration array in your LocalSettings.php; see DefaultSettings.php
 for the complete default permission set.
 
+If using Memcached, you must enabled it differently now:
+  $wgUseMemCached = true;
+should be replaced with:
+  $wgMainCacheType = CACHE_MEMCACHED;
+
 
 === Web installer ===
 
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 9f2eb3261d..9fabd2afd6 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -710,7 +710,7 @@ class SkinTemplate extends Skin {
 		if( $this->iscontent && ($action == '' || $action == 'view' || $action == 'purge' ) ) {
 			$content_actions['print'] = array(
 				'class' => false,
-				'text' => wfMsg( 'printableversion' ),
+				'text' => wfMsg( 'print' ),
 				'href' => $wgRequest->appendQuery( 'printable=yes' ) );
 		}
 
diff --git a/languages/Language.php b/languages/Language.php
index 898b4fd6b3..7c927e17c9 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -403,6 +403,7 @@ and the [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide User's Guide] f
 'history_short' => 'History',
 'info_short'	=> 'Information',
 'printableversion' => 'Printable version',
+'print' => 'Print',
 'edit' => 'Edit',
 'editthispage'	=> 'Edit this page',
 'delete' => 'Delete',
-- 
2.20.1