Mark Sapiro pushed to branch master at GNU Mailman / Mailman Core
Commits:
4793cfde by Mark Sapiro at 2020-08-22T05:54:33+00:00
Fix graphviz complaint. Try requiring newer sphinx.
- - - - -
fa782051 by Mark Sapiro at 2020-08-22T05:54:33+00:00
Merge branch 'sphinx' into 'master'
Fix graphviz complaint. Try requiring newer sphinx.
See merge request mailman/mailman!691
- - - - -
4 changed files:
- requirements-docs.txt
- src/mailman/docs/8-miles-high.rst
- src/mailman/handlers/docs/arc_sign.rst
- src/mailman/rest/docs/addresses.rst
Changes:
=====================================
requirements-docs.txt
=====================================
@@ -1,4 +1,4 @@
-sphinx
+sphinx>=3.2
sphinx_rtd_theme
docutils==0.12
sphinxcontrib-zopeext
=====================================
src/mailman/docs/8-miles-high.rst
=====================================
@@ -101,7 +101,7 @@ The default set of rules looks something like this:
subgraph in { IN [shape=box, color=lightblue, style=filled]; }
subgraph rules {
rankdir=TB;
- node [shape=record];
+ node [shape=box, style=rounded];
approved [label="<in> approved | { <no> no | <yes> }"];
emergency [label="<in> emergency | { <no> no | <yes> }"];
loop [label="<in> loop | { <no> no | <yes> }"];
=====================================
src/mailman/handlers/docs/arc_sign.rst
=====================================
@@ -33,7 +33,8 @@ test._domainkey.example.com
The following is an example TXT record:
::
- "v=DKIM1; k=rsa;
p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyBwu6PiaDN87t3DVZ84zIrEhCoxtFuv7g52oCwAUXTDnXZ+0XHM/rhkm8XSGr1yLsDc1zLGX8IfITY1dL2CzptdgyiX7vgYjzZqG368C8BtGB5m6nj26NyhSKEdlV7MS9KbASd359ggCeGTT5QjRKEMSauVyVSeapq6ZcpZ9JwQIDAQAB"
+
+ "v=DKIM1; k=rsa;
p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyBwu6PiaDN87t3DVZ84zIrEhCoxtFuv7g52oCwAUXTDnXZ+0XHM/rhkm8XSGr1yLsDc1zLGX8IfITY1dL2CzptdgyiX7vgYjzZqG368C8BtGB5m6nj26NyhSKEdlV7MS9KbASd359ggCeGTT5QjRKEMSauVyVSeapq6ZcpZ9JwQIDAQAB"
The value of the above p= tag should be the public key from your pair.
=====================================
src/mailman/rest/docs/addresses.rst
=====================================
@@ -378,6 +378,7 @@ address is unset.
Setting Ram's preferred addresses requires that it first be verified:
::
+
>>>
dump_json('http://localhost:9001/3.1/users/[email protected]/preferred_address',
... {'email': '[email protected]'})
Traceback (most recent call last):
@@ -386,6 +387,7 @@ Setting Ram's preferred addresses requires that it first be
verified:
Verify Ram's address first:
::
+
>>> addr = ram.addresses[0]
>>> addr.verified_on = now()
>>> transaction.commit()
View it on GitLab:
https://gitlab.com/mailman/mailman/-/compare/d6c49b0f32cc17d89e78bdbed89beb9e4b9d43e2...fa782051077f668af7e9a90ab33c8f0d318828cd
--
View it on GitLab:
https://gitlab.com/mailman/mailman/-/compare/d6c49b0f32cc17d89e78bdbed89beb9e4b9d43e2...fa782051077f668af7e9a90ab33c8f0d318828cd
You're receiving this email because of your account on gitlab.com.
_______________________________________________
Mailman-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/mailman-checkins.python.org/
Member address: [email protected]
