Merge pull request #2186 from truenas/revert-2185-revert-2177-PD-692_…

…22.12.4docs

PD-692: 22.12.4 docs (Reopened)

content/API/_index.md

@@ -14,7 +14,3 @@ Alternatively, append `/api/docs/` to your TrueNAS hostname or IP address in a b
 For convenience, we store static builds of the current 2.0 API documentation on the Docs Hub:
 * [Websocket Protocol](/api/scale_websocket_api.html)
 * [RESTful](/api/scale_rest_api.html)
-
-## SCALE Documentation Sections
-
-{{< include file="/_includes/SCALEDocsSections.md" >}}

content/GettingStarted/SCALEReleaseNotes.md

@@ -28,10 +28,8 @@ Want to collaborate on TrueNAS SCALE? Join our [Official Discord Server.](https:
 {{< truetable >}}
 | Version | Checkpoint | Scheduled Date |
 |---------|------------|----------------|
-| SCALE 22.12.4 (Bluefin) | Code-freeze | 13 September 2023 |
-|                         | Internal Testing Sprints | 18 - 30 September 2023 |
-|                         | Tag | 2 October 2023 |
-|                         | **Release** | **3 October 2023** |
+| SCALE 22.12.5 (Bluefin) | Tag | TBD |
+|                         | **Release** | **TBD** |
 {{< /truetable >}}
 
 ## Obtaining the Release
@@ -51,7 +49,32 @@ Manual update files are also available at this location.
 
 To upgrade an existing SCALE install, log in to your SCALE web interface and go to **System Settings > Update**.
 
-## 22.12.3.3
+## 22.12.4
+**October 3, 2023**
+
+iXsystems is pleased to release TrueNAS SCALE 22.12.4!
+
+Notable changes:
+
+* Users with active or enabled [deprecated services]({{< relref "SCALEDeprecatedFeatures.md" >}}) in 22.12.4 are alerted to address these deprecated features before attempting to upgrade to a new TrueNAS SCALE major version.
+* WebDAV share creation is disabled [NAS-122280](https://ixsystems.atlassian.net/browse/NAS-122280). The related [WebDAV application]({{< relref "WebDAV.md" >}}) is available instead.
+* Samba updated to 4.17.0 [NAS-123131](https://ixsystems.atlassian.net/browse/NAS-123131)
+* Numerous [security](https://security.truenas.com/scale/) updates.
+* Numerous bugfixes to Apps features.
+* Replication hotfix from ZFS 2.1 update (NAS-123123)[https://ixsystems.atlassian.net/browse/NAS-123123].
+* New option in replication tasks for the destination dataset to inherit encryption from its parent dataset [NAS-121898](https://ixsystems.atlassian.net/browse/NAS-121898).
+
+<a href="https://ixsystems.atlassian.net/issues/?filter=10391" target="_blank">Click here for the full changelog</a> of completed tickets that are included in the 22.12.4 release.
+To switch between detail and list views for the changelog, press `t`.
+Open the changelog in Jira to see the <span class="iconify" data-icon="mdi:export-variant"></span> **Export** menu to print or download the changelog in various file formats.
+
+### 22.12.4 Ongoing Issues
+
+<a href="https://ixsystems.atlassian.net/issues/?filter=10392" target="_blank">Click here to see the latest information</a> about issues discovered in 22.12.4 that are being resolved in a future TrueNAS SCALE release.
+
+## 22.12.3.3 through 22.12.3
+
+{{< expand "22.12.3 through 22.12.3.3" "v">}}
 **July 25, 2023**
 
 iXsystems is pleased to release TrueNAS SCALE 22.12.3.3!
@@ -272,6 +295,7 @@ Click the component version number to see the latest release notes for that comp
 * [NAS-121907](https://ixsystems.atlassian.net/browse/NAS-121907) cannot create datasets after upgrade to 12.12.2
 * [NAS-121944](https://ixsystems.atlassian.net/browse/NAS-121944) After using the Rest API command \(incorrect parameter\) /kubernetes/backup\_chart\_releases, snapshots are nonfunctional
 * [NAS-122057](https://ixsystems.atlassian.net/browse/NAS-122057) UI should adapt to the change of official catalog being renamed
+{{< /expand >}}
 
 ## 22.12.2 
 {{< expand "22.12.2" "v">}}

content/SCALEUIReference/DataProtection/ReplicationScreensSCALE.md

@@ -173,6 +173,7 @@ After selecting **Encryption** more setting options display.
 | Setting | Description |
 |---------|-------------|
 | **Encryption** | Select to use encryption when replicating data. Displays the **Encryption Key Format** and **Store Encryption key in Sending TrueNAS database** options. |
+| **Inherit Encryption** | Select for the target dataset to inherit encryption from its parent dataset. |
 | **Encryption Key Format** | Select the encryption option from the dropdown list. **Hex** (base 16 numeral) or **Passphrase** (alphanumeric) style encryption key. Selecting **Hex** displays the **Generate Encryption Key** option. Selecting **Passphrase** displays the **Passphrase** option. |
 | **Generate Encryption Key** | Displays after selecting **Hex** in **Encryption Key Format**. Displays selected by default. Clearing the checkbox displays the **Encryption Key** field. |
 | **Encryption Key** | Displays after clearing the **Generate Encryption key** checkbox. Use to import a custom hex key. |

content/_includes/SCALEWebDAVDeprecation.md

@@ -1,8 +1,8 @@
 

 
 {{< hint type=warning >}}
-SCALE 22.12.3 deprecates the built-in WebDAV sharing feature and no longer allows creating new WebDAV shares from these screens.
-All existing WebDAV shares remain saved and continue to be editable until the next major release of TrueNAS SCALE (23.10) removes the **Sharing > WebDAV** and **System Settings > Services > WebDAV** screens from the TrueNAS web interface.
+SCALE 22.12.3 and continuing with SCALE 22.12.4 deprecates the built-in WebDAV sharing feature and no longer allows creating new WebDAV shares from these screens.
+All existing WebDAV shares remain saved and continue to be editable until the next major TrueNAS SCALE version ([23.10](https://www.truenas.com/docs/scale/23.10/)) removes the **Sharing > WebDAV** and **System Settings > Services > WebDAV** screens from the TrueNAS web interface.
 
 To create new or migrate existing WebDAV sharing configurations, see the [**webdav** application tutorial]({{< relref "WebDAV.md" >}})
 {{< /hint >}}

static/api/scale_rest_api.html

@@ -12,7 +12,7 @@
   <div id="root" class="swagger-ui" />
   <script>
     const ui = SwaggerUIBundle({
-      url: 'https://www.truenas.com/docs/files/scale_22.12.3_apiv2.json',
+      url: 'https://www.truenas.com/docs/files/scale_22.12.4_apiv2.json',
       dom_id: '#root'
     });
   </script>