You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bn...@apache.org on 2022/03/23 02:30:54 UTC

[trafficserver] branch master updated: Revert "Use Sphinx 4.x (#8750)" (#8754)

This is an automated email from the ASF dual-hosted git repository.

bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 45b48e2  Revert "Use Sphinx 4.x (#8750)" (#8754)
45b48e2 is described below

commit 45b48e26436cb50242af9cafe3b2ce3efd7e0a0a
Author: Brian Neradt <br...@verizonmedia.com>
AuthorDate: Tue Mar 22 21:30:43 2022 -0500

    Revert "Use Sphinx 4.x (#8750)" (#8754)
    
    This reverts commit 38bf6638cda6a83ceae9ea1d2488b2f5c346045b.
---
 doc/Pipfile                                       | 9 ++++++++-
 doc/developer-guide/api/types/TSSslSession.en.rst | 2 --
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/Pipfile b/doc/Pipfile
index c6652a7..42a9f5a 100644
--- a/doc/Pipfile
+++ b/doc/Pipfile
@@ -23,7 +23,14 @@ verify_ssl = true
 
 [packages]
 
-sphinx = "*"
+# The latest 4.x sphinx release, currently 4.0.2, fails `make html`.  For
+# details, see: https://github.com/apache/trafficserver/issues/7938
+#
+# The 3.x releases build fine, however. So we currently pin to that.
+#
+# Once that issue, either with sphinx or our docs, is resolved, then we should
+# unpin sphinx by setting the following to "*".
+sphinx = "==3.*"
 
 sphinx-rtd-theme = "*"
 sphinxcontrib-plantuml = "*"
diff --git a/doc/developer-guide/api/types/TSSslSession.en.rst b/doc/developer-guide/api/types/TSSslSession.en.rst
index 4b8c6f4..4f50ead 100644
--- a/doc/developer-guide/api/types/TSSslSession.en.rst
+++ b/doc/developer-guide/api/types/TSSslSession.en.rst
@@ -28,8 +28,6 @@ Synopsis
 
     #include <ts/apidefs.h>
 
-.. c:macro:: TS_SSL_MAX_SSL_SESSION_ID_LENGTH
-
 .. type:: TSSslSessionID
 
    .. member:: size_t len