From bd923f21f0b6d19e83d9406828e4e28e2b948720 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 18 Aug 2023 15:52:57 -0500 Subject: [PATCH] Remove spurious newlines in markdown files noticed by markdowner.py --- .../tutorials/masterfiles_policy_framework_upgrade.markdown | 6 ------ 1 file changed, 6 deletions(-) diff --git a/examples/tutorials/masterfiles_policy_framework_upgrade.markdown b/examples/tutorials/masterfiles_policy_framework_upgrade.markdown index 476a32899..36d0aef25 100644 --- a/examples/tutorials/masterfiles_policy_framework_upgrade.markdown +++ b/examples/tutorials/masterfiles_policy_framework_upgrade.markdown @@ -271,7 +271,6 @@ Or undo this operation with: git switch - Turn off this advice by setting config variable advice.detachedHead to false - ``` Then build and install targeting the integration root directory. When installed from source masterfiles installs into the `masterfiles` directory. @@ -614,7 +613,6 @@ Changes not staged for commit: modified: templates/federated_reporting/psql_wrapper.sh.mustache modified: templates/federated_reporting/pull_dumps_from.sh modified: update.cf - ``` Next we want to bring back any of our custom files. Look through the **deleted** files, identify your custom files and restore them with `git checkout`. @@ -740,7 +738,6 @@ Changes not staged for commit: modified: templates/federated_reporting/psql_wrapper.sh.mustache modified: templates/federated_reporting/pull_dumps_from.sh modified: update.cf - ``` It's best to review the diff of **each** modified file to understand the upstream changes as well as identify any local modifications that need to be retained. You should always keep a good record of any modifications made to vendored files to ensure that nothing is lost during future framework upgrades. @@ -889,7 +886,6 @@ index 15c0c40..4611098 100644 + "DEBUG $(this.bundle): adding input='$(inputs)'" if => isvariable("inputs"); - ``` Carefully review the diffs and merge or re-integrate your custom changes on top of the upstream files. If you identify changes to the vendored files consider re-integrating those changes in a way that does not modify vendored files, here for example we have migrated the integration of the custom policy to Augments (`def.json`). @@ -1064,7 +1060,6 @@ Changes to be committed: modified: templates/federated_reporting/pull_dumps_from.sh new file: templates/federated_reporting/transfer_distributed_cleanup_items.sh modified: update.cf - ``` Make sure the policy validates and commit your changes. @@ -1091,4 +1086,3 @@ Output: ``` Now your Masterfiles Policy Framework is upgraded and ready to be tested. -