Index: q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml
===================================================================
--- q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml (revision 401)
+++ q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml (revision 402)
@@ -405,6 +405,5 @@
             <sml:ComponentList>
 
-               <sml:component name="Conductivity"
-                  xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_conductivity.xml">
+               <sml:component name="Conductivity">
                   <sml:Component>
                      <gml:description>YSI Conductivity Sensor</gml:description>
@@ -479,13 +478,351 @@
                      </sml:parameters>
                   </sml:Component>
+               </sml:component>             
+               <sml:component name="Temperature">
+                  <sml:Component>
+                     <gml:description>YSI Temperature Sensor</gml:description>
+                     <sml:identification>
+                        <sml:IdentifierList>
+                           <sml:identifier name="longName">
+                              <sml:Term definition="urn:ogc:def:property:OGC:longName">
+                                 <sml:value>Temperature</sml:value>
+                              </sml:Term>
+                           </sml:identifier>
+                           <sml:identifier name="sensorType">
+                              <sml:Term definition="urn:ogc:def:property:OGC:sensorType">
+                                 <sml:value>thermistor</sml:value>
+                              </sml:Term>
+                           </sml:identifier>
+                        </sml:IdentifierList>
+                     </sml:identification>
+
+                     <sml:inputs>
+                        <sml:InputList>
+                           <sml:input name="water_temperature">
+                              <swe:ObservableProperty
+                                 definition="http://mmisw.org/ont/ioos/parameter/water_temperature"/>
+                           </sml:input>
+                        </sml:InputList>
+                     </sml:inputs>
+                     
+                     <sml:outputs>
+                        <sml:OutputList>
+                           <sml:output name="water_temperature">
+                              <swe:Quantity
+                                 definition="http://mmisw.org/ont/ioos/parameter/water_temperature">
+                                 <swe:uom code="degC"/>
+                              </swe:Quantity>
+                           </sml:output>
+                        </sml:OutputList>
+                     </sml:outputs>
+                     
+                     <sml:parameters>
+                        <sml:ParameterList>
+                           <sml:parameter name="range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>-5 50</swe:value>
+                              </swe:QuantityRange>
+                           </sml:parameter>
+                           <sml:parameter name="accuracy">
+                              <swe:Quantity>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>0.15</swe:value>
+                              </swe:Quantity>
+                           </sml:parameter>
+                           <sml:parameter name="resolution">
+                              <swe:Quantity>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>0.01</swe:value>
+                              </swe:Quantity>
+                           </sml:parameter>
+                           <sml:parameter name="max depth">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>200</swe:value>
+                              </swe:Quantity>
+                           </sml:parameter>
+                        </sml:ParameterList>
+                     </sml:parameters>
+                  </sml:Component>
                </sml:component>
-               <sml:component name="Temperature"
-                  xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_temperature.xml"/>
-               <sml:component name="Pressure"
-                  xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_temperature.xml"/>
-
-               <!-- xxxx THE FOLLOWING NEEDS TO BE COMPLETED -->
-
-               <sml:component name="Optical Dissolved Oxygen"/>
+               <sml:component name="Salinity">
+                  <sml:Component>
+                     <gml:description>YSI Temperature Sensor</gml:description>
+                     <sml:identification>
+                        <sml:IdentifierList>
+                           <sml:identifier name="longName">
+                              <sml:Term definition="urn:ogc:def:property:OGC:longName">
+                                 <sml:value>Temperature</sml:value>
+                              </sml:Term>
+                           </sml:identifier>
+                           <sml:identifier name="sensorType">
+                              <sml:Term definition="urn:ogc:def:property:OGC:sensorType">
+                                 <sml:value>thermistor</sml:value>
+                              </sml:Term>
+                           </sml:identifier>
+                        </sml:IdentifierList>
+                     </sml:identification>
+                     
+                     <sml:inputs>
+                        <sml:InputList>
+                           <sml:input name="water_temperature">
+                              <swe:ObservableProperty
+                                 definition="http://mmisw.org/ont/ioos/parameter/water_temperature"/>
+                           </sml:input>
+                        </sml:InputList>
+                     </sml:inputs>
+                     
+                     <sml:outputs>
+                        <sml:OutputList>
+                           <sml:output name="water_temperature">
+                              <swe:Quantity
+                                 definition="http://mmisw.org/ont/ioos/parameter/water_temperature">
+                                 <swe:uom code="degC"/>
+                              </swe:Quantity>
+                           </sml:output>
+                        </sml:OutputList>
+                     </sml:outputs>
+                     
+                     <sml:parameters>
+                        <sml:ParameterList>
+                           <sml:parameter name="range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>-5 50</swe:value>
+                              </swe:QuantityRange>
+                           </sml:parameter>
+                           <sml:parameter name="accuracy">
+                              <swe:Quantity>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>0.15</swe:value>
+                              </swe:Quantity>
+                           </sml:parameter>
+                           <sml:parameter name="resolution">
+                              <swe:Quantity>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>0.01</swe:value>
+                              </swe:Quantity>
+                           </sml:parameter>
+                           <sml:parameter name="max depth">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>200</swe:value>
+                              </swe:Quantity>
+                           </sml:parameter>
+                        </sml:ParameterList>
+                     </sml:parameters>
+                  </sml:Component>
+               </sml:component>
+               
+               <sml:component name="Deep Non-vented Depth">
+                  <sml:Component>
+                     <gml:description>YSI Pressure Sensor</gml:description>
+                     <sml:identification>
+                        <sml:IdentifierList>
+                           <sml:identifier name="longName">
+                              <sml:Term definition="urn:ogc:def:property:OGC:longName">
+                                 <sml:value>Depth</sml:value>
+                              </sml:Term>
+                           </sml:identifier>
+                           <sml:identifier name="sensorType">
+                              <sml:Term definition="urn:ogc:def:property:OGC:sensorType">
+                                 <sml:value>strain gauge</sml:value>
+                              </sml:Term>
+                           </sml:identifier>
+                        </sml:IdentifierList>
+                     </sml:identification>
+                     
+                     <sml:inputs>
+                        <sml:InputList>
+                           <sml:input name="pressure">
+                              <swe:ObservableProperty
+                                 definition="http://mmisw.org/ont/ioos/parameter/pressure"/>
+                           </sml:input>
+                        </sml:InputList>
+                     </sml:inputs>
+                     
+                     <sml:outputs>
+                        <sml:OutputList>
+                           <sml:output name="depth">
+                              <swe:Quantity
+                                 definition="http://mmisw.org/ont/ioos/parameter/depth">
+                                 <swe:uom code="m"/>
+                              </swe:Quantity>
+                           </sml:output>
+                        </sml:OutputList>
+                     </sml:outputs>
+
+                     <sml:parameters>
+                        <sml:ParameterList>
+                           <sml:parameter name="range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0 200</swe:value>
+                              </swe:QuantityRange>
+                           </sml:parameter>
+                           <sml:parameter name="accuracy">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.3</swe:value>
+                              </swe:Quantity>
+                           </sml:parameter>
+                           <sml:parameter name="resolution">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.001</swe:value>
+                              </swe:Quantity>
+                           </sml:parameter>
+                           <sml:parameter name="temperature range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>-5 45</swe:value>
+                              </swe:QuantityRange>
+                           </sml:parameter>
+                        </sml:ParameterList>
+                     </sml:parameters>
+                  </sml:Component>
+               </sml:component>
+               <sml:component name="Medium Non-vented Depth">
+                  <sml:Component>
+                     <gml:description>YSI Pressure Sensor</gml:description>
+                     <sml:identification>
+                        <sml:IdentifierList>
+                           <sml:identifier name="longName">
+                              <sml:Term definition="urn:ogc:def:property:OGC:longName">
+                                 <sml:value>Depth</sml:value>
+                              </sml:Term>
+                           </sml:identifier>
+                           <sml:identifier name="sensorType">
+                              <sml:Term definition="urn:ogc:def:property:OGC:sensorType">
+                                 <sml:value>strain gauge</sml:value>
+                              </sml:Term>
+                           </sml:identifier>
+                        </sml:IdentifierList>
+                     </sml:identification>
+                     
+                     <sml:inputs>
+                        <sml:InputList>
+                           <sml:input name="pressure">
+                              <swe:ObservableProperty
+                                 definition="http://mmisw.org/ont/ioos/parameter/pressure"/>
+                           </sml:input>
+                        </sml:InputList>
+                     </sml:inputs>
+                     
+                     <sml:outputs>
+                        <sml:OutputList>
+                           <sml:output name="depth">
+                              <swe:Quantity
+                                 definition="http://mmisw.org/ont/ioos/parameter/depth">
+                                 <swe:uom code="m"/>
+                              </swe:Quantity>
+                           </sml:output>
+                        </sml:OutputList>
+                     </sml:outputs>
+                     
+                     <sml:parameters>
+                        <sml:ParameterList>
+                           <sml:parameter name="range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0 61</swe:value>
+                              </swe:QuantityRange>
+                           </sml:parameter>
+                           <sml:parameter name="accuracy">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.12</swe:value>
+                              </swe:Quantity>
+                           </sml:parameter>
+                           <sml:parameter name="resolution">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.001</swe:value>
+                              </swe:Quantity>
+                           </sml:parameter>
+                           <sml:parameter name="temperature range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>-5 45</swe:value>
+                              </swe:QuantityRange>
+                           </sml:parameter>
+                        </sml:ParameterList>
+                     </sml:parameters>
+                  </sml:Component>
+               </sml:component>
+               <sml:component name="Shallow Non-vented Depth">
+                  <sml:Component>
+                     <gml:description>YSI Pressure Sensor</gml:description>
+                     <sml:identification>
+                        <sml:IdentifierList>
+                           <sml:identifier name="longName">
+                              <sml:Term definition="urn:ogc:def:property:OGC:longName">
+                                 <sml:value>Depth</sml:value>
+                              </sml:Term>
+                           </sml:identifier>
+                           <sml:identifier name="sensorType">
+                              <sml:Term definition="urn:ogc:def:property:OGC:sensorType">
+                                 <sml:value>strain gauge</sml:value>
+                              </sml:Term>
+                           </sml:identifier>
+                        </sml:IdentifierList>
+                     </sml:identification>
+                     
+                     <sml:inputs>
+                        <sml:InputList>
+                           <sml:input name="pressure">
+                              <swe:ObservableProperty
+                                 definition="http://mmisw.org/ont/ioos/parameter/pressure"/>
+                           </sml:input>
+                        </sml:InputList>
+                     </sml:inputs>
+                     
+                     <sml:outputs>
+                        <sml:OutputList>
+                           <sml:output name="depth">
+                              <swe:Quantity
+                                 definition="http://mmisw.org/ont/ioos/parameter/depth">
+                                 <swe:uom code="m"/>
+                              </swe:Quantity>
+                           </sml:output>
+                        </sml:OutputList>
+                     </sml:outputs>
+                     
+                     <sml:parameters>
+                        <sml:ParameterList>
+                           <sml:parameter name="range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0 9.1</swe:value>
+                              </swe:QuantityRange>
+                           </sml:parameter>
+                           <sml:parameter name="accuracy">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.018</swe:value>
+                              </swe:Quantity>
+                           </sml:parameter>
+                           <sml:parameter name="resolution">
+                              <swe:Quantity>
+                                 <swe:uom code="m"/>
+                                 <swe:value>0.001</swe:value>
+                              </swe:Quantity>
+                           </sml:parameter>
+                           <sml:parameter name="temperature range">
+                              <swe:QuantityRange>
+                                 <swe:uom code="degC"/>
+                                 <swe:value>-5 45</swe:value>
+                              </swe:QuantityRange>
+                           </sml:parameter>
+                        </sml:ParameterList>
+                     </sml:parameters>
+                  </sml:Component>
+               </sml:component>
+
+               <sml:component name="Optical Dissolved Oxygen">
+               </sml:component>
+               
+               <!-- xxxx THE FOLLOWING NEED TO BE COMPLETED -->
                <sml:component name="Electrochemical Dissolved Oxygen"/>
                <sml:component name="Turbidity"/>