Merge branch 'main' into tts-content-review

package.json

@@ -38,7 +38,7 @@
   "devDependencies": {
     "cheerio": "^1.0.0-rc.12",
     "cspell": "^6.31.3",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-plugin-import": "^2.29.1",

pages/18f/how-18f-works/changing-your-name.md

@@ -16,7 +16,7 @@ Follow these steps if your name in GSA systems does not match your name as it
 appears on identity documents (e.g. passport, marriage certificate, state-issued
 ID card):
 
-1. Log in to the [GSA network or a VPN]({% page "/how-to-log-in/" %})
+1. Log in to [HR Links](https://hrlinks.gsa.gov/)
 1. Follow
    [these steps](https://corporateapps.gsa.gov/files/HR-Links-Guide_-Changing-Your-Name_Final-Oct-2020docx.pdf).
 1. Wait up to 5 business days for the changes to take effect. You will receive
@@ -32,7 +32,6 @@ If you have trouble with this process,
 Follow these steps to add or update your _preferred_ first name, for example GSA
 systems refer to you as Michael but you go by Mike:
 
-1. Log in to the [GSA network or a VPN]({% page "/how-to-log-in/" %})
 1. Log in to [GCIMS](https://gcims.gsa.gov)
 1. Click on `GCIMS Self Service` on the left
 1. Click on `Work Contact Information` close to the middle of the page

pages/general-information-and-resources/tech-policies/security-incidents.md

@@ -184,7 +184,7 @@ these.
 - Questions? Ask in the {% slack_channel "g-security-compliance" %} Slack
   channel
 - You can use this link to
-  <a href="mailto:[email protected]?subject=Incident:&[email protected];devops@gsa.gov">quickly
+  <a href="mailto:[email protected]?subject=Incident:&[email protected];tts-tech-operations@gsa.gov">quickly
   send an email to IT Service Desk, GSA IR Team & TTS Tech Portfolio</a> at the
   same time.
 - cloud.gov: [cloud.gov support team](mailto:[email protected]) or

pages/getting-started/classes/benefits.md

@@ -517,12 +517,9 @@ document.
 Employees at TTS are eligible to participate in the
 [Thrift Savings Plan](https://www.tsp.gov/index.html) (TSP). For more
 information on TSP, please refer to the
-[TSP Insite page](https://insite.gsa.gov/topics/hr-pay-and-leave/benefits/thrift-savings-plan?term=tsp).
+[TSP Insite page](https://insite.gsa.gov/employee-resources/hr-eeo-pay-and-leave/benefits/thrift-savings-plan?term=tsp).
 
-To start, change, or stop your contributions, you'll need to fill out
-[Form TSP-1](https://www.tsp.gov/PDF/formspubs/tsp-1.pdf).
-
-You can also update TSP directly in [HR
+You will update TSP directly in [HR
 Links]({% page "/travel-and-leave/leave/#logging-into-hr-links" %}) by following
 this
 [visual guide](https://corporateapps.gsa.gov/corporateapps/files/Updating-TSP-Traditional-or-Roth.pdf)
@@ -532,24 +529,11 @@ or these steps:
 2. Click on the **TSP** tile/row to view and edit your contribution amounts
 3. Click **Save**
 
-If you ever move, you can update your address for TSP by emailing it to both the
-[Consolidated Processing Center](mailto:[email protected]) and the
-[GSA Payroll Office](mailto:[email protected]). Payroll will notify the
-TSP office of your new address.
-
-To transfer your previous retirement account into your TSP, you'll need to fill
-out a [Form TSP-60](https://www.tsp.gov/PDF/formspubs/tsp-60.pdf) for every
-account you want to roll over. If you need help, you can call them by dialing
-**1-877-968-3778**. Be sure to have your TSP account number and your SSN and
-mailing address handy.
+If you had been contributing to a 401k, 403b, or a similar plan at a previous employer this year, your total contribution for all similar plans cannot be higher than the [annual limit](https://www.tsp.gov/making-contributions/contribution-limits/).
 
-If you have been contributing to a 401k, 403b, or a similar plan at your
-previous employer, your total contribution for all similar plans cannot be
-higher than [the annual limit](https://www.tsp.gov/bulletins/20-8/).
+You can roll over money from eligible retirement plans to your TSP account. TSP offers a rollover concierge service and a self-service option. Visit the [TSP Move Money page](https://www.tsp.gov/tsp-basics/move-money-into-tsp/) for details.
 
-You may need to include a special additional statement with your tax return
-explaining you rolled over your IRA to the TSP. For guidance on this, see the
-[IRS interactive guide to "Do I Need to Report the Transfer or Rollover of an IRA or Retirement Plan on My Tax Return?"](https://www.irs.gov/help/ita/do-i-need-to-report-the-transfer-or-rollover-of-an-ira-or-retirement-plan-on-my-tax-return).
+There are numerous free TSP webinars available: visit the [TSP Online Learning page](https://www.tsp.gov/online-learning/) to view descriptions and dates.
 
 ## Training