bkruse: branch aadk r1096 - in /branches/aadk: ./ config/ config/setup/

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Mon Jun 18 18:53:46 2007
New Revision: 1096

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1096
Log:
Merged revisions 1094 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r1094 | bkruse | 2007-06-18 18:51:43 -0500 (Mon, 18 Jun 2007) | 1 line

Updated the link so that it does not go to a fake page (Legal and Trademark Policy)
........

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/cfgbasic.html
    branches/aadk/config/setup/install.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 18 18:53:46 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-1081,1085,1090
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-1081,1085,1090,1094

Modified: branches/aadk/config/cfgbasic.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/cfgbasic.html?view=diff&rev=1096&r1=1095&r2=1096
==============================================================================
--- branches/aadk/config/cfgbasic.html (original)
+++ branches/aadk/config/cfgbasic.html Mon Jun 18 18:53:46 2007
@@ -342,7 +342,7 @@
 	</td>
 </tr>
 <tr><td colspan="3" align="center" height="18">
-		<div id="status" class="statusbar">Copyright 2006-2007 Digium, Inc.  Digium and Asterisk are registered <a href="http://www.digium.com/en/company/profile/trademarkpolicy.php">trademarks</a> of Digium, Inc.  All Rights Reserved. <i><a href="#">Legal Information</a></i></div>
+		<div id="status" class="statusbar">Copyright 2006-2007 Digium, Inc.  Digium and Asterisk are registered <a href="http://www.digium.com/en/company/profile/trademarkpolicy.php">trademarks</a> of Digium, Inc.  All Rights Reserved. <i><a href="http://www.digium.com/en/company/profile/terms.php">Legal Information</a></i></div>
 		</td>
 </tr>
 </tbody></table>

Modified: branches/aadk/config/setup/install.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/install.html?view=diff&rev=1096&r1=1095&r2=1096
==============================================================================
--- branches/aadk/config/setup/install.html (original)
+++ branches/aadk/config/setup/install.html Mon Jun 18 18:53:46 2007
@@ -80,6 +80,5 @@
   	     </TD>
 	</TR>
 </TABLE>
-<div id="copyright">Copyright &copy;2006-2007 Digium, Inc.  Digium&reg; and Asterisk&reg; are registered <a href="http://www.digium.com/trademarks">trademarks</a> of Digium, Inc. All Rights Reserved. <i><a href="http://www.digium.com/gui_legal">Legal Information</a></i></div>
-</body>
+<div id="copyright">Copyright &copy;2006-2007 Digium, Inc.  Digium&reg; and Asterisk&reg; are registered <a href="http://www.digium.com/en/company/profile/trademarkpolicy.php">trademarks</a> of Digium, Inc. All Rights Reserved. <i><a href="http://www.digium.com/en/company/profile/terms.php">Legal Information</a></i></div></body>
 </html>