markster: trunk r80 - in /trunk: Makefile README config/cfgbasic.html

[asterisk-gui-commits at lists.digium.com]

Author: markster
Date: Wed Oct 18 21:50:01 2006
New Revision: 80

URL: http://svn.digium.com/view/asterisk-gui?rev=80&view=rev
Log:
Fix up readme, etc...

Modified:
    trunk/Makefile
    trunk/README
    trunk/config/cfgbasic.html

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk-gui/trunk/Makefile?rev=80&r1=79&r2=80&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Oct 18 21:50:01 2006
@@ -54,6 +54,14 @@
 HTTPURL=http://$(HTTPHOST):$(HTTPBINDPORT)/$(HTTPPREFIX)/static/config/cfgbasic.html
 
 # Nothing to do yet for building, but one day there could be...
+
+all:
+	@echo " +------- Asterisk-GUI Build Complete -------+"
+	@echo " + Asterisk-GUI has successfully been built, +"
+	@echo " + and can be installed by running:          +"
+	@echo " +                                           +"
+	@echo " +               make install                +"
+	@echo " +-------------------------------------------+"
 
 checkconfig:
 	@echo " --- Checking Asterisk configuration to see if it will support the GUI ---"
@@ -124,13 +132,6 @@
 	@echo "    write = system,call,log,verbose,command,agent,config"
 	@echo ""
 	@echo " --- Good luck! ---	"
-all:
-	@echo " +------- Asterisk-GUI Build Complete -------+"
-	@echo " + Asterisk-GUI has successfully been built, +"
-	@echo " + and can be installed by running:          +"
-	@echo " +                                           +"
-	@echo " +               make install                +"
-	@echo " +-------------------------------------------+"
 
 _install:
 	@echo "Installing into $(HTTPDIR)"
@@ -174,7 +175,7 @@
 	@echo " +                                           +"
 	@echo " + Before the GUI will run, you must perform +"
 	@echo " + some modifications to the Asterisk        +"
-	@echo " + configuration fiels in accordance with    +"
+	@echo " + configuration files in accordance with    +"
 	@echo " + the README file.  When done, you can      +"
 	@echo " + check your changes by doing:              +"
 	@echo " +                                           +"

Modified: trunk/README
URL: http://svn.digium.com/view/asterisk-gui/trunk/README?rev=80&r1=79&r2=80&view=diff
==============================================================================
--- trunk/README (original)
+++ trunk/README Wed Oct 18 21:50:01 2006
@@ -6,19 +6,46 @@
 
 Software License
 ================
-Asterisk-GUI HTML and Javascript files, like Asterisk, are distributed under the
-GNU General Public License version 2.  Dual licensing is available through
-Digium as well.
+Asterisk-GUI HTML and Javascript files
+Copyright (C) 2006 Digium, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation, version 2 only.  This
+software is also available under commercial terms from Digium, Inc.
+Please contact us for details at:
+____________________________________________________________
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.
+
+Please contact Digium for information on alternative licensing 
+arrangements for Asterisk-GUI.
 
 Use of Graphics, Trademarks and Logos
 =====================================
 The images and logos included with Asterisk-GUI may only be distributed with
 unmodified versions of the toolkit and may not be used in any derivative works
-without special written permission from Digium.  Asterisk, Asterisk-GUI and
-Digium are all trademarks of Digium, Inc. and their use is governed by our
-trademark policy available at:
+without special written permission from Digium.  
 
-	http://www.digium.com/en/company/profile/trademarkpolicy.php
+ASTERISK, ASTERISK-GUI and DIGIUM are all trademarks of Digium, Inc. and
+their use is governed by our trademark policy available at:
+
+http://www.digium.com/en/company/profile/trademarkpolicy.php
+
+The GNU General Public License does not grant you any rights under
+trademark law to use those trademarks or the images and logos included
+with the Asterisk-GUI software.  Use of those trademarks is restricted
+as described in our trademark policy to unmodified versions of the
+toolkit, and may not be used in any other manner without prior written
+permission from Digium.
 
 Bugs
 ====

Modified: trunk/config/cfgbasic.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/cfgbasic.html?rev=80&r1=79&r2=80&view=diff
==============================================================================
--- trunk/config/cfgbasic.html (original)
+++ trunk/config/cfgbasic.html Wed Oct 18 21:50:01 2006
@@ -94,7 +94,7 @@
 	astmanEngine.setEventCallback(eventeater.eventcb);
 </script>
 <head>
-<title>Schwing</title>
+<title>Asterisk Configuration GUI</title>
 </head>
 
 <body onload="javascript:registerajax()">
@@ -173,8 +173,8 @@
 			<img align='left' src="images/digiumlogo.gif" align="left">
 		</td>
 		<td valign='bottom' align='right' bgcolor='white'>
-			<a target='_guido' href="http://www.digium.com/guido/about">About Digium</a> | 
-			<a target='_guido' href="http://www.digium.com/guido/help">Help</a>
+			<a target='_extern' href="http://www.digium.com/astguibasic/about">About Digium</a> | 
+			<a target='_extern' href="http://www.digium.com/astguibasic/help">Help</a>
 		</td>
 </tr>
 <tr><td>