Some more doc updates

Author: knolleary

docs/user-guide/environment-variables.md

@@ -88,6 +88,13 @@ instances of the Subflow can then be customised for those particular types.
 
 Environment variables can be set at the flow or group level. This is done in the appropriate tab in the edit dialog for the flow or group.
 
+### Global environment variables
+
+*Since [Node-RED 3.1](/blog/2023/09/06/version-3-1-released#global-environment-variables)*
+
+Environment variables can be set at a global level within the editor. This is done in the User Settings dialog.
+
+
 ### Accessing nested environment variables
 
 When accessing an environment variable in a subflow, Node-RED will search the
@@ -134,6 +141,10 @@ The following environment variables can be used to access this information for a
 - `NR_GROUP_NAME` - the Name of the containing group
 - `NR_FLOW_ID` - the ID of the flow the node is on
 - `NR_FLOW_NAME` - the Name of the flow the node is on
+- `NR_SUBFLOW_NAME` - the Name of the containing subflow instance node (*since Node-RED 3.1*)
+- `NR_SUBFLOW_ID` - the ID of the containing subflow instance node (*since Node-RED 3.1*)
+- `NR_SUBFLOW_PATH` - the Path of the containing subflow instance node (*since Node-RED 3.1*)
+
 
 Note that while the IDs generated by Node-RED are guaranteed to be unique, the names are not. If a node, flow or group does not have a given name, the corresponding environment variable will be an empty string. If a node is not part of a group, its group id environment variable will also return an empty string.
 

docs/user-guide/runtime/configuration.md

@@ -91,8 +91,24 @@ httpStatic
   served from the top level url, `/`. When this property is used, `httpAdminRoot` must
   also be used to make editor UI available at a path other than `/`.
 
+  This property can also be set as an Array to support multiple static directories, each
+  with its own set of options. The options include the path to the local directory to serve
+  content from, the root url to serve them from and an optional custom middleware function.
+  
+  For example:
+
+      httpStatic: [
+        {
+            path: '/opt/static/',
+            root: '/private/',
+            middleware: myCustomHttpMiddleware
+        }
+      ]
+
   *Standalone only*.
 
+
+
 httpStaticAuth
 : enabled HTTP Basic Authentication on the static content. See `httpAdminAuth` for format.
 
@@ -257,6 +273,10 @@ functionGlobalContext
 functionExternalModules
 : if set to `true`, the Function node's Setup tab will allow adding additional modules that will become available to the function. See [Writing Functions](../writing-functions#using-the-functionexternalmodules-option) for more information. Default: `false`.
 
+functionTimeout
+: Function Nodes - the default timeout, in seconds, to apply to newly configured Function nodes.
+  Default: 0 - meaning no timeout.
+
 debugMaxLength
 : Debug Nodes - the maximum length, in characters, of any message sent to the
   debug sidebar tab. Default: 1000

docs/user-guide/writing-functions.md

@@ -459,12 +459,13 @@ The modules are automatically installed under `~/.node-red/externalModules/` whe
 
 
 
+### Handling a Timeout
 
+*Since Node-RED 3.1.0*
 
-
-
-
-
+It is possible to set a timeout for the function node on the Setup tab. This value,
+in seconds, is how long the runtime will allow the Function node to run for before
+raising an error. If set to 0, the default, no timeout is applied.
 
 ***