Merge remote-tracking branch 'upstream/master' into Snapshots

.gitignore

@@ -49,5 +49,14 @@ Temporary Items
 # Sublime text SFTP configuration file
 sftp-config.json
 
+# =========================
+# Exclude these dirs commonly found in /usr/local
+bin/
+games/
+info/
+lib64/
+man/
+share/
+
 # Auto-generated when emhttpd/webGUI start
-languages/en_US/helptext.dot
+emhttp/languages/en_US/helptext.dot

emhttp/languages/en_US/helptext.txt

@@ -607,9 +607,7 @@ disable these services while mover is running.
 :share_edit_copy_on_write_help:
 Set to **No** to cause the *btrfs* NOCOW (No Copy-on-Write) attribute to be set on the share directory
 when created on a device formatted with *btrfs* file system.  Once set, newly created files and
-subdirectories on the device will inherit the NOCOW attribute.  We recommend this setting for shares
-used to store vdisk images, including the Docker loopback image file.  This setting has no effect
-on non-btrfs file systems.
+subdirectories on the device will inherit the NOCOW attribute. This setting has no effect on non-btrfs file systems.
 
 Set to **Auto** for normal operation, meaning COW **will** be in effect on devices formatted with *btrfs*.
 :end
@@ -623,12 +621,9 @@ Share can *not* be deleted as long as it contains data. Be aware that some data
 :end
 
 :share_edit_exclusive_access_help:
-When set to "yes" indicates a bind-mount directly to a pool has been set up for the share in the /mnt/user tree, provided the following
-conditions are met:
+When set to "Yes" indicates a synmlink directly to a pool has been set up for the share in the /mnt/user tree.
 
-- Primary storage is a pool.
-- Secondary storage is set to **none**.
-- The share does not exist on any other volumes.
+Refer to [Global Share Settings](Settings/ShareSettings) -> Permit exclusive shares.
 :end
 
 :share_edit_primary_storage_help:
@@ -1449,6 +1444,19 @@ Uncheck all disks in order to not exclude any disks
 disks which represent a subset of the Included/Excluded disks defined here.
 :end
 
+:shares_exclusive_shares_help:
+If set to Yes, share directories under /mnt/user are actually symlinks to the share directory on a storage volume
+provided the following conditions are met:
+
+* The Primary storage for a share is set to a pool.
+* The Secondary storage for a share is set to **none**.
+* The share exists on a single volume.
+* The share is **not** exported over NFS.
+
+The advantage of *exclusive* shares is that transfers bypass the FUSE layer which may significantly
+increase I/O performance.
+:end
+
 :shares_tunable_hard_links_help:
 If set to Yes then support the link() operation.
 
@@ -1848,6 +1856,18 @@ Select the gateway from the dropdown list or enter a valid IPv4/IPv6 address as
 The metric value is optional, it defaults to 1. Use it to select the preferred gateway when more than one entry of the same route exists.
 :end
 
+:eth_network_extra_include_help:
+Enter one or more interface names or IP addresses which will be included in the list of listening interfaces for local system services.
+
+This is particularly useful when you have created custom interfaces (e.g. tailscale VPN tunnel) which are used to access local system services.
+:end
+
+:eth_network_extra_exclude_help:
+Enter one or more interface names or IP addresses which will be excluded from the list of listening interfaces for local system services.
+
+This can be used to exclude dedicated local interfaces (e.g. p-t-p connections) or exclude dynamic interfaces (WireGuard tunnels) from using local system services.
+:end
+
 :apc_ups_daemon_help:
 Set to 'Yes' to enable apcupsd and start the daemon, set to 'No' to disable apcupsd and stop the daemon.
 :end

emhttp/plugins/dynamix.docker.manager/DockerContainers.page

@@ -99,7 +99,7 @@ function LockButton() {
     $('#docker_list .sortable').css({'cursor':'move'});
 <?if ($themes1):?>
     $('div.nav-item.LockButton').find('a').prop('title',"_(Lock sortable items)_");
-    $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock red-text').addClass('icon-u-lock-open green-text');
+    $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock green-text').addClass('icon-u-lock-open red-text');
 <?endif;?>
     $('div.nav-item.LockButton').find('span').text("_(Lock sortable items)_");
     $('#docker_list').sortable({helper:'clone',items:'.sortable',cursor:'grab',axis:'y',containment:'parent',cancel:'span.docker_readmore,input',delay:100,opacity:0.5,zIndex:9999,forcePlaceholderSize:true,
@@ -116,7 +116,7 @@ function LockButton() {
     $('#docker_list .sortable').css({'cursor':'default'});
 <?if ($themes1):?>
     $('div.nav-item.LockButton').find('a').prop('title',"_(Unlock sortable items)_");
-    $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock-open green-text').addClass('icon-u-lock red-text');
+    $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock-open red-text').addClass('icon-u-lock green-text');
 <?endif;?>
     $('div.nav-item.LockButton').find('span').text("_(Unlock sortable items)_");
     $('#docker_list').sortable('destroy');

emhttp/plugins/dynamix.vm.manager/VMMachines.page

@@ -435,7 +435,7 @@ function LockButton() {
     $('#kvm_list .sortable').css({'cursor':'move'});
 <?if ($themes1):?>
     $('div.nav-item.LockButton a').prop('title',"_(Lock sortable items)_");
-    $('div.nav-item.LockButton b').removeClass('icon-u-lock red-text').addClass('icon-u-lock-open green-text');
+    $('div.nav-item.LockButton b').removeClass('icon-u-lock green-text').addClass('icon-u-lock-open red-text');
 <?endif;?>
     $('div.nav-item.LockButton span').text("_(Lock sortable items)_");
     $('#kvm_list').sortable({helper:sortableHelper,items:'.sortable',cursor:'grab',axis:'y',containment:'parent',delay:100,opacity:0.5,zIndex:9999,forcePlaceholderSize:true,
@@ -458,7 +458,7 @@ function LockButton() {
     $('#kvm_list .sortable').css({'cursor':'default'});
 <?if ($themes1):?>
     $('div.nav-item.LockButton a').prop('title',"_(Unlock sortable items)_");
-    $('div.nav-item.LockButton b').removeClass('icon-u-lock-open green-text').addClass('icon-u-lock red-text');
+    $('div.nav-item.LockButton b').removeClass('icon-u-lock-open red-text').addClass('icon-u-lock green-text');
 <?endif;?>
     $('div.nav-item.LockButton span').text("_(Unlock sortable items)_");
     $('#kvm_list').sortable('destroy');

emhttp/plugins/dynamix.vm.manager/VMSettings.page

@@ -24,7 +24,7 @@ require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
 $hardware = !empty(shell_exec("/etc/rc.d/rc.libvirt test"));
 if (!$hardware) {
   echo "<p class='notice'>"._('Your hardware does not have Intel VT-x or AMD-V capability').". "._('This is required to create VMs in KVM').". "._('Please disable the VM function').". ";
-  echo "<a href='https://wiki.unraid.net/Manual/VM_Management#Determining_HVM.2FIOMMU_Hardware_Support' target='_blank'> "._('Click here to see the Unraid Wiki for more information')."</a></p>";
+  echo "<a href='https://docs.unraid.net/unraid-os/manual/vm-management#determining-hvmiommu-hardware-support' target='_blank'> "._('Click here to see the Unraid Wiki for more information')."</a></p>";
 }
 
 function scan($area, $text) {