Index: q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml
===================================================================
--- q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml (revision 400)
+++ q2o/sos_unc/trunk/sos_unc/YSI_6Series_6600V2.xml (revision 401)
@@ -153,5 +153,5 @@
                   </swe:QuantityRange>
                </swe:field>
-             </swe:DataRecord>
+            </swe:DataRecord>
          </sml:capabilities>
 
@@ -185,5 +185,5 @@
          <!--============       System Documentation       ============-->
          <!--==========================================================-->
-         
+
          <sml:documentation xlink:arcrole="website">
             <sml:Document>
@@ -337,8 +337,6 @@
          <sml:parameters>
             <sml:ParameterList>
-
                <sml:parameter name="SondeParameters">
                   <swe:DataRecord>
-
                      <swe:field name="Latitude">
                         <swe:Quantity definition="urn:ysi:def:property:::Latitude">
@@ -353,5 +351,4 @@
                         </swe:Quantity>
                      </swe:field>
-
                      <swe:field name="Altitude">
                         <swe:Quantity definition="urn:ysi:def:property:::Altitude">
@@ -361,11 +358,8 @@
                         </swe:Quantity>
                      </swe:field>
-
                   </swe:DataRecord>
                </sml:parameter>
-
                <sml:parameter name="CommunicationsParameters">
                   <swe:DataRecord>
-
                      <swe:field name="communicationsType">
                         <swe:Category>
@@ -377,5 +371,4 @@
                         </swe:Category>
                      </swe:field>
-
                      <swe:field name="communicationBaudRate">
                         <swe:Quantity definition="urn:ysi:def:property:::baudRate">
@@ -390,5 +383,4 @@
                         </swe:Quantity>
                      </swe:field>
-
                      <swe:field name="SDIAddress">
                         <swe:Quantity definition="urn:ysi:def:property:::SDIAddress">
@@ -402,8 +394,6 @@
                         </swe:Quantity>
                      </swe:field>
-
                   </swe:DataRecord>
                </sml:parameter>
-
             </sml:ParameterList>
          </sml:parameters>
@@ -415,19 +405,18 @@
             <sml:ComponentList>
 
-               <sml:component name="Conductivity" 
-                  xlink:href="./YSI_conductivity.xml"/>
-               <sml:component name="Temperature">
+               <sml:component name="Conductivity"
+                  xlink:href="http://svn.nccoos.org/dataproc/q2o/sos_unc/trunk/sos_unc/YSI_conductivity.xml">
                   <sml:Component>
-                     <gml:description>YSI Temperature Sensor</gml:description>
+                     <gml:description>YSI Conductivity 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:value>Conductivity</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:value>Four Electrode Cell</sml:value>
                               </sml:Term>
                            </sml:identifier>
@@ -435,25 +424,51 @@
                      </sml:identification>
 
+                     <sml:inputs>
+                        <sml:InputList>
+                           <sml:input name="conductivity">
+                              <swe:ObservableProperty
+                                 definition="http://mmisw.org/ont/ioos/parameter/conductivity"/>
+                           </sml:input>
+                        </sml:InputList>
+                     </sml:inputs>
+
+                     <sml:outputs>
+                        <sml:OutputList>
+                           <sml:output name="conductivity">
+                              <swe:Quantity
+                                 definition="http://mmisw.org/ont/ioos/parameter/conductivity">
+                                 <swe:uom code="mS/cm"/>
+                              </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:uom code="mS/cm"/>
+                                 <swe:value>0 100</swe:value>
                               </swe:QuantityRange>
                            </sml:parameter>
-                           <sml:parameter name="accuracy">                              
+                           <sml:parameter name="accuracy">
                               <swe:Quantity>
-                                 <swe:uom code="degC"/>
-                                 <swe:value>0.15</swe:value>
+                                 <swe:uom code="mS/cm"/>
+                                 <swe:value>0.0001</swe:value>
                               </swe:Quantity>
                            </sml:parameter>
-                           <sml:parameter name="resolution">                              
-                              <swe:Quantity>
+                           <sml:parameter name="resolution">
+                              <swe:QuantityRange>
+                                 <swe:uom code="mS/cm"/>
+                                 <swe:value>0.001 0.1</swe:value>
+                              </swe:QuantityRange>
+                           </sml:parameter>
+                           <sml:parameter name="temperature range">
+                              <swe:QuantityRange>
                                  <swe:uom code="degC"/>
-                                 <swe:value>0.01</swe:value>
-                              </swe:Quantity>
+                                 <swe:value>-5 30</swe:value>
+                              </swe:QuantityRange>
                            </sml:parameter>
-                           <sml:parameter name="max depth">                              
+                           <sml:parameter name="max depth">
                               <swe:Quantity>
                                  <swe:uom code="m"/>
@@ -463,27 +478,10 @@
                         </sml:ParameterList>
                      </sml:parameters>
-
                   </sml:Component>
                </sml:component>
-
-               <sml:component name="Pressure">
-                  <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>Differential Stainless Strain Gauge</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: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 -->
@@ -500,8 +498,12 @@
          </sml:components>
 
+         <sml:positions/>
+
          <!--==============================-->
          <!--      System Connections      -->
          <!--==============================-->
 
+         <sml:connections/>
+
       </sml:System>
    </sml:member>