Index: branches/5.2.x/install/upgrades.sql
===================================================================
diff -u -N -r15469 -r15612
--- branches/5.2.x/install/upgrades.sql	(.../upgrades.sql)	(revision 15469)
+++ branches/5.2.x/install/upgrades.sql	(.../upgrades.sql)	(revision 15612)
@@ -194,3 +194,5 @@
 
 # ===== v 5.2.0 =====
 INSERT INTO Permissions VALUES(DEFAULT, 'in-link:configuration_output.add', 11, 1, 1, 0);
+
+# ===== v 5.2.1-B1 =====
Index: branches/5.2.x/admin_templates/links/links_edit.tpl
===================================================================
diff -u -N -r14254 -r15612
--- branches/5.2.x/admin_templates/links/links_edit.tpl	(.../links_edit.tpl)	(revision 14254)
+++ branches/5.2.x/admin_templates/links/links_edit.tpl	(.../links_edit.tpl)	(revision 15612)
@@ -63,7 +63,7 @@
 		<inp2:m_RenderElement name="subsection" prefix="l" fields="LinkId,Name,Description,Url,ReciprocalLinkFound,CreatedById,AutomaticFilename,Filename,CustomTemplate,CategoryId" title="la_section_Link" original_title="la_section_OriginalValues" display_original="1"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="l" field="LinkId" title="la_fld_Id" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="l" field="Name" title="la_fld_Name" size="60" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="l" field="Description" title="la_fld_Description" cols="60" rows="5" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="l" field="Description" title="la_fld_Description" allow_html="1" cols="60" rows="5" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Url" title="la_fld_Url" size="60" display_original="1"/>
 			<inp2:m_RenderElement name="inp_label" prefix="l" field="ReciprocalLinkFound" title="la_fld_ReciprocalLinkFound"/>
 			<inp2:m_RenderElement name="inp_edit_user" prefix="l" field="CreatedById" title="la_fld_LinkOwner" size="30" display_original="1"/>
Index: branches/5.2.x/install/upgrades.php
===================================================================
diff -u -N -r15469 -r15612
--- branches/5.2.x/install/upgrades.php	(.../upgrades.php)	(revision 15469)
+++ branches/5.2.x/install/upgrades.php	(.../upgrades.php)	(revision 15612)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 15469 2012-07-23 17:08:36Z alex $
+* @version	$Id: upgrades.php 15612 2012-11-07 11:50:42Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -60,6 +60,7 @@
 				'5.2.0-B3' => Array ('Core' => '5.2.0-B3'),
 				'5.2.0-RC1' => Array ('Core' => '5.2.0-RC1'),
 				'5.2.0' => Array ('Core' => '5.2.0'),
+				'5.2.1-B1' => Array ('Core' => '5.2.1-B1'),
 			);
 		}
 
Index: branches/5.2.x/admin_templates/paid_listings/paid_listing_type_edit.tpl
===================================================================
diff -u -N -r15265 -r15612
--- branches/5.2.x/admin_templates/paid_listings/paid_listing_type_edit.tpl	(.../paid_listing_type_edit.tpl)	(revision 15265)
+++ branches/5.2.x/admin_templates/paid_listings/paid_listing_type_edit.tpl	(.../paid_listing_type_edit.tpl)	(revision 15612)
@@ -60,7 +60,7 @@
 
 			<inp2:m_RenderElement name="inp_edit_box" prefix="lst" field="Name" title="la_fld_ListingTypeName" size="20"/>
 
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="lst" field="Description" title="la_fld_ListingTypeDescription" rows="10" cols="40"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="lst" field="Description" title="la_fld_ListingTypeDescription" allow_html="1" rows="10" cols="40"/>
 
 			<inp2:m_RenderElement design="form_row" prefix="lst" field="Duration" title="la_fld_Duration">
 				<td class="control-cell">