pari: branch aadk r1058 - in /branches/aadk: ./ config/

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

Author: pari
Date: Wed Jun  6 20:59:26 2007
New Revision: 1058

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1058
Log:
merging 1056

Added:
    branches/aadk/config/callparking.html
      - copied unchanged from r1056, trunk/config/callparking.html
Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/cfgbasic.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun  6 20:59:26 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-1049
+/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-1056

Modified: branches/aadk/config/cfgbasic.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/cfgbasic.html?view=diff&rev=1058&r1=1057&r2=1058
==============================================================================
--- branches/aadk/config/cfgbasic.html (original)
+++ branches/aadk/config/cfgbasic.html Wed Jun  6 20:59:26 2007
@@ -168,6 +168,7 @@
 	newpanel( ["Networking", "networking.html", "Configures networking parameters"]);
 	newpanel( ["Voice Menus", "menus.html", "Menus allow for more efficient routing of calls from incoming callers. Also known as IVR (Interactive Voice Response) menus or Digital Receptionist"]);
 	newpanel( ["Time Based Rules", "timerules.html", "define call routing rules based on date and time"]);
+	newpanel( ["Call Parking", "callparking.html", "configure call parking features"]);
 	newpanel( ["Ring Groups", "ringgroups.html", "define RingGroups to dial more than one extension"]);
 	newpanel( ["Record a Menu", "record.html", "Allows you to record custom voicemenus over a phone"]);
 	newpanel( ["Active Channels", "status.html", "Monitor active channels."]);