From bacfa744aed3ecfd1537380860315ea00e0265d4 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Sun, 20 Jul 2014 07:37:28 +0000
Subject: [PATCH] Remove attendant options in as they are already defined in
 features.cfg

---
 .../provision/polycom/vvx/features.cfg        | 25 ++++++++++++++++---
 .../polycom/vvx/{$mac}-registration.cfg       |  9 -------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/resources/templates/provision/polycom/vvx/features.cfg b/resources/templates/provision/polycom/vvx/features.cfg
index 93491bd5ca..9f3f42c3c2 100644
--- a/resources/templates/provision/polycom/vvx/features.cfg
+++ b/resources/templates/provision/polycom/vvx/features.cfg
@@ -6,13 +6,32 @@
   <attendant attendant.reg="1" attendant.ringType="ringer1" attendant.uri="">
     <attendant.behaviors>
       <attendant.behaviors.display>
-        <attendant.behaviors.display.remoteCallerID attendant.behaviors.display.remoteCallerID.automata="1" attendant.behaviors.display.remoteCallerID.normal="1">
+        <attendant.behaviors.display.remoteCallerID 
+          attendant.behaviors.display.remoteCallerID.automata="1" 
+          attendant.behaviors.display.remoteCallerID.normal="1">
         </attendant.behaviors.display.remoteCallerID>
-        <attendant.behaviors.display.spontaneousCallAppearances attendant.behaviors.display.spontaneousCallAppearances.automata="0" attendant.behaviors.display.spontaneousCallAppearances.normal="1">
+        <attendant.behaviors.display.spontaneousCallAppearances 
+          attendant.behaviors.display.spontaneousCallAppearances.automata="0" 
+          attendant.behaviors.display.spontaneousCallAppearances.normal="1">
         </attendant.behaviors.display.spontaneousCallAppearances>
       </attendant.behaviors.display>
     </attendant.behaviors>
-    <attendant.resourceList attendant.resourceList.1.address="park+*5901" attendant.resourceList.1.callAddress="" attendant.resourceList.1.label="Park1" attendant.resourceList.1.proceedingIsRecipient="0" attendant.resourceList.1.type="automata" attendant.resourceList.2.address="park+*5902" attendant.resourceList.2.callAddress="" attendant.resourceList.2.label="Park2" attendant.resourceList.2.proceedingIsRecipient="0" attendant.resourceList.2.type="automata" attendant.resourceList.3.address="park+*5903" attendant.resourceList.3.callAddress="" attendant.resourceList.3.label="Park3" attendant.resourceList.3.proceedingIsRecipient="0" attendant.resourceList.3.type="automata">
+    <attendant.resourceList 
+      attendant.resourceList.1.address="park+*5901" 
+      attendant.resourceList.1.callAddress="" 
+      attendant.resourceList.1.label="Park 1" 
+      attendant.resourceList.1.proceedingIsRecipient="0" 
+      attendant.resourceList.1.type="automata" 
+      attendant.resourceList.2.address="park+*5902" 
+      attendant.resourceList.2.callAddress="" 
+      attendant.resourceList.2.label="Park 2" 
+      attendant.resourceList.2.proceedingIsRecipient="0" 
+      attendant.resourceList.2.type="automata" 
+      attendant.resourceList.3.address="park+*5903" 
+      attendant.resourceList.3.callAddress="" 
+      attendant.resourceList.3.label="Park 3" 
+      attendant.resourceList.3.proceedingIsRecipient="0" 
+      attendant.resourceList.3.type="automata">
     </attendant.resourceList>
   </attendant>
   <up>
diff --git a/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg b/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg
index 1280c37bf0..d9d2b6fd5e 100644
--- a/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg
+++ b/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg
@@ -67,15 +67,6 @@
 		reg.3.server.1.retryMaxCount="" 
 		reg.3.server.1.expires.lineSeize="" />
 
-	<attendant
-		attendant.attendant.reg="1" 
-		attendant.ringType="1"
-		attendant.behaviors.display.spontaneousCallAppearances.normal="1" 
-		attendant.behaviors.display.spontaneousCallAppearances.automata="1"
-		attendant.behaviors.display.remoteCallerID.normal="1"
-		attendant.behaviors.display.remoteCallerID.automata="1" 
-		/>
-
 	<msg msg.bypassInstantMessage="1"> 
 		<mwi
 			msg.mwi.1.subscribe=""