Merge ~info-martin-konrad/epics-base:fix-typos into ~epics-core/epics-base/+git/epics-base:3.15

Proposed by Martin Konrad
Status: Merged
Approved by: Andrew Johnson
Approved revision: df519ce1a203ac21057d4e9588e50740ee53e1cf
Merged at revision: f5a442c0de987ea6731d53a24f5e9620860b1f1c
Proposed branch: ~info-martin-konrad/epics-base:fix-typos
Merge into: ~epics-core/epics-base/+git/epics-base:3.15
Diff against target: 121 lines (+14/-14)
1 file modified
src/std/rec/calcoutRecord.dbd.pod (+14/-14)
Reviewer Review Type Date Requested Status
Andrew Johnson Approve
mdavidsaver Approve
Review via email: mp+376927@code.launchpad.net
To post a comment you must log in.
Revision history for this message
mdavidsaver (mdavidsaver) wrote :

Hurrah for spell cheque!

review: Approve
Revision history for this message
Andrew Johnson (anj) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/std/rec/calcoutRecord.dbd.pod b/src/std/rec/calcoutRecord.dbd.pod
2index 176f1d2..a59eaa3 100644
3--- a/src/std/rec/calcoutRecord.dbd.pod
4+++ b/src/std/rec/calcoutRecord.dbd.pod
5@@ -366,7 +366,7 @@ C<:=> : assigns a value (right hand side) to a variable (i.e. field)
6
7 =back
8
9-=head3 Parantheses, Comma, and Semicolon
10+=head3 Parentheses, Comma, and Semicolon
11
12 The open and close parentheses are supported. Nested parentheses are
13 supported.
14@@ -437,7 +437,7 @@ Result is E if (A + B)<(C + D)
15 =item
16 Result is unchanged if (A + B)>=(C + D)
17
18-From 3.14.9 onwards, this expresion must be written as
19+From 3.14.9 onwards, this expression must be written as
20 C<(A + B) < (C + D) ? E : VAL>
21
22 =back
23@@ -505,7 +505,7 @@ C<On Change> -- write output every time VAL changes, i.e., every time the
24 result of the expression changes.
25
26 =item *
27-C<When Zero> -- when record is preocessed, write output if VAL is zero.
28+C<When Zero> -- when record is processed, write output if VAL is zero.
29
30 =item *
31 C<When Non-zero> -- when record is processed, write output if VAL is
32@@ -531,9 +531,9 @@ output is executed. The field is a menu field with two options:
33 If C<Use CALC> is specified, when the record writes its
34 output it will write the result of the expression in the CALC field, that
35 is, it will write the value of the VAL field. If C<Use OCAL> is specified,
36-the record will instead write the result of the expresion in the OCAL
37+the record will instead write the result of the expression in the OCAL
38 field, which is contained in the OVAL field. The OCAL field is exactly like
39-the CALC field and has the same fuctionality it can contain the string
40+the CALC field and has the same functionality it can contain the string
41 representation of an expression which is evaluated at run-time. Thus, if
42 necessary, the record can use the result of the CALC expression to
43 determine if data should be written and can use the result of the OCAL
44@@ -548,7 +548,7 @@ the wait is over. The field DLYA is equal to 1 during the delay period. The
45 resolution of the delay entry system dependent.
46
47 The IVOA field specifies what action to take with the OUT link if the
48-Calcout record eneters an INVALID alarm status. The options are
49+Calcout record enters an INVALID alarm status. The options are
50 C<Continue normally>, C<Don't drive outputs>, and C<Set output to IVOV>.
51 If the IVOA field is C<Set output to IVOV>, the data entered into the
52 IVOV field is written to the OUT link if the record alarm severity is
53@@ -602,7 +602,7 @@ The CLCV and OLCV fields indicate the validity of the expression in the
54 CALC and OCAL fields respectfully. If the expression in invalid, the field
55 is set to one.
56
57-The DYLA field is set to one during the delay specified in ODLY.
58+The DLYA field is set to one during the delay specified in ODLY.
59
60 See L<Fields Common to All Record Types> for more information on the record
61 name (NAME) and description (DESC) fields.
62@@ -617,7 +617,7 @@ record support routines. The Calculation alarm is called by the record
63 processing routine when the CALC expression is an invalid one, upon which
64 an error message is generated.
65
66-The following alarm parametersi, which are configured by the user, define the
67+The following alarm parameters, which are configured by the user, define the
68 limit alarms for the VAL field and the severity corresponding to those
69 conditions.
70
71@@ -633,7 +633,7 @@ common to all record types.
72 These parameters are used to determine when to send monitors for the value
73 fields. These monitors are sent when the value field exceeds the last
74 monitored field by the appropriate deadband, the ADEL for archiver monitors
75-and the MDEL field for all aother types of monitors. If these fields have a
76+and the MDEL field for all other types of monitors. If these fields have a
77 value of zero, every time the value changes, monitors are triggered; if
78 they have a value of -1, every time the record is scanned, monitors are
79 triggered. See L<Monitor Specification> for a complete explanation of
80@@ -1193,13 +1193,13 @@ Retrieves PREC.
81 Sets the upper display and lower display limits for a field. If the field
82 is VAL, HIHI, HIGH, LOW, or LOLO, the limits are set to HOPR and LOPR, else
83 if the field has upper and lower limits defined they will be used, else the
84-upper and lower macimum values for the field type will be used.
85+upper and lower maximum values for the field type will be used.
86
87 =head2 C<get_control_double>
88
89 Sets the upper control and lower control limits for a field. If the VAL,
90 HIHI, HIGH, LOW, or LOLO, the limits are set to HOPR and LOPR, else if the
91-field has upper and lower limits defimed they will be used, else the upper
92+field has upper and lower limits defined they will be used, else the upper
93 and lower maximum values for the field will be used.
94
95 =head2 C<get_alarm_double>
96@@ -1241,7 +1241,7 @@ honors the alarm hysteresis factor (HYST). Thus the value must change by at
97 least HYST before the alarm status and severity changes.
98
99 =item 4.
100-Determin if the Output Execution Option (OOPT) is met. If it met, either
101+Determine if the Output Execution Option (OOPT) is met. If it met, either
102 execute the output link (and output event) immediately (if ODLY = 0), or
103 schedule a callback after the specified interval. See the explanation for
104 the C<execOutput()> routine below.
105@@ -1267,7 +1267,7 @@ NSEV and NSTA are reset to 0
106 =back
107
108 =item 6.
109-If no output delay was specified, scan forwark link if necessaru, set PACT
110+If no output delay was specified, scan forward link if necessary, set PACT
111 FALSE, and return.
112
113 =back
114@@ -1290,7 +1290,7 @@ put the value of OVAL to the OUT link and post the event in OEVT (if
115 non-zero).
116
117 =item 4.
118-If an output delay was implemented, process the forwark link.
119+If an output delay was implemented, process the forward link.
120
121 =back
122

Subscribers

People subscribed via source and target branches