Skip to content

Commit f649bfa

Browse files
committedNov 21, 2021
consistently use the term mergingObject in the docs
1 parent 0433f54 commit f649bfa

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed
 

‎docs/api.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -527,14 +527,14 @@ logger.info('hello world')
527527
// {"level":30,"time":1531257112193,"msg":"hello world","pid":55956,"hostname":"x"}
528528
```
529529
530-
The `message` parameter takes precedence over the `mergedObject`.
531-
That is, if a `mergedObject` contains a `msg` property, and a `message` parameter
530+
The `message` parameter takes precedence over the `mergingObject`.
531+
That is, if a `mergingObject` contains a `msg` property, and a `message` parameter
532532
is supplied in addition, the `msg` property in the output log will be the value of
533-
the `message` parameter not the value of the `msg` property on the `mergedObject`.
533+
the `message` parameter not the value of the `msg` property on the `mergingObject`.
534534
See [Avoid Message Conflict](/docs/help.md#avoid-message-conflict) for information
535535
on how to overcome this limitation.
536536
537-
If no `message` parameter is provided, and the `mergedObject` is of type `Error` or it has a property named `err`, the
537+
If no `message` parameter is provided, and the `mergingObject` is of type `Error` or it has a property named `err`, the
538538
`message` parameter is set to the `message` value of the error.
539539
540540
The `messageKey` option can be used at instantiation time to change the namespace

0 commit comments

Comments
 (0)
Please sign in to comment.