Skip to content

Conversation

@kim-horvatin-netwrix
Copy link
Contributor

Password Reset 3.3 - Updated image links, added images, and deleted folders.

…ssword Policy Enforcer docs in general_tab.md and using.md.
@kim-horvatin-netwrix
Copy link
Contributor Author

Fixed broken links.

❌ passwordreset\3.3\administrationoverview\configuringpasswordreset\email_tab.md (1 broken links):
Line 89: Enabling the API
Expected: C:\docs\docs\passwordreset\3.3\administration\persuading_users_to_enroll.md

❌ passwordreset\3.3\administrationoverview\configuringpasswordreset\general_tab.md (1 broken links):
Line 111: [Password Policy Client](/docs/passwordreset/3.3/passwordpolicyenforcer/administration/password_policy_cl Expected: C:\docs\docs\passwordreset\3.3\passwordpolicyenforcer\administration\password_policy_client.md
Expected: C:\docs\docs\passwordreset\3.3\passwordpolicyenforcer\administration\password_policy_client.md

❌ passwordreset\3.3\evaluationoverview\using.md (1 broken links):
Line 32: Administration
Expected: C:\docs\docs\passwordreset\3.3\passwordpolicyenforcer\administration\administration_overview.md

@JoeDibley
Copy link
Contributor

Looks like deployment is moaning about a conflict. You should be able to do the following to fix it:

  • Ensure your git is on the branch for this pr
  • Open Command Prompt / PowerShell / Terminal
  • Run the following
git fetch origin
git merge origin/main
  • Then do your push as usual.

@stuart-jaeckel-netwrix
Copy link
Contributor

@JoeDibley The development deployment is always failing on this error saying conflict merging into main. The main branch shouldn't be being merged into the branch when building dev, so it doesn't make sense. We are waiting for Jordan to have time to look at fixing the deployment. However, when we merge PRs into the dev branch the changes are getting published to the dev site anyway.

@kim-horvatin-netwrix kim-horvatin-netwrix merged commit cad8e8b into dev Jul 10, 2025
1 of 2 checks passed
@kim-horvatin-netwrix kim-horvatin-netwrix deleted the kim/passwordreset-3.3-sidebar branch July 10, 2025 12:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants