Changes between Version 139 and Version 140 of SpiralFour

Timestamp:

08/13/12 11:43:06 (12 years ago)

Author:

hmussman@bbn.com

Comment:

--

SpiralFour

@@ -25 +25 @@
 
 == 4. GENI WiMAX Meso-Scale Deployments ==
-  || ''Activities'' || [wiki:WiMAXContacts  Contacts and Mailing Lists ]  | [wiki:WiMAXMeetingsDemos  Meetings and Demos/Tutorials] | [wiki:WiMAXProjects Projects] | [wiki:WiMAXGoalsStrategy  Goals and Strategy] | [wiki:WiMAXInteg  oldInteg] ||
+  || ''Activities'' || [wiki:WiMAXContacts  Contacts and Mailing Lists ]  | [wiki:WiMAXMeetingsDemos  Meetings, Conference Calls, Demos and Tutorials] | [wiki:WiMAXProjects Projects] | [wiki:WiMAXGoalsStrategy  Goals and Strategy] | [wiki:WiMAXInteg  oldInteg] ||
   || ''Architecture and Designs''  ||  [wiki:SystemEngineering WiMAX Engineering]  | [wiki:WiMAXArchitectureOverview  GENI Architecture Summary] | [wiki:WiMAXLicenses  Licenses] | [wiki:WiMAXSiteConfiguration Site Design]  | [wiki:SiteFederation  Site Federation] |  [wiki:WiMAXSiteOperations  Site Operations] | [wiki:WiMAXMobileStations  Mobile Stations]  | [wiki:WiMAXReferencesDocuments  WimAX References and GENI Documents] |  [wiki:WIMXWISC Handover for GENI WiMAX (U of Wisconsin-Madison)] | [wiki:WiMAXInteg  oldInteg]  ||  
   || ''Site Design'' || [wiki:WiMAXSiteConfiguration Configuration and Integration] | [wiki:WiMAXInteg  First Configuration (NEC Base Station)]  |   [wiki:AirspanBaseStation  Second Configuration (Airspan Base Station)] | [wiki:WIMXRG "WiMAX Kits from Rutgers WINLAB and NEC"] | [wiki:WIMXRUTG "Extended WiMAX Kits from Rutgers WINLAB"] | [wiki:WiMAXInteg  oldInteg]  |  [http://wimax.orbit-lab.org/  oldWiMAX Platform Configuration] ||
@@ -32 +32 @@
   || ''Site Operations'' || [wiki:SiteOperations  Design] | [wiki:SiteOperationsDeploy  Deployment]||
   || ''Mobile Stations'' || [wiki:WiMAXMobileStations   Design]  |  [wiki:WiMAXMobileStationsDeploy  Deployment]  ||
-  || ''Experiments''  || [wiki:Experiments  Descriptions]  | [wiki:WiMAXExper  oldWiMAX Experimenter Info and Tutorials]  ||
-  || ''Demos and Tutorials''  || [wiki:DemosTutorials  Descriptions]  | [wiki:ExperimenterSupport  Experimenter Support] || 
-[[BR]]
+  || ''Experiments, Demos and Tutorials''  || [wiki:Experiments  Descriptions] | [wiki:ExperimenterSupport  Experimenter Support]  | [wiki:WiMAXExper  oldWiMAX Experimenter Info and Tutorials]  ||
+ [[BR]]
 
 == 5. GENI Meso-Scale Rack Deployments  ==