Merged changes from 3.14 branch.

src/ca/client/CAref.html

@@ -2826,13 +2826,13 @@ int ca_array_put_callback ( chtype TYPE, unsigned long COUNT,
 
 <p>Write a scalar or array value to a process variable.</p>
 
-<p>When ca_array_put  or ca_put are invoked the client will receive no response
+<p>When ca_put or ca_array_put are invoked the client will receive no response
 unless the request can not be fulfilled in the server. If unsuccessful an
 exception handler is run on the client side.</p>
 
-<p>When ca_array_put_callback are invoked the user supplied asynchronous call
-back is called only after the initiated write operation, and all actions
-resulting from the initiating write operation, complete.</p>
+<p>When ca_put_callback or ca_array_put_callback are invoked the user supplied
+asynchronous call back is called only after the initiated write operation, and
+all actions resulting from the initiating write operation, complete.</p>
 
 <p>If unsuccessful the call back function is invoked indicating failure status.
 </p>
@@ -2952,7 +2952,7 @@ int ca_array_get_callback ( chtype TYPE, unsigned long COUNT,
 
 <p>Read a scalar or array value from a process variable.</p>
 
-<p>When ca_get or ca_array_get are invoked the returned channel value cant be
+<p>When ca_get or ca_array_get are invoked the returned channel value can't be
 assumed to be stable in the application supplied buffer until after ECA_NORMAL
 is returned from ca_pend_io. If a connection is lost outstanding ca get
 requests are not automatically reissued following reconnect.</p>

src/ca/client/templateInstances.cpp

@@ -78,6 +78,10 @@ template comBuf :: popStatus comBuf :: pop ( unsigned char & returnVal );
 template void WireSet ( float const &, unsigned char * );
 template void WireSet ( int const &, unsigned char * );
 template void WireSet ( short const &, unsigned char * );
+template void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO
+    (epicsGuard < epicsMutex > &, syncGroupWriteNotify & );
+template void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO
+    ( epicsGuard < epicsMutex > &, syncGroupReadNotify & );
 
 
 #ifdef _MSC_VER

src/template/base/top/configure/CONFIG_SITE

@@ -13,21 +13,19 @@
 # Normally CHECK_RELEASE should be set to YES.
 # Set CHECK_RELEASE to NO to disable checking completely.
 # Set CHECK_RELEASE to WARN to perform consistency checking but
-#   continue building anyway if conflicts are found.
+#   continue building even if conflicts are found.
 CHECK_RELEASE = YES
 
 # Set this when you only want to compile this application
 #   for a subset of the cross-compiled target architectures
 #   that Base is built for.
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32
 
 # To install files into a location other than $(TOP) define
 #   INSTALL_LOCATION here.
-#INSTALL_LOCATION=</path/name/to/install/top>
+#INSTALL_LOCATION=</absolute/path/to/install/top>
 
-# Set this when your IOC and the host use different paths
-#   to access the application. This will be needed to boot
-#   from a Microsoft FTP server or with some NFS mounts.
-# You must rebuild in the iocBoot directory for this to
-#   take effect.
-#IOCS_APPL_TOP = </IOC/path/to/application/top>
+# Set this when the IOC and build host use different paths
+#   to the install location. This may be needed to boot from
+#   a Microsoft FTP server say, or on some NFS configurations.
+#IOCS_APPL_TOP = </IOC's/absolute/path/to/install/top>

src/tools/convertRelease.pl

@@ -52,9 +52,14 @@ if ($opt_T) {
 if ($opt_t) {
     $iocroot = $opt_t;
     $root = $top;
-    while (substr($iocroot, -1, 1) eq substr($root, -1, 1)) {
-        chop $iocroot;
-        chop $root;
+    if ($iocroot eq $root) {
+        # Identical paths, -t not needed
+        undef $opt_t;
+    } else {
+        while (substr($iocroot, -1, 1) eq substr($root, -1, 1)) {
+            chop $iocroot;
+            chop $root;
+        }
     }
 }