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/22 15:51:31 UTC

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

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 38bf663  Use Sphinx 4.x (#8750)
38bf663 is described below

commit 38bf6638cda6a83ceae9ea1d2488b2f5c346045b
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Tue Mar 22 10:51:21 2022 -0500

    Use Sphinx 4.x (#8750)
    
    Sphinx has fixed the following issue that was blocking us from moving to
    Sphinx 4.x:
    https://github.com/sphinx-doc/sphinx/issues/9322
    
    With that fixed, we can unpin from 3.x, which this patch does.
    
    Fixes: #7941
---
 doc/Pipfile                                       | 9 +--------
 doc/developer-guide/api/types/TSSslSession.en.rst | 2 ++
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/doc/Pipfile b/doc/Pipfile
index 42a9f5a..c6652a7 100644
--- a/doc/Pipfile
+++ b/doc/Pipfile
@@ -23,14 +23,7 @@ verify_ssl = true
 
 [packages]
 
-# 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 = "*"
 
 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 4f50ead..4b8c6f4 100644
--- a/doc/developer-guide/api/types/TSSslSession.en.rst
+++ b/doc/developer-guide/api/types/TSSslSession.en.rst
@@ -28,6 +28,8 @@ Synopsis
 
     #include <ts/apidefs.h>
 
+.. c:macro:: TS_SSL_MAX_SSL_SESSION_ID_LENGTH
+
 .. type:: TSSslSessionID
 
    .. member:: size_t len