Index: /modules/trunk/modules.xml
===================================================================
--- /modules/trunk/modules.xml (revision 1372)
+++ /modules/trunk/modules.xml (revision 1387)
@@ -1,51 +1,222 @@
 <xml>
 
-	<module>
-		<rawname>phpinfo</rawname>
-		<name>PHP Info</name>
-		<version>1.0</version>
-		<type>tool</type>
-		<category>Basic</category>
-		<author>Coalescent Systems</author>
-		<email>info@coalescentsystems.ca</email>
-		<menuitems>
-			<phpinfo>PHP Info</phpinfo>
-			<phpinfo2>PHP Info2</phpinfo2>
-		</menuitems>
-		<!--  Locations have a base href of http://svn.sourceforge.net/svnroot/amportal/modules/ -->
-		<location>release/phpinfo-1.0.tgz</location>
-	</module>
-
-	<module>
-		<rawname>javassh</rawname>
-		<type>tool</type>
-		<name>Java SSH Client</name>
-		<author>klkunzler</author>
-		<version>1.0</version>
-		<requirements>
-			<module>core</module>
-		</requirements>
-		<menuitems>
-			<javassh>SSH Client</javassh>
-		</menuitems>
-		<!--  Locations have a base href of http://svn.sourceforge.net/svnroot/amportal/modules/ -->
-		<location>release/javassh-1.0.tgz</location>
-	</module>
-
-	<module>
-		<rawname>ringgroups</rawname>
-		<type>setup</type>
-		<name>Ring Groups</name>
-		<author>core team</author>
-		<version>1.0</version>
-		<requirements>
-			<module>core</module>
-		</requirements>
-		<menuitems>
-			<ringgroups>Ring Groups</ringgroups>
-		</menuitems>
-		<!--  Locations have a base href of http://svn.sourceforge.net/svnroot/amportal/modules/ -->
-		<location>release/ringgroups.tgz</location>
-	</module>
-	
+<module>
+	<rawname>recordings</rawname>
+	<name>Recordings</name>
+	<version>2.0</version>
+	<type>setup</type>
+	<category>Module</category>
+	<menuitems>
+		<recordings>System Recordings</recordings>
+	</menuitems>
+	<!--  Locations have a base href of http://svn.sourceforge.net/svnroot/amportal/modules/ -->
+	<location>release/recordings-1.0.tgz</location>
+	<info>http://freepbx.org/wiki/Recordings</info>
+</module>
+
+<module>
+	<rawname>queues</rawname>
+	<name>Queues</name>
+	<version>1.0</version>
+	<type>setup</type>
+	<category>Module</category>
+	<menuitems>
+		<queues>Queues</queues>
+	</menuitems>
+	<location>release/queues-1.0.tgz</location>
+	<info>http://freepbx.org/wiki/Queues</info>
+</module>
+
+<module>
+	<rawname>applications</rawname>
+	<name>Feature Codes</name>
+	<version>1.0</version>
+	<type>setup</type>
+	<category>Basic</category>
+	<menuitems>
+		<applications>Feature Codes</applications>
+	</menuitems>
+	<location>release/applications-1.0.tgz</location>
+</module>
+
+<module>
+	<rawname>asterisk-cli</rawname>
+	<name>Asterisk CLI</name>
+	<version>0.001</version>
+	<type>tool</type>
+	<category>System Admin</category>
+	<menuitems>
+		<cli>Asterisk CLI</cli>
+	</menuitems>
+	<location>release/asterisk-cli-0.001.tgz</location>
+	<info>http://freepbx.org/wiki/AsteriskCli</info>
+</module>
+
+<module>
+	<rawname>backup</rawname>
+	<name>Backup &amp; Restore</name>
+	<version>1.0</version>
+	<type>tool</type>
+	<category>System Admin</category>
+	<menuitems>
+		<backup>Backup &amp; Restore</backup>
+	</menuitems>
+	<location>release/backup-1.0.tgz</location>
+	<info>http://freepbx.org/wiki/Backup</info>
+</module>
+
+<module>
+	<rawname>callwaiting</rawname>
+	<name>Call Waiting</name>
+	<version>1.0</version>
+	<type>setup</type>
+	<category>Basic</category>
+	<menuitems>
+		<callwaiting>Call Waiting</callwaiting>
+	</menuitems>
+	<location>release/callwaiting-1.0.tgz</location>
+	<info>http://freepbx.org/wiki/CallWaiting</info>
+</module>
+
+<module>
+	<rawname>conferences</rawname>
+	<name>Conferences</name>
+	<version>1.0</version>
+	<type>setup</type>
+	<category>Module</category>
+	<menuitems>
+		<conferences>Conferences</conferences>
+	</menuitems>
+	<location>release/conferences-1.0.tgz</location>
+	<info>http://freepbx.org/wiki/Conferences</info>
+</module>
+
+<module>
+	<rawname>core</rawname>
+	<type>setup</type>
+	<name>Core</name>
+	<author>core team</author>
+	<version>1.0</version>
+	<requirements>
+		<file>/usr/sbin/asterisk</file>
+	</requirements>
+	<menuitems>
+		<extensions>Extensions</extensions>
+		<users>Users</users>
+		<devices>Devices</devices>
+		<did>Inbound Routes</did>
+		<routing>Outbound Routes</routing>
+		<trunks>Trunks</trunks>
+		<general>General Settings</general>
+		<ampusers>Administrators</ampusers>
+	</menuitems>
+	<location>release/core-1.0.tgz</location>
+	<info>http://freepbx.org/wiki/Core</info>
+</module>
+
+<module>
+	<rawname>disa</rawname>
+	<name>DISA</name>
+	<version>1.0</version>
+	<type>setup</type>
+	<category>Remote Access</category>
+	<menuitems>
+		<disa>DISA</disa>
+	</menuitems>
+	<location>release/disa-1.0.tgz</location>
+	<info>http://freepbx.org/wiki/DISA</info>
+</module>
+
+<module>
+	<rawname>irc</rawname>
+	<name>Online Support</name>
+	<version>1.0</version>
+	<type>tool</type>
+	<category>Help</category>
+	<menuitems>
+		<irc>Online Support</irc>
+	</menuitems>
+	<location>release/irc-1.0.tgz</location>
+	<info>http://freepbx.org/wiki/OnlineSupport</info>
+</module>
+
+<module>
+	<rawname>ivr</rawname>
+	<name>IVR</name>
+	<version>2.1</version>
+	<type>setup</type>
+	<category>Module</category>
+	<menuitems>
+		<ivr>Digital Receptionist</ivr>
+	</menuitems>
+	<location>release/ivr-2.1.tgz</location>
+	<info>http://freepbx.org/wiki/IVR</info>
+</module>
+
+<module>
+	<rawname>music</rawname>
+	<name>On Hold Music</name>
+	<version>1.0</version>
+	<type>setup</type>
+	<category>Module</category>
+	<menuitems>
+		<music>On Hold Music</music>
+	</menuitems>
+	<location>release/music-1.0.tgz</location>
+	<info>http://freepbx.org/wiki/OnHoldMusic</info>
+</module>
+
+<module>
+	<rawname>paging</rawname>
+	<name>Paging and Intercom</name>
+	<version>1.0</version>
+	<type>setup</type>
+	<category>Module</category>
+	<menuitems>
+		<paging>Paging and Intercom</paging>
+	</menuitems>
+	<location>release/paging-1.0.tgz</location>
+	<info>http://freepbx.org/wiki/PagingAndIntercom</info>
+</module>
+
+<module>
+	<rawname>ringgroups</rawname>
+	<name>Ring Groups</name>
+	<version>1.0</version>
+	<type>setup</type>
+	<category>Basic</category>
+	<menuitems>
+		<ringgroups>Ring Groups</ringgroups>
+	</menuitems>
+	<location>release/ringgroups-1.0.tgz</location>
+	<info>http://freepbx.org/wiki/RingGroups</info>
+</module>
+
+<module>
+	<rawname>timeconditions</rawname>
+	<name>Time Conditions</name>
+	<version>1.0</version>
+	<type>setup</type>
+	<category>Basic</category>
+	<menuitems>
+		<timeconditions>Time Conditions</timeconditions>
+	</menuitems>
+	<location>release/timeconditions-1.0.tgz</location>
+	<info>http://freepbx.org/wiki/TimeConditions</info>
+</module>
+
+<module>
+	<rawname>phpinfo</rawname>
+	<name>PHP Info</name>
+	<version>1.0</version>
+	<type>setup</type>
+	<category>Basic</category>
+	<menuitems>
+		<ringgroups>PHP Info</ringgroups>
+	</menuitems>
+	<location>release/phpinfo-1.0.tgz</location>
+	<info>http://freepbx.org/wiki/PhpInfo</info>
+</module>
+
 </xml>
+