Skip to content

Commit 5c385f0

Browse files
travis fixes
1 parent 5368cf4 commit 5c385f0

14 files changed

+28
-27
lines changed

docs/builds.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Read the Docs cannot create a PDF version of your documentation with the *Mkdocs
6161

6262
.. warning::
6363

64-
We strongly recommend to :ref:`pin the MkDocs version <guides/specifying-dependencies:Specifying Dependencies>`
64+
We strongly recommend to :ref:`pin the MkDocs version <guides/troubleshooting/specifying-dependencies:Specifying Dependencies>`
6565
used for your project to build the docs to avoid potential future incompatibilities.
6666

6767

@@ -109,7 +109,7 @@ An example in code:
109109
Regardless of whether you build your docs with Sphinx or MkDocs,
110110
we recommend you pin the version of Sphinx or Mkdocs you want us to use.
111111
You can do this the same way other
112-
:doc:`dependencies are specified <guides/specifying-dependencies>`.
112+
:doc:`dependencies are specified <guides/troubleshooting/specifying-dependencies>`.
113113
Some examples of pinning versions might be ``sphinx<2.0`` or ``mkdocs>=1.0``.
114114

115115
Builder responsibility

docs/faq.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ My project requires different settings than those available under Admin
7575
Read the Docs offers some settings which can be used for a variety of purposes,
7676
such as to use the latest version of sphinx or pip. To enable these settings,
7777
please send an email to [email protected] and we will change the settings for the project.
78-
Read more about these settings :doc:`here <guides/feature-flags>`.
78+
Read more about these settings :doc:`here <guides/troubleshooting/feature-flags>`.
7979

8080
I get import errors on libraries that depend on C modules
8181
---------------------------------------------------------
@@ -194,7 +194,7 @@ and as a result, it tends to look a bit better with the default theme.
194194
.. note::
195195

196196
To use these extensions you need to specify the dependencies on your project
197-
by following this :doc:`guide <guides/specifying-dependencies>`.
197+
by following this :doc:`guide <guides/troubleshooting/specifying-dependencies>`.
198198

199199
Can I document a python package that is not at the root of my repository?
200200
-------------------------------------------------------------------------

docs/features.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ GitHub, Bitbucket and GitLab Integration
88

99
We now support linking by default in the sidebar. It links to the page on your host, which should help people quickly update typos and send pull requests to contribute to project documentation.
1010

11-
More information can be found in :doc:`guides/vcs`.
11+
More information can be found in :doc:`guides/troubleshooting/vcs`.
1212

1313
Auto-updating
1414
-------------
@@ -26,7 +26,7 @@ Canonical URLs
2626

2727
Canonical URLs give your docs better search performance, by pointing all URLs to one version. This also helps to solve the issues around users landing on outdated versions of documentation.
2828

29-
More information can be found in the :doc:`guides/canonical` page.
29+
More information can be found in the :doc:`guides/troubleshooting/canonical` page.
3030

3131
Versions
3232
--------

docs/guides/autobuild-docs-for-pull-requests.rst renamed to docs/guides/how-to/autobuild-docs-for-pull-requests.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Autobuild Documentation for Pull Requests
22
=========================================
33

44
Read the Docs allows autobuilding documentation for pull/merge requests for GitHub or GitLab projects.
5-
This feature is currently available under a :doc:`Feature Flag </guides/feature-flags>`.
5+
This feature is currently available under a :doc:`Feature Flag </guides/troubleshooting/feature-flags>`.
66
So, you can enable this feature by sending us an `email <mailto:[email protected]>`__ including your project URL.
77

88
Features

docs/guides/how-to/index.rst

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ whether that is Sphinx or MkDocs.
1616
:maxdepth: 1
1717

1818
adding-custom-css
19-
custom-404-page
2019
manage-translations
2120
remove-edit-buttons
22-
vcs
21+
build-notifications
22+
build-using-too-many-resources
23+
technical-docs-seo-guide
2324

2425
Read the Docs how-to guides
2526
---------------------------
@@ -32,10 +33,4 @@ These guides will help you customize or tune aspects of the Read the Docs build
3233
autobuild-docs-for-pull-requests
3334
build-notifications
3435
technical-docs-seo-guide
35-
canonical
36-
conda
37-
environment-variables
38-
feature-flags
3936
google-analytics
40-
searching-with-readthedocs
41-
sitemaps

docs/guides/how-to/technical-docs-seo-guide.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Redirects
141141
~~~~~~~~~
142142

143143
Redirects tell search engines when content has moved.
144-
For example, if this guide moved from ``guides/technical-docs-seo-guide.html`` to ``guides/sphinx-seo-guide.html``,
144+
For example, if this guide moved from ``guides/how-to/technical-docs-seo-guide.html`` to ``guides/sphinx-seo-guide.html``,
145145
there will be a time period where search engines will still have the old URL in their index
146146
and will still be showing it to users.
147147
This is why it is important to update your own links within your docs as well as redirecting.
@@ -161,7 +161,7 @@ The canonical URL tells search engines where the original version
161161
your documentation is even if you have multiple versions on the internet
162162
(for example, incomplete translations or deprecated versions).
163163

164-
Read the Docs supports :doc:`setting the canonical URL </guides/canonical>`
164+
Read the Docs supports :doc:`setting the canonical URL </guides/troubleshooting/canonical>`
165165
if you are using a :doc:`custom domain </custom_domains>`
166166
under :guilabel:`Admin` > :guilabel:`Domains`
167167
in the Read the Docs dashboard.
@@ -197,7 +197,7 @@ or any alternate language versions of a page.
197197

198198
Read the Docs generates a sitemap for you that contains the last time
199199
your documentation was updated as well as links to active versions, subprojects, and translations your project has.
200-
We have a small separate guide on :doc:`sitemaps </guides/how-to/sitemaps>`.
200+
We have a small separate guide on :doc:`sitemaps </guides/troubleshooting/sitemaps>`.
201201

202202
See the `Google docs on building a sitemap <https://support.google.com/webmasters/answer/183668>`_.
203203

docs/guides/troubleshooting/conda.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This work was funded by `Clinical Graphics`_ -- many thanks for their support of
1111
Activating Conda
1212
----------------
1313

14-
Conda support is available using a :doc:`../config-file/index`, see :ref:`config-file/v2:conda`.
14+
Conda support is available using a :doc:`../../config-file/index`, see :ref:`config-file/v2:conda`.
1515

1616
This Conda environment will also have Sphinx and other build time dependencies installed.
1717
It will use the same order of operations that we support currently:

docs/guides/troubleshooting/index.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ whether that is Sphinx or MkDocs.
1515
.. toctree::
1616
:maxdepth: 1
1717

18+
custom-404-page
1819
mkdocs-old-versions
1920
pdf-non-ascii-languages
20-
remove-edit-buttons
21-
21+
vcs
22+
feature-flags
23+
sitemaps
24+
wipe-environment
2225

2326
Read the Docs troubleshooting guides
2427
-------------------------------------
@@ -32,3 +35,4 @@ These troubleshooting guides are for the Read the Docs build environment.
3235
conda
3336
environment-variables
3437
specifying-dependencies
38+
searching-with-readthedocs

docs/guides/searching-with-readthedocs.rst renamed to docs/guides/troubleshooting/searching-with-readthedocs.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ how to use advanced query syntax to get more accurate results and
77
many other search features that Read the Docs supports with example searches.
88

99
You can find information on the search architecture and how we index document on our
10-
:doc:`Search <../development/search>` docs.
10+
:doc:`Search <../../development/search>` docs.
1111

1212

1313
.. contents:: Table of contents
@@ -67,7 +67,7 @@ You can see these analytics in your project admin dashboard.
6767
.. note::
6868

6969
Currently, this feature is in beta state and is available under a
70-
:ref:`feature flag <guides/feature-flags:Available Flags>`.
70+
:ref:`feature flag <guides/troubleshooting/feature-flags:Available Flags>`.
7171
We plan to make this available for everyone soon.
7272
If you want to test this feature out and help giving us feedback,
7373
please contact us via `GitHub issues`_.
@@ -102,7 +102,7 @@ Search inside subprojects
102102
~~~~~~~~~~~~~~~~~~~~~~~~~
103103

104104
We allow projects to configured as subprojects of another project.
105-
You can read more about this in our :doc:`Subprojects <../subprojects>` documentation.
105+
You can read more about this in our :doc:`Subprojects <../../subprojects>` documentation.
106106

107107
If a search is made in a project which have one or more subprojects under it,
108108
the search results then also includes the results from subprojects because

docs/index.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ out of your documentation and Read the Docs.
122122
:doc:`Automatic redirects <automatic-redirects>`
123123

124124
* **Topic specific guides**:
125-
:doc:`How-to guides <guides/index>`
125+
:doc:`How-to guides <guides/how-to/index>`
126+
:doc:`Troubleshooting guides <guides/troubleshooting/index>`
126127

127128
* **Extending Read the Docs**:
128129
:doc:`REST API <api/index>`
@@ -142,7 +143,8 @@ out of your documentation and Read the Docs.
142143
user-defined-redirects
143144
automatic-redirects
144145

145-
guides/index
146+
guides/how-to/index
147+
guides/troubleshooting/index
146148

147149
api/index
148150

docs/single_version.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ if pip was set as a "Single Version" project, then links to its documentation wo
2323
``http://pip.readthedocs.io/`` rather than the default ``http://pip.readthedocs.io/en/latest/``.
2424

2525
Documentation at ``/<language>/<default_version>/`` will still be served for backwards compatibility reasons.
26-
However, our usage of :doc:`guides/canonical` should stop these from being indexed by Google.
26+
However, our usage of :doc:`guides/troubleshooting/canonical` should stop these from being indexed by Google.
2727

2828
.. _dashboard: https://readthedocs.org/dashboard/

0 commit comments

Comments
 (0)