From 268e59b052e41fc71144ee73f1b285bd28ae6a33 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 5 Sep 2016 15:38:16 -0500
Subject: [PATCH] Minor updates

---
 src/std/link/links.dbd.pod | 4 +++-
 src/std/link/lnkCalc.c     | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/std/link/links.dbd.pod b/src/std/link/links.dbd.pod
index 3e9199947..a7ddeb553 100644
--- a/src/std/link/links.dbd.pod
+++ b/src/std/link/links.dbd.pod
@@ -39,7 +39,9 @@ target field at that time.
 Note that for most record types (the C<printf> and C<calcout> records are
 exceptions) it is pointless to set an input link to a constant link at runtime
 since the link initialization that loads the field value usually only happens
-when a record is initialized.
+when a record is initialized. A constant link that is embedded inside another
+input link type such as a calculation link should be OK though since the link
+initialization will take place when the record's field gets set.
 
 =head4 Parameters
 
diff --git a/src/std/link/lnkCalc.c b/src/std/link/lnkCalc.c
index 0f5f205c3..7021e40b4 100644
--- a/src/std/link/lnkCalc.c
+++ b/src/std/link/lnkCalc.c
@@ -353,11 +353,16 @@ static void lnkCalc_report(const jlink *pjlink, int level, int indent)
         clink->units ? clink->units : "");
 
     if (level > 0) {
+        if (clink->sevr)
+            printf("%*s  Alarm: %s, %s\n", indent, "",
+                epicsAlarmSeverityStrings[clink->sevr],
+                epicsAlarmConditionStrings[clink->stat]);
+
         if (clink->post_major)
-            printf("%*s  Major alarm: \"%s\"\n", indent, "",
+            printf("%*s  Major expression: \"%s\"\n", indent, "",
                 clink->major);
         if (clink->post_minor)
-            printf("%*s  Minor alarm: \"%s\"\n", indent, "",
+            printf("%*s  Minor expression: \"%s\"\n", indent, "",
                 clink->minor);
 
         for (i = 0; i < clink->nArgs; i++) {