Skip to content

Commit

Permalink
Merge pull request #7971 from cakephp/6.x-updates
Browse files Browse the repository at this point in the history
1st commit for 6.x
  • Loading branch information
ADmad authored Dec 12, 2024
2 parents 6713293 + 98e34ec commit fa5980e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
15 changes: 8 additions & 7 deletions config/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,21 @@
# built documents.
#
# The short X.Y version.
version = '5.next'
version = '6.x'

# The full version, including alpha/beta/rc tags.
release = '5.next'
release = '6.x'

# The search index version.
search_version = '5-next'
search_version = '6-x'

# The marketing diplay name for the book.
version_name = 'Chiffon'

# Other versions that display in the version picker menu.
version_list = [
{'name': '5.x', 'number': '5', 'current': True, 'title': '5.x Book'},
{'name': '6.x', 'number': '6', 'current': True, 'title': '6.x Book'},
{'name': '5.x', 'number': '5', 'title': '5.x Book'},
{'name': '4.x', 'number': '4', 'title': '4.x Book'},
{'name': '3.x', 'number': '3', 'title': '3.x Book'},
{'name': '2.x', 'number': '2', 'title': '2.x Book'},
Expand All @@ -39,7 +40,7 @@

# The GitHub branch name for this version of the docs
# for edit links to point at.
branch = '5.next'
branch = '6.x'

# Add any paths that contain custom themes here, relative to this directory.
html_theme_path = []
Expand Down Expand Up @@ -112,8 +113,8 @@
epub_tocdepth = 2

rst_epilog = """
.. |phpversion| replace:: **8.3**
.. |minphpversion| replace:: 8.1
.. |phpversion| replace:: **8.4**
.. |minphpversion| replace:: 8.4
"""

# todo_include_todos = True
Expand Down
2 changes: 1 addition & 1 deletion en/index.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Welcome
#######

CakePHP 5 is a web development framework running on PHP |phpversion| (min. PHP
CakePHP 6 is a web development framework running on PHP |phpversion| (min. PHP
|minphpversion|). Read :doc:`CakePHP at a Glance </intro>` to get an
introduction to the fundamentals of CakePHP.

Expand Down

0 comments on commit fa5980e

Please sign in to comment.