docs(astro): merge docs-upgrade branch into main

[lwasser]

We will need to do several things to merge this feature branch into main:

• Make sure all of the docs builds and ci actions build from main rather than docs upgrade
• fix merge conflicts associated with the merge: chore: add merge commit to handle merge conflicts when we merge into main #929
• FINALLY: Open a PR to main and merge it [WIP] Docs: merge the feature branch into main  #928

I think there is more but i'm going to look at what is open .

[lwasser]

closed via #938