Skip to content

Conversation

bugclerk
Copy link
Contributor

Automatic cherry-pick failed. Please resolve conflicts by running:

git reset --hard HEAD~1
git cherry-pick -x 6c0b7aba57a31d34a761884adfbbc921de4d8442
git cherry-pick -x 1f18d47969250fc6e493c6a355a36ff9860a7ed6
git cherry-pick -x e6a5f46531f305d4d82021bc837e7ef1c6d4eabc
git cherry-pick -x 595a8997746c1ecc917be008408ac883339efc44

If the original PR was merged via a squash, you can just cherry-pick the squashed commit:

git reset --hard HEAD~1
git cherry-pick -x 6e8b993b5102bd69f9a43ebed697817f9ecfdc1c

This PR adds the TNC certificate content that was commented out until TNC became visible in the TrueNAS UI.
This applies to 25.10.

Backport to 25.10

Thanks for contributing to TrueNAS documentation! By opening a Pull Request, you're acknowledging that your changes will be distributed under the Creative Commons 4.0 license.

Original PR: #4173
Jira URL: https://ixsystems.atlassian.net/browse/PD-1951

micjohnson777 and others added 2 commits October 7, 2025 09:17
…4173)

* PD-1951 Changes to CertificatesSCALE.md

this commit adds TNC certificate information to the CertificatesSCALE.md article.
This content remains private until we are ready to publish TNC content.

* PD-1951 Feedback Updates

This commit covers changes requested by Solutions

---------

Co-authored-by: linzibelle <[email protected]>
(cherry picked from commit 6e8b993)
@micjohnson777 micjohnson777 marked this pull request as ready for review October 7, 2025 13:18
@micjohnson777 micjohnson777 requested a review from a team as a code owner October 7, 2025 13:18
Copy link

github-actions bot commented Oct 7, 2025

Vale Style Guide Issues (Previous - Click to expand)

Vale Style Guide Issues

📊 Summary: 10 issues found in changed files - 0 errors, 0 warnings, 10 suggestions

Changed files with issues:

content/SCALETutorials/Credentials/Certificates/CertificatesSCALE.md (10 issues)

  • Line 13 - suggestion: Spell out 'ACME' on first use
  • Line 13 - suggestion: Spell out 'DNS' on first use
  • Lines 25, 27 - suggestion: Use proper formatting: bold for UI elements, italics for variables, backticks for commands
  • Line 27 - suggestion: Avoid contractions in formal writing
  • Line 27 - suggestion: Spell out 'TNC' on first use
  • Line 47 - suggestion: Verify your use of 'allows' with the A-Z word list.

🔧 To fix: Review the issues above and update your documentation accordingly.

Copy link

github-actions bot commented Oct 7, 2025

Vale Style Guide Issues

📊 Summary: 10 issues found in changed files - 0 errors, 0 warnings, 10 suggestions

Changed files with issues:

content/SCALETutorials/Credentials/Certificates/CertificatesSCALE.md (10 issues)

  • Line 13 - suggestion: Spell out 'ACME' on first use
  • Line 13 - suggestion: Spell out 'DNS' on first use
  • Lines 25, 27 - suggestion: Use proper formatting: bold for UI elements, italics for variables, backticks for commands
  • Line 27 - suggestion: Avoid contractions in formal writing
  • Line 27 - suggestion: Spell out 'TNC' on first use
  • Line 47 - suggestion: Verify your use of 'allows' with the A-Z word list.

🔧 To fix: Review the issues above and update your documentation accordingly.

@linzi-ix linzi-ix added the Technical Writer Review (LM) A technical writer is reviewing the PR. label Oct 7, 2025
@linzi-ix linzi-ix merged commit 3afaac8 into 25.10 Oct 7, 2025
4 checks passed
@linzi-ix linzi-ix deleted the PD-1951-25.10 branch October 7, 2025 15:54
@bugclerk
Copy link
Contributor Author

bugclerk commented Oct 7, 2025

This PR has been merged and conversations have been locked.
If you would like to discuss more about this issue please use our forums or raise a Jira ticket.

@truenas truenas locked as resolved and limited conversation to collaborators Oct 7, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Technical Writer Review (LM) A technical writer is reviewing the PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants