1 files changed, 43 insertions, 44 deletions

diff --git a/documentation/static/pgpkeys/adamw.key b/documentation/static/pgpkeys/adamw.key
index 8d409c2391..c0f4a1846d 100644
--- a/documentation/static/pgpkeys/adamw.key
+++ b/documentation/static/pgpkeys/adamw.key
@@ -2,11 +2,11 @@
 
 [.literal-block-margin]
 ....
-pub   rsa4096/19A77C98A0E497E9 2020-09-25 [SC] [expires: 2025-09-24]
+pub   rsa4096/19A77C98A0E497E9 2020-09-25 [SC] [expires: 2030-01-01]
       Key fingerprint = CBEB 2760 3DA3 3D18 52D7  B662 19A7 7C98 A0E4 97E9
 uid                            Adam Weinberger <adamw@FreeBSD.org>
 uid                            Adam Weinberger <adamw@adamw.org>
-sub   rsa4096/723BD32C244BC85E 2020-09-25 [E] [expires: 2025-09-24]
+sub   rsa4096/723BD32C244BC85E 2020-09-25 [E] [expires: 2030-01-01]
 
 ....
 
@@ -25,33 +25,33 @@ B6X/TnfzhBxScew2aqlFcW9NDgz9WmdontxHhDm+XgqmloJM6JXen+gUZ20HbilR
 VALWiEclYY4l2pKTVVcwXxzhlz/6MeXFO2a9tcI6L9MnoEF47nX4dgWIiNrncXlE
 qobd5elF0D+mTgZKdemY0Gkvv9rG7NXKxZGkLWQwZm8IuEPav4zRVnrg2565RR66
 EmjUjTKH4BW9puVCAixkmvyMvLd49eOFbCgfQDYOhk8y7cUG4ogApG+wSQARAQAB
-tCFBZGFtIFdlaW5iZXJnZXIgPGFkYW13QGFkYW13Lm9yZz6JAlQEEwEKAD4WIQTL
-6ydgPaM9GFLXtmIZp3yYoOSX6QUCX23jCAIbAwUJCWYBgAULCQgHAwUVCgkICwUW
-AwIBAAIeAQIXgAAKCRAZp3yYoOSX6RBED/9eKRdHP1XriSE8CX9Z8r22gaZb+BUE
-VgV+tYiwS6neGBPizNiWLJgnTfi4dM4JqufITznA7akqTGbirspDoCsVSj+NbJGA
-G5jrpe/xLkG10f+TYKb0hXayBJmRxL/o8vBrA9v3SjC9Ysvp5X3vhRcSP4sW1daJ
-6DdRkk4hjbcUJ4fRbWRa5vLFLfE17Yab/ltugBAPnFCjiVygP2Y0pDD02pM/xO1M
-jKWDHajB6IQA0H7pIyemSq9zArUDJ1G0U1xKq5MYGCRCuiHHqVxMKVl0y0httEdZ
-RXDeWOfCo9OUDaBtYDkD+u0AzBDEPJP7x1GMD/13YUwxSqiebxsNZ6se2kVCaYwE
-06TktLp/7vAx5ftfVT6DRSIS93uSEV+brPbMT7ixN/rh9L+vHRjFdKMm6fZpceVu
-G3/NY/AzqBpwGrxKflddlSijaj+PzeT9izWNLb25RQO3egJUwlI5mi7q+mTUBmNd
-64GgmekTOWLr1EOheZEOOYM4pCUnCX9mFOsi5ZLqc7kfqRxpWsNE9KvG56IsADFQ
-XPJn4dByBmKJH4L5ybj4DgyfokjhpfEi+/STjNwbdbG+kpGYt2q00l5mvXhTK93q
-TTzSWzBF0+NbDicy/o8xqAgWnO/ztS29eWWEMvtip2H+jLHXdJCt2MDpskbVEhlc
-qXfYIkU2ahLZ+LQjQWRhbSBXZWluYmVyZ2VyIDxhZGFtd0BGcmVlQlNELm9yZz6J
-AlQEEwEKAD4WIQTL6ydgPaM9GFLXtmIZp3yYoOSX6QUCX23jLQIbAwUJCWYBgAUL
-CQgHAwUVCgkICwUWAwIBAAIeAQIXgAAKCRAZp3yYoOSX6TRCD/9ZdBCCfc+TIFpt
-5MGEkOyU/WtdBGLeANCQXmcQ7spZtBHDajZ5vkEe1ANgJyeVwO7Vj+CC8UWrSAsF
-zLZ9Y3Vck3FVp+I70I0oX+d0VOVPNNruyMZ/mRuCQFGOOI6wqVtnBvbgTa/Acjv5
-jtM3LOAGxSoPqrtUeAT2bXFnQT/gEQacfty12GIUu2jxtTcs9LEv/13ivoV4RvNA
-RqXSV3Iw/6k1EKoFih9wsN0IiNg8OE/dMOez54yV8Mld7t7R7FuA+8RqR1H3xUV3
-w3iz633FKbbk8OmTqN/k9uKE+gDP/TiA63Uw/NuV8c/5h9aPpXmB4aFxRt6J7oGC
-zaOrHiOnpCOVZHhmmx2Rv2wHKugYfnsrErY4JijFZJdC5wqUb5Z4lB+azSILPtz3
-zLbTFf+RMaYP1CqMjlwZDJqMJ1zJ+nUN7x6fXVCeV6H8NhxMoYHqdsEAlFRhc0jI
-5kWdfUb6dWJLlqrfbxqA1HV5JOnCYLGPrlbnDxbdE+m60CYi9tx4lVORkeMzw708
-oK5ft6NYzmcsDESMyok34ilnAKzmrv9kpPkJRHNNMBOfpFWJFL4WlNiUXb+CWSM3
-Oae6/T0o2MiAnodRJErHNsSyTnGYRmSdk5yL+iDiJ68N6XNddIZJcQpxyu5qaGac
-L71Ll8ipBRxmIN1IAhvVZDjKcyGHF7kCDQRfbeMIARAA+2a3oXz+qU80HBdVCQOY
+tCFBZGFtIFdlaW5iZXJnZXIgPGFkYW13QGFkYW13Lm9yZz6JAlQEEwEKAD4CGwMF
+CwkIBwMFFQoJCAsFFgMCAQACHgECF4AWIQTL6ydgPaM9GFLXtmIZp3yYoOSX6QUC
+aMr3+wUJEW7zcwAKCRAZp3yYoOSX6RBgEACDeiHaV8a9nHfrVOWkdsw57lSTcacc
+Uln1a0if0VQpA9HrPibX7BfYYJrajvsAuCyhR5E2dpw18+u1G+IaJkoyv63vmwTO
+aAqqXWcuPp1JeD0J7br3krxtt5gbSCwMtrO3R8I3ksHJ4tBAPKzD1IR39Tr3g3TK
+VogL8iDHVhEQZIHZADi6d8MS6DmnaygqFn4CPdrTZEgw0R1sN8/Tjl8w9HCXOUTk
+CWlcvRssJPAJtj+fyXsEs0P9kzOYTzF30Q4dRZRtW+NX1Ltf8hBcSDa8IgFQKjpx
+untC6KOJupiX1YGI1mmak1qHwkGSxkbRwcqb9LyyEevTVwv8pko8uYVWq8B+kBuY
+DbsCdvTLARletdbQESjpwgubJVbAIiXpxtoPTbs/CPVqyGnBKYIqC/fCCn82OsH7
+CAPZlpiSl/1iGqzPPVjmsY/41uG6eMgMna7xEvT/SoUPaNT6DMcul+zNhUoNlhMQ
+YPa9kIqzGDQr18msmG7f2n1XmdaiLFUrOkg+wV63CjklowWykBC/mpnWJGq4YlYG
+WwodFVWdc+rDo2dvHyZwPMZcZtw4mM4wUmgehWsID7tXQleRhlmOYEsex/JKn3PI
+2Xh8MnqaRpLSqKrEz9r+vk2oPhYGUOGs1LHuplRiWDlgxuiEzxda+l5C9tm9kH8h
+mMgd/McW8wqZSrQjQWRhbSBXZWluYmVyZ2VyIDxhZGFtd0BGcmVlQlNELm9yZz6J
+AlQEEwEKAD4CGwMFCwkIBwMFFQoJCAsFFgMCAQACHgECF4AWIQTL6ydgPaM9GFLX
+tmIZp3yYoOSX6QUCaMr4AgUJEW7zcwAKCRAZp3yYoOSX6emqD/4+MZPuQOxI5ON6
+odHiga+DQ7vbDq3UPujOOczdrCg8IUIkFwZaGtbZBGw9rX1LMP603KnUu0D4pHbh
+eDdTpVov2g7of7xsI5bkYstabrbnkOLolXKXt5vDxFCX+YHjmLUzqdkAPFV5b4Ft
+1bZNEaNNEYvjWxAoOnWuy8rG721BdEvHxwH9JXPzOlEcVZwPjlbM8Yb6ii/yfOfM
+FgE99mReRp0wmzQAdBqyUUvPnwSqVg9VOqn4Bav+fKYx6AF5kZlUtq2ly7Sh9PoC
+HTesJ8rsjHu45fpasXnCUnzr2W0v2odEeTWFIHHx25wAiOXJCpdO+V70hwvg4IDV
+g3zfGxVICBJLIzTkknCDrWDp5raxmhODtkLL0oBiWii42084nFoh46EZykXNaDVk
+29IoD+fGHnJRjzOHladfA1xMCEna2otB8XgtVLGeJJyNjq52qCwQYSwdxBIBli9I
+52H+OGu3loUybs/iUlR7cCXMjtl0WaTpoxFK7TVDpNIZVvMUpYkWx3O2qJ3ZJGOx
+UAWFHJFDqRXS6YQHLptStMSBCiQn61qaabF7LxeadsP6+Kx3kPBV64ROGVTsG1Om
+/XUoNbOecpQmaNLA58Uk/wV7kZ5DWymdrQzmvsg2IT4PJES/kTOX3UFCEfUdENM8
+DBJTo4MKnaHSruhW9e1qoBmWn7Y3UbkCDQRfbeMIARAA+2a3oXz+qU80HBdVCQOY
 YJ8/K6Uhc+DPB6G0tIM30eANZ3cnynOtjt91uxmOXOL6fVymfLMsc6bhMLohLxv5
 4xgQO9VRHQDBCpokmrXq85y/ShJQAnpc/t/mTRJ5ih39bWOFL/J7Eho0KGRJN8Bx
 rE4o9jxI1NNTdgA2IQ6/HwT1/Kdvy7GT/eBGPCNn/lUWGvRmx1GkPt7XhsJ0onDn
@@ -62,20 +62,19 @@ nwzWqpp15Iy+ZESIW4FGJYRJSDP02ekEOqxcOou9YtItKJSWLC73tZUij9k3cCQg
 sn/55+r0K141mwGo5EsxuGjl1ZIw/HEr9BEZl64oUIN+5d08wyNIbC1FaJS23cwV
 GzIDnS3OPBJEpIMwvVcAb2vwoYaSMlwUZGsIXl3gNIRo4Sx7T0YgnnR6nQsGdZiJ
 /yZ/VLvzJ6mhMOA9Q/nt4NGAqE286nRk3UnTMU+ET8adBORoy4ou2BOZelvU45XN
-4ZH4xvRg4S6Z7Ooyf63hmrcAEQEAAYkCPAQYAQoAJhYhBMvrJ2A9oz0YUte2Yhmn
-fJig5JfpBQJfbeMIAhsMBQkJZgGAAAoJEBmnfJig5JfpqpMP/0xYDlSObB9UvwJK
-Sn4GGriQbov05hw+cJGHXwmv3Xe/VObUxgbzJe92rewU44aV7FrYTzU4gLVDDYEO
-O+mE7AtnYfBfMEYqxHVrswCNRH2RNTZmdV3+zFNTo9jw6zMdrzpokaR9M2R9+5E3
-6BdHue+pVK7g2H6nqI4fSrwyUt5bFt0ASSZTy4EZK5KTpULT8BjSsReM1bNjLxlh
-FYUSwaCzjQnvNlrf5R3Sjzs1aoLBywNh2VtWOf4LYDQos57bfn5OWntVn4QPRADL
-nw+5DwJ3iLHI+//9s7kDx81EZd0JqfwiMlqnBYvjhGYPi6619/hv6sscWPzF0Hsu
-EpVbnI2pktWLC6k4mUndRfvQ2+oj6yffXa8x5a60mkQQDkZWsAthwGPtBZ4g4t91
-zbPJIiVHoR4sfQIbumYBjT5xS/rc3B6q9aCVfZ74jTXlpiT1zfey90+pjhvEH9lU
-kuC1HkZEA/AGQUu0T3zBfULPZhoRQhaO/c9q2n8L6z9ELn+5/rvMQWi2NpnFq4Pa
-jtdP6UU6UIAkWC+jz5dF83CKSJV8C4470bxt5OtgWr698Qr9P6IrSd0UFF7Xr6wa
-NZlpo7yP3p9onhpK+Z/pPrGCtGJD/Iy0wAoykoPakO3x0gqa0UIoHu9oxfBFk8fv
-ze8y0llEOZyLqSbagQBZwxvWkXI4
-=ANeF
+4ZH4xvRg4S6Z7Ooyf63hmrcAEQEAAYkCPAQYAQoAJgIbDBYhBMvrJ2A9oz0YUte2
+YhmnfJig5JfpBQJoyvgQBQkRbvOIAAoJEBmnfJig5Jfp1e8P/RGFGNTEInf3vbRZ
+k8UBJplebndi57qKovPNodAr9XbQsXkvKH6BflY/Q2f0Mpy/FslQ+XvXlW51J7xV
+q7UiRb1eA5AeqHugn7EsLLx8uMdP6ImjmRARNfvRZNnF2vuW6hZgNskil8JDCIsl
+gulIPzSV0UC4psjfgA162jNweYk8GM4M0t21Yj88HQ247mTa2ZHQe/vEHmCTyx94
+H8670HcZHZMJdRBaL8Ca8yItVJGTkvU4N44626sTxwoeRNAB0hC+/ilDmd3EXqEJ
+QqVz3vkeZYlTrnIJkSN6lb1E9AhxsP6BQIEKzCj78Ywbacrz6OsqDg+/gze3c3LK
+e1bpNFvpt4Kolueof5kyKf1DxQzt3nBzA8NgzxwPshIxTv+qWwbuUpDgCom1uCbl
+wL48DLZyldGF5uDwp8zOVGAk2Hcbo3C2SfHCAn0v9w+6Fp/pjNw4oxrZD/pA303F
+cb0X0DQ3szJ8V+Rcml3RaSVUu7SLK2oh9iKCHIrHLavQzOadzPZ2f7Cov0Mo5V43
+34RYjzOGXMVEqK8hkrDYykEg9FJlUz46LV02awF+J+XyV0wGJaxuaIwtRR16Oj77
+701uf9sbgVL+XbCT31+KbWYfiA/QMS5VznJ1M7CsqxoRE/7uz5Gd+qXxzvUiPD19
+8c2Up7onBB0VMrwFBULEaTj0Y9mD
+=yWw7
 -----END PGP PUBLIC KEY BLOCK-----
 ....
-