X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=update.html;h=296ea160f7073da2033888a86d33926a55a2ba33;hb=45a035785b9a820621da56dec93078b3ccd9832e;hp=d7c6b48456471fd460468d7432ad17ee4173ec0f;hpb=3420dc8d8dd23ed74dd88f20c0765167edfd2835;p=fa-stable.git

diff --git a/update.html b/update.html
index d7c6b484..296ea160 100644
--- a/update.html
+++ b/update.html
@@ -13,7 +13,7 @@
 
 <ul>
   <li>You can easily upload all the files to your installation folder on the
-server overwriting the existing files. From 2.2 RC, your existing configuration files, - <span style="font-weight: bold;">config_db.php, config.php, /land/installed_languages.inc and installed_extensions.php</span> - will nolonger be installed. They are created the first time you install FrontAccounting and don't need further updates.<ol>
+server overwriting the existing files. From 2.2 RC, your existing configuration files, - <span style="font-weight: bold;">config_db.php, config.php, /lang/installed_languages.inc and installed_extensions.php</span> - will nolonger be installed. They are created the first time you install FrontAccounting and don't need further updates.<ol>
       <li>Backup&nbsp; (download) the following files to another folder:
         <ol><li>if you have made <em>changes to other files</em>, like themes or so, backup
 these files. </li>
@@ -22,28 +22,26 @@ these files. </li>
       </li>
       <li>Upload all the new files.
       </li>
-      <li>Look into the file, <span style="font-weight: bold; font-style: italic;">config.default.php and compare with your own config.php</span> file. You should update the $version in your config.php file. If there are other differences, please correct them too.
-      </li>
+      <li>Look into the file, <span style="font-weight: bold; font-style: italic;">config.default.php and compare with your own config.php</span> file. You should update the the following in your config.php:</li><ol><li>Change the $version in your <span style="font-weight: bold;">config.php</span> file, about line 59, from "2.2.X" to "2.2 RC".</li><li>Copy these 2 lines from <span style="font-weight: bold;">config.default.php</span> about line 80-82 into <span style="font-weight: bold;">config.php</span> about line 80:</li><ol><li>/* Show users online discretetely in the footer */<br />$show_users_online = 0;</li><li>Change this to 1 if you want to show users online.</li></ol><li>Replace the 2 lines about line 110-111 in <span style="font-weight: bold;">config.php</span>:</li><ol><li>$table_style &nbsp;&nbsp;&nbsp; = "cellpadding=3 border=1 bordercolor='#8cacbb' style='border-collapse: collapse'";<br />$table_style2 &nbsp;&nbsp; &nbsp;= "cellpadding=3 border=1 bordercolor='#cccccc' style='border-collapse: collapse'";</li></ol><li>With these 4 lines from <span style="font-weight: bold;">config.default.php</span>:</li><ol><li>if (!isset($_SESSION['bordercolor']))<br />&nbsp; &nbsp; $_SESSION['bordercolor'] = "#8cacbb";<br />$table_style &nbsp;&nbsp;&nbsp; = "cellpadding=3 border=1 bordercolor='".$_SESSION['bordercolor']."' class='tablestyle'";<br />$table_style2 &nbsp;&nbsp;&nbsp; = "cellpadding=3 border=1 bordercolor='#cccccc' class='tablestyle2'";</li></ol><li>Remove these 2 lines from <span style="font-weight: bold;">config.php</span> about line 176-176:</li><ol><li>/* default start-up tab (orders/AP/stock/manuf/proj/GL/system) */<br />$def_app = "orders";</li></ol><li>Copy these 2 lines from <span style="font-weight: bold;">config.default.php</span> about line 202-203:</li><ol><li>define("ICON_SUBMIT", "ok.gif");&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; // new in 2.2<br />define("ICON_ESCAPE", "escape.png");&nbsp;&nbsp;&nbsp; // new in 2.2</li></ol><li>And paste them into <span style="font-weight: bold;">config.php</span> about line 209</li></ol>
       <li>Rename or remove the /install folder (you have already performed the install
 process earlier). </li>
     </ol>
-  </li><li><strong>When
-updating release&nbsp;2.1.X to release 2.2.X, you should first restore
-your $security_headers and $security_groups from your old config.php
-file, alternative unmark them in the new config.php. The reason is a new
-access_level system in 2.2.</strong></li><li><strong>Then you must immediately
+  </li><li><strong>You
+must immediately
 login on company 0, the first company you created, as&nbsp;admin
 (called the superadmin). If you use a theme other than the standard 3,
 aqua, cool or default, switch to one of these before going further. You
-can download a new one of the new themes on the download page.&nbsp; Go
+can download a new one of the new themes on the download page
+later.&nbsp; Go
 to the 'Setup' tab and run 'Software
 Upgrade'.
-Mark the checkbox 'Install' and press 'Upgrade System'. &nbsp;This will
-upgrade ALL your companies.</strong></li><li style="font-weight: bold;">If something goes wrong during upgrade, you can enter here again and try 'Force Upgrade', and press 'Upgrade System' again.</li><li style="font-weight: bold;">Now you should comment your old $securityheaders and $security_groups.</li><li><strong style="font-weight: bold;"></strong><strong>There are no database changes during a major and minor release. Like from 2.2 to 2.2.1 - 2.2.X .</strong></li><li><span style="font-weight: bold;">If you get a blank screen after login, this might be caused of a bad configuration of the database connection in config_db.php.</span></li><li style="font-weight: bold;">Enter
+Mark the checkbox 'Install' and press 'Upgrade System'. &nbsp;You must
+also do this if you upgrade from 2.2 Beta to 2.2 RC. This will
+upgrade ALL your companies.</strong></li><li style="font-weight: bold;">If something goes wrong during upgrade, you can enter here again and try 'Force Upgrade', and press 'Upgrade System' again.</li><li><strong>There are no database changes during a major and minor release. Like from 2.2 to 2.2.1 - 2.2.X .</strong></li><li style="font-weight: bold;">Enter
 'Setup' tab, 'System and Generel GL Setup'. &nbsp;Set the correct
 Accounts for Retained Earnings, Profit/Loss Year and Bank Charge.</li><li style="font-weight: bold;">Enter
 'Setup' tab, 'Access Setup'. Check all the roles and change as you
-please. The roles has been converted from the former Access Roles and
+please. The roles have been converted from the former Access Roles and
 may need some changes.</li><li style="font-weight: bold;">Enter
 'Setup' tab, 'Company Setup'. If you want Automatic Item Price
 Calculations from Standard&nbsp;Cost, add a percent to add and