[Arianne-commits] stendhal_website/content/account merge.php, 1.6, 1.7

[Hendrik B. <nh...@us...>]

Update of /cvsroot/arianne/stendhal_website/content/account
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10483/content/account

Modified Files:
	merge.php 
Log Message:
added help link directly on the merge account page

Index: merge.php
===================================================================
RCS file: /cvsroot/arianne/stendhal_website/content/account/merge.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** merge.php	27 Jun 2010 10:02:53 -0000	1.6
--- merge.php	16 Jul 2010 22:49:18 -0000	1.7
***************
*** 27,31 ****
  	function displayHelp() {
  		startBox("Account Merging");?>
! 		<p>With the form below you can merge your other accounts.</p>
  		<p>This means that all characters previously associated with the other 
  		account will be available in this account. The other account will be 
--- 27,32 ----
  	function displayHelp() {
  		startBox("Account Merging");?>
! 		<p>With the form below you can merge your other accounts. &nbsp;&nbsp;&ndash;&nbsp;&nbsp;
! 		(<a href="https://stendhalgame.org/wiki/Stendhal_Account_Merging">Help</a>)</p>
  		<p>This means that all characters previously associated with the other 
  		account will be available in this account. The other account will be