Skip to content

Commit 5b5c4a4

Browse files
committed
Merge tag '11.8.0' into rel
2 parents 940cac1 + f8cbc13 commit 5b5c4a4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+855
-456
lines changed

CHANGELOG.rst

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
Version 11.8.0
2+
--------------
3+
4+
:Date: September 25, 2024
5+
6+
* `@agjohnson <https://github.com/agjohnson>`__: Prefetch build and project on version list (`#11616 <https://github.com/readthedocs/readthedocs.org/pull/11616>`__)
7+
* `@ericholscher <https://github.com/ericholscher>`__: Add speed up indexes (`#11614 <https://github.com/readthedocs/readthedocs.org/pull/11614>`__)
8+
* `@agjohnson <https://github.com/agjohnson>`__: Add support for successful build prefetch (`#11613 <https://github.com/readthedocs/readthedocs.org/pull/11613>`__)
9+
* `@ericholscher <https://github.com/ericholscher>`__: Add date version index on build (`#11612 <https://github.com/readthedocs/readthedocs.org/pull/11612>`__)
10+
* `@humitos <https://github.com/humitos>`__: Use theme 3.0.0rc2 (version/language selector) (`#11611 <https://github.com/readthedocs/readthedocs.org/pull/11611>`__)
11+
* `@github-actions[bot] <https://github.com/github-actions[bot]>`__: Dependencies: all packages updated via pip-tools (`#11609 <https://github.com/readthedocs/readthedocs.org/pull/11609>`__)
12+
* `@agjohnson <https://github.com/agjohnson>`__: Make terminology and paths consistent for onboarding announcements (`#11608 <https://github.com/readthedocs/readthedocs.org/pull/11608>`__)
13+
* `@humitos <https://github.com/humitos>`__: Add project: check YAML file for specific branch (`#11607 <https://github.com/readthedocs/readthedocs.org/pull/11607>`__)
14+
* `@agjohnson <https://github.com/agjohnson>`__: Drop unnecessary CSP directives for gold view (`#11605 <https://github.com/readthedocs/readthedocs.org/pull/11605>`__)
15+
* `@pllim <https://github.com/pllim>`__: Fix minor typo in "Version states" (`#11603 <https://github.com/readthedocs/readthedocs.org/pull/11603>`__)
16+
* `@github-actions[bot] <https://github.com/github-actions[bot]>`__: Dependencies: all packages updated via pip-tools (`#11602 <https://github.com/readthedocs/readthedocs.org/pull/11602>`__)
17+
* `@dbaston <https://github.com/dbaston>`__: Docs: Handle long commit messages in [skip ci] example (`#11601 <https://github.com/readthedocs/readthedocs.org/pull/11601>`__)
18+
* `@ericholscher <https://github.com/ericholscher>`__: Add exit_code to build errors (`#11597 <https://github.com/readthedocs/readthedocs.org/pull/11597>`__)
19+
* `@agjohnson <https://github.com/agjohnson>`__: Conditionally disabled custom 404 pages on dev docs (`#11596 <https://github.com/readthedocs/readthedocs.org/pull/11596>`__)
20+
* `@humitos <https://github.com/humitos>`__: Release 11.7.2 (`#11595 <https://github.com/readthedocs/readthedocs.org/pull/11595>`__)
21+
* `@humitos <https://github.com/humitos>`__: Docs: simplify "Add project" page (`#11559 <https://github.com/readthedocs/readthedocs.org/pull/11559>`__)
22+
* `@humitos <https://github.com/humitos>`__: Docs: make translation section more generic (`#11549 <https://github.com/readthedocs/readthedocs.org/pull/11549>`__)
23+
* `@plaindocs <https://github.com/plaindocs>`__: Add list of supported tools (`#11547 <https://github.com/readthedocs/readthedocs.org/pull/11547>`__)
24+
* `@humitos <https://github.com/humitos>`__: Addons: prepare Proxito and dashboard to enable them by default (`#11513 <https://github.com/readthedocs/readthedocs.org/pull/11513>`__)
25+
* `@ericholscher <https://github.com/ericholscher>`__: Add success messages for Organization views (`#11480 <https://github.com/readthedocs/readthedocs.org/pull/11480>`__)
26+
127
Version 11.7.2
228
--------------
329

common

docs/conf.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
"hoverxref.extension",
2222
"multiproject",
2323
"myst_parser",
24-
"notfound.extension",
24+
# For testing, conditionally disable the custom 404 pages on dev docs
25+
# "notfound.extension",
2526
"sphinx_copybutton",
2627
"sphinx_design",
2728
"sphinx_tabs.tabs",
@@ -55,6 +56,10 @@
5556

5657
docset = get_project(multiproject_projects)
5758

59+
# Disable custom 404 on dev docs
60+
if docset == "user":
61+
extensions.append("notfound.extension")
62+
5863
ogp_site_name = "Read the Docs Documentation"
5964
ogp_use_first_image = True # https://github.com/readthedocs/blog/pull/118
6065
ogp_image = "https://docs.readthedocs.io/en/latest/_static/img/logo-opengraph.png"
@@ -76,7 +81,7 @@
7681

7782
master_doc = "index"
7883
copyright = "Read the Docs, Inc & contributors"
79-
version = "11.7.2"
84+
version = "11.8.0"
8085
release = version
8186
exclude_patterns = ["_build", "shared", "_includes"]
8287
default_role = "obj"
Binary file not shown.
Binary file not shown.

docs/user/build-customization.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ This other example shows how to cancel a build if the commit message contains ``
183183
post_checkout:
184184
# Use `git log` to check if the latest commit contains "skip ci",
185185
# in that case exit the command with 183 to cancel the build
186-
- (git --no-pager log --pretty="tformat:%s -- %b" -1 | grep -viq "skip ci") || exit 183
186+
- (git --no-pager log --pretty="tformat:%s -- %b" -1 | paste -s -d " " | grep -viq "skip ci") || exit 183
187187
188188
189189
Generate documentation from annotated sources with Doxygen

docs/user/glossary.rst

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,21 @@ so that you have a reference for how we're using them.
1111
In some scenarios, they exist as two separate platforms.
1212
Read the Docs is a combined CI/CD platform made for documentation.
1313

14+
configuration file
15+
YAML configuration file (e.g. ``.readthedocs.yaml``) that configures the build process of your project on Read the Docs.
16+
17+
.. seealso::
18+
19+
:doc:`/config-file/index`
20+
Practical steps to add a configuration file to your documentation project.
21+
22+
1423
dashboard
1524
The "admin" site where Read the Docs projects are managed and configured.
1625
This varies for our two properties:
1726

18-
* |com_brand|: https://readthedocs.com/dashboard/.
19-
* |org_brand|: https://readthedocs.org/dashboard/.
27+
* |com_brand|: https://app.readthedocs.com/dashboard/
28+
* |org_brand|: https://app.readthedocs.org/dashboard/
2029

2130
default version
2231
Projects have a *default version*, usually the latest stable version of a project.
@@ -145,4 +154,10 @@ so that you have a reference for how we're using them.
145154
* Git providers have webhooks which are special URLs that Read the Docs can call in order to notify about documentation builds.
146155
* Read the Docs has a unique webhook for each project that the Git provider calls when changes happen in Git.
147156

148-
See also: :doc:`/guides/setup/git-repo-manual` and :doc:`/build-notifications`
157+
.. seealso::
158+
159+
:doc:`/guides/setup/git-repo-manual`
160+
Manually configuration for Git repositories.
161+
162+
:doc:`/build-notifications`
163+
Receive notifications when your documentation builds fail.

docs/user/guides/importing-private-repositories.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Here is how you set it up.
88

99
✅️ Logged in with |git_providers_or|?
1010
If you signed up or logged in to Read the Docs with your |git_providers_or| credentials,
11-
*all you have to do* is to use the normal :doc:`project import </intro/import-guide>`.
11+
*all you have to do* is to use the normal :doc:`project import </intro/add-project>`.
1212
Your Read the Docs account is connected to your Git provider and
1313
will let you choose from private Git repositories and configure them for you.
1414

docs/user/guides/setup/git-repo-automatic.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ the integration will automatically be configured on the Read the Docs project an
2626
Here is an outline of what happens:
2727

2828
#. A list of repositories that you have access to are automatically listed on Read the Docs' project import.
29-
#. You choose a Git repository from the list (see :doc:`/intro/import-guide`).
29+
#. You choose a Git repository from the list (see :doc:`/intro/add-project`).
3030
#. Data about the repository is now fetched using the account connection and you are asked to confirm the setup.
3131
#. When Read the Docs creates your project,
3232
it automatically sets up an integration with the Git provider,
@@ -55,7 +55,7 @@ including the ones that were automatically created.
5555
5656
.. seealso::
5757

58-
:ref:`intro/import-guide:Manually import your docs`
58+
:ref:`intro/add-project:Manually add your project`
5959
Using a different provider?
6060
Read the Docs still supports other providers such as Gitea or GitHub Enterprise.
6161
In fact, any Git repository URL can be configured manually.
@@ -80,7 +80,7 @@ By granting Read the Docs the requested permissions,
8080
we are issued a secret OAuth token from your Git provider.
8181

8282
Using the secret token,
83-
we can automatically configure the repository that you select in the :doc:`project import </intro/import-guide>`.
83+
we can automatically configure repositories during :doc:`project creation </intro/add-project>`.
8484
We also use the token to send back build statuses and preview URLs for :doc:`pull requests </pull-requests>`.
8585

8686
.. _OAuth: https://en.wikipedia.org/wiki/OAuth

docs/user/guides/setup/monorepo.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ A custom build configuration file path is applied to all versions of your docume
3636
Adding an additional project from the same repository
3737
-----------------------------------------------------
3838

39-
Once you have added the first project from the :ref:`Import Wizard <intro/import-guide:Automatically import your docs>`,
40-
it will show as if it has already been imported and cannot be imported again.
41-
In order to add another project with the same repository,
42-
you will need to use the :ref:`Manual Import <intro/import-guide:Manually import your docs>`.
39+
Once you have added the first project from the :ref:`Import Wizard <intro/add-project:Automatically add your project>`,
40+
you will need to repeat this process again to add the additional project from the same repository.
4341

4442
Setting the custom build configuration file
4543
-------------------------------------------

docs/user/index.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ Read the Docs: documentation simplified
77
:caption: Getting started
88

99
/tutorial/index
10-
/intro/getting-started-with-sphinx
11-
/intro/getting-started-with-mkdocs
12-
/intro/import-guide
10+
/intro/doctools
11+
/intro/mkdocs
12+
/intro/sphinx
13+
/intro/add-project
1314
/examples
1415

1516
.. toctree::

docs/user/intro/add-project.rst

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
Adding a documentation project
2+
==============================
3+
4+
.. meta::
5+
:description lang=en: Add your existing documentation from a Git repository into Read the Docs.
6+
7+
This page takes you through the process of adding a documentation project to Read the Docs.
8+
If you have :doc:`connected your Read the Docs account </guides/connecting-git-account>` to GitHub, Bitbucket or GitLab you will be able to add your project automatically.
9+
Otherwise, you will need to add it manually and perform some extra steps.
10+
11+
Automatically add your project
12+
------------------------------
13+
14+
#. Go to your :term:`dashboard`.
15+
#. Click on :guilabel:`Add project`.
16+
#. Type the name of the respository you want to add and click on it.
17+
#. Click on :guilabel:`Continue`.
18+
#. Edit any of the pre-filled fields with information of the repository.
19+
#. Click on :guilabel:`Next`.
20+
#. Add a :term:`configuration file` to your repository if it's doesn't exist yet.
21+
#. Click on :guilabel:`This file exists`.
22+
23+
Manually add your project
24+
-------------------------
25+
26+
#. Go to your :term:`dashboard`.
27+
#. Click on :guilabel:`Add project`.
28+
#. Click on :guilabel:`Configure manually`.
29+
#. Click on :guilabel:`Continue`.
30+
#. Fill all the fields of the form.
31+
#. Click on :guilabel:`Next`.
32+
#. Add a :term:`configuration file` to your repository if it's doesn't exist yet.
33+
#. Click on :guilabel:`This file exists`.
34+
35+
Once your project is created, you'll need to manually configure the repository webhook if you would like to have new changes trigger builds for your project on Read the Docs.
36+
37+
.. seealso::
38+
39+
:doc:`/guides/setup/git-repo-manual`
40+
Additional setup steps required for manually created projects. This guide covers setting up SSH keys and webhook integrations.
41+
42+
43+
What's next
44+
-----------
45+
46+
Once your documentation project is created, a build will be triggered.
47+
It will automatically fetch the code from your repository and build the documentation.
48+
You can see the logs for the build process from your :term:`dashboard`.
49+
50+
.. seealso::
51+
52+
:doc:`/builds`
53+
Explanation about the build process.
54+
55+
:doc:`/config-file/index`
56+
Practical steps to add a configuration file to your documentation project.
57+
58+
:doc:`/versions`
59+
Manage multiple versions of your documentation project.
60+
61+
If you have any trouble, don't hesitate to reach out to us.
62+
The :doc:`support </support>` page has more information on getting in touch.

docs/user/intro/doctools.rst

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
Supported tools
2+
===============
3+
4+
Read the Docs provides hosting for static html documentation generated by Sphinx,
5+
MkDocs, Docusaurus and a variety of other tools.
6+
7+
Here are minimal configuration examples for some common tools,
8+
with more coming soon.
9+
10+
.. grid:: 2
11+
12+
.. grid-item-card:: Material for MkDocs
13+
:link: mkdocs.html
14+
15+
Material for MkDocs is a powerful documentation framework on top of MkDocs.
16+
17+
Supported formats
18+
:bdg-success:`md`
19+
Written in
20+
:bdg-info:`python`
21+
22+
23+
.. grid-item-card:: Sphinx
24+
:link: sphinx.html
25+
26+
Sphinx is a powerful documentation generator that has many features for writing technical documentation.
27+
28+
Supported formats
29+
:bdg-success:`rst` :bdg-success:`md`
30+
Written in
31+
:bdg-info:`python`

docs/user/intro/getting-started-with-mkdocs.rst

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)