Merge branch 'dev' into pr_3438

packages/node_modules/@node-red/nodes/locales/en-US/common/60-link.html

@@ -29,8 +29,8 @@
     <p>Create virtual wires between flows.</p>
     <h3>Details</h3>
     <p>This node can be configured to either send messages to all <code>link in</code>
-        nodes it is connected to, or to send a response back to the <code>link call</code>
-        node that triggered the flow.</p>
+       nodes it is connected to, or to send a response back to the <code>link call</code>
+       node that triggered the flow.</p>
     <p>When in 'send to all' mode, the wires between link nodes are only displayed when
        the node is selected. If there are any wires to other tabs, a virtual node
        is shown that can be clicked on to jump to the appropriate tab.</p>
@@ -39,12 +39,27 @@
 
 <script type="text/html" data-help-name="link call">
     <p>Calls a flow that starts with a <code>link in</code> node and passes on the response.</p>
+    <h3>Inputs</h3>
+    <dl class="message-properties">
+      <dt class="optional">target<span class="property-type">string</span></dt>
+      <dd>When the option <b>Link Type</b> is set to "Dynamic target", set <code>msg.target</code> to the name of the
+          <code>link in</code> node you wish to call.</dd>
+    </dl>
     <h3>Details</h3>
     <p>This node can be connected to a <code>link in</code> node that exists on any tab.
        The flow connected to that node must end with a <code>link out</code> node configured
        in 'return' mode.</p>
     <p>When this node receives a message, it is passed to the connected <code>link in</code> node.
-       It then waits for a response which it then sends on.</o>
+       It then waits for a response which it then sends on.</p>
     <p>If no response is received within the configured timeout, default 30 seconds, the node
        will log an error that can be caught using the <code>catch</code> node.</p>
+    <p>When the option <b>Link Type</b> is set to "Dynamic target" <code>msg.target</code> can be used to call a
+       <code>link in</code> by name. The target <code>link in</code> node must be named.
+    <ul>
+      <li>If there are 2 <code>link in</code> nodes with the same name, an error will be raised</li>
+      <li>A <code>link call</code> cannot call a <code>link in</code> node inside a subflow</li>
+    </ul>
+    </p>
+    The flow connected to that node must end with a <code>link out</code> node configured
+    in 'return' mode.</p>
 </script>

packages/node_modules/@node-red/nodes/locales/en-US/messages.json

@@ -174,7 +174,11 @@
         "outMode": "Mode",
         "sendToAll": "Send to all connected link nodes",
         "returnToCaller": "Return to calling link node",
-	"timeout": "timeout",
+        "timeout": "timeout",
+        "linkCallType": "Link Type",
+        "staticLinkCall": "Fixed target",
+        "dynamicLinkCall": "Dynamic target (msg.target)",
+        "dynamicLinkLabel": "Dynamic",
         "error": {
             "missingReturn": "Missing return node information"
         }
@@ -439,7 +443,8 @@
             "action": "Action",
             "staticTopic": "Subscribe to single topic",
             "dynamicTopic": "Dynamic subscription",
-            "auto-connect": "Connect automatically"
+            "auto-connect": "Connect automatically",
+            "auto-mode-depreciated": "This option is depreciated. Please use the new auto-detect mode."
         },
         "sections-label":{
             "birth-message": "Message sent on connection (birth message)",
@@ -470,6 +475,7 @@
             "string": "a String",
             "base64": "a Base64 encoded string",
             "auto": "auto-detect (string or buffer)",
+            "auto-detect": "auto-detect (parsed JSON object, string or buffer)",
             "json": "a parsed JSON object"
         },
         "true": "true",
@@ -607,7 +613,8 @@
             "ms": "ms",
             "chars": "chars",
             "close": "Close",
-            "optional": "(optional)"
+            "optional": "(optional)",
+            "reattach": "re-attach delimiter"
         },
         "type": {
             "listen": "Listen on",

packages/node_modules/@node-red/nodes/locales/en-US/network/21-httprequest.html

@@ -25,7 +25,7 @@
         <dd>If not configured in the node, this optional property sets the HTTP method of the request.
             Must be one of <code>GET</code>, <code>PUT</code>, <code>POST</code>, <code>PATCH</code> or <code>DELETE</code>.</dd>
         <dt class="optional">headers <span class="property-type">object</span></dt>
-        <dd>Sets the HTTP headers of the request.</dd>
+        <dd>Sets the HTTP headers of the request. NOTE: Any headers set in the node configuration will overwrite any matching headers in <code>msg.headers</code> </dd>
         <dt class="optional">cookies <span class="property-type">object</span></dt>
         <dd>If set, can be used to send cookies with the request.</dd>
         <dt class="optional">payload</dt>