Merge remote-tracking branch 'upstream/main' into dev-1.23

2021-12-01 12:23:10 -05:00
parent b1a73567ec 81389449f1
commit 018f9d05a2
89 changed files with 1488 additions and 509 deletions
@@ -22,5 +22,5 @@ tags:

 <!--more--> 

-PDBs cannot prevent an involuntary disruption, but 
- will count against the budget.
+Involuntary disruptions cannot be prevented by PDBs; however they 
+do count against the budget.