2 files changed, 26 insertions, 21 deletions

diff --git a/deskutils/sugarcrm/files/pkg-install.in b/deskutils/sugarcrm/files/pkg-install.in
index c7089e7d4b0b..bcc6791dc2ed 100644
--- a/deskutils/sugarcrm/files/pkg-install.in
+++ b/deskutils/sugarcrm/files/pkg-install.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/deskutils/sugarcrm/files/pkg-install.in,v 1.1 2007-02-14 20:31:08 miwi Exp $
+# $FreeBSD: /tmp/pcvs/ports/deskutils/sugarcrm/files/pkg-install.in,v 1.2 2008-03-13 12:05:03 miwi Exp $
 
 case $2 in
     PRE-INSTALL)
@@ -8,14 +8,14 @@ case $2 in
 	echo <<EOF;
 ==================== U P G R A D E   W A R N I N G ====================
 
-If you want to upgrade from a previous version of SugarCRM, you *must*
-upgrade using the SugarCRM upgrade wizard instead of upgrading your
-FreeBSD port using the ports/packages system.
+If you want to upgrade from a previous version of Sugar Community Edition,
+you *must* upgrade using the Sugar Community Edition upgrade wizard instead
+of upgrading your FreeBSD port using the ports/packages system.
 
-If you upgrade your installation using either the 'portupgrade' command
-or else by upgrading the port/package manually, your SugarCRM
-installation will become unusable, as SugarCRM's database upgrade
-procedures are contained only within the upgrade modules.
+If you upgrade your installation using either the 'portupgrade' command or
+else by upgrading the port/package manually, your Sugar Community Edition
+installation will become unusable, as Sugar Community Edition's database
+upgrade procedures are contained only within the upgrade modules.
 
 SugarCRM Inc. are aware of this issue and may address it in future
 versions of their product.
diff --git a/deskutils/sugarcrm/files/pkg-message.in b/deskutils/sugarcrm/files/pkg-message.in
index 185f4772a94e..354d4f25aee9 100644
--- a/deskutils/sugarcrm/files/pkg-message.in
+++ b/deskutils/sugarcrm/files/pkg-message.in
@@ -2,34 +2,39 @@
 
 Notes:
 
-1.  SugarCRM requires that you increase the default PHP memory limit from
-    8Mb to 32Mb in the php.ini file.  You should edit this file and ensure
-    that the memory_limit parameter should be set to 32Mb or greater:
+1.  Sugar Community Edition requires that you increase the default PHP
+    memory limit from 8Mb to 32Mb in the php.ini file.  You should edit this
+    file and ensure that the memory_limit parameter should be set to 40Mb or
+    greater:
 
-memory_limit = 32M	; Maximum amount of memory a script may consume 
+memory_limit = 40M	; Maximum amount of memory a script may consume 
 
-2.  SugarCRM requires the following two parameters to be set in your php.ini.
+2.  Sugar Community Edition requires the following two parameters to be set
+    in your php.ini.
 
 allow_call_time_pass_reference = Off
 safe_mode = Off		; disable "safe mode"
 
-    While SugarCRM will work (albeit inefficiently) with
+    While Sugar Community Edition will work (albeit inefficiently) with
     allow_call_time_pass_reference enabled, safe_mode must be disabled to
     allow the system to work at all.  For more information on why these
     parameters are unnecessary, please see the PHP manual.
 
-2.  In order to get Apache or your preferred web server to recognise
-    SugarCRM's location on your disk, you'll need to put the following line
-    (or the equivalent) into the web server configuration:
+2.  In order to get Apache or your preferred web server to recognise Sugar
+    Community Edition's location on your disk, you'll need to put the
+    following line (or the equivalent) into the web server configuration:
 
-Alias /sugarcrm %%PREFIX%%/%%SUGARCRMDIR%%
-<Directory %%PREFIX%%/%%SUGARCRMDIR%%>
+Alias /sugarcrm %%WWWDIR%%
+<Directory %%WWWDIR%%>
+	AllowOverride RedirectMatch
 	Order allow,deny
 	Allow from all
 </Directory>
 
-3.  Please see the documentation directory (%%DOCSDIR%%)
-    for full documentation on how to get the best out of SugarCRM.
+3.  For full information on how to get the best out of Sugar Community
+    Edition, please see the documentation on the web:
+
+    http://www.sugarforge.org/content/documentation/
 
 4.  Enjoy!