Skip to content

Commit dddc6c9

Browse files
authored
Merge pull request #1808 from nextstrain/fix-broken-links-1807
Fix broken links [#1807]
2 parents ca3dc6f + de30469 commit dddc6c9

File tree

8 files changed

+32
-15
lines changed

8 files changed

+32
-15
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,7 @@ This also fixed potential issues related to loading datasets where the URL queri
12171217
* Disable Untangling
12181218

12191219
## version 1.21.1 - 2018/06/04
1220-
* Narratives are now sourced from [the static github repo](https://github.com/nextstrain/static/tree/master/narratives)
1220+
* Narratives are now sourced from [the static github repo](https://github.com/nextstrain/static/tree/eea71fc22299c1d7febd25ea0ec1b00dcd286a3a~/narratives)
12211221

12221222
## version 1.21.0 - 2018/06/01
12231223
* Untangling via a simple algorithm upon 2nd tree load
@@ -1396,7 +1396,7 @@ This also fixed potential issues related to loading datasets where the URL queri
13961396
## version 1.14.0 - 2018/02/27
13971397

13981398
### Features
1399-
* Strain search (using [awesomplete](https://leaverou.github.io/awesomplete/)).
1399+
* Strain search (using [awesomplete](https://projects.verou.me/awesomplete/)).
14001400
This highlights the path to a single tip and increases the tip radius.
14011401
Strain is stored in the URL query (`s=...`) and can be restored via URL.
14021402
Selected strain also appears in the info panel (top of screen).

docs/conf.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,23 @@
6666
intersphinx_mapping = {
6767
'docs.nextstrain.org': ('https://docs.nextstrain.org/en/latest/', None),
6868
}
69+
70+
71+
# -- Linkchecking ------------------------------------------------------------
72+
73+
## NOTE: for both sets of regular expressions that follow, the
74+
## underlying linkchecker code uses `re.match()` to apply them to URLs
75+
## — so there's already an implicit "only at the beginning of a
76+
## string" matching happening, and something like a plain `r'google'`
77+
## regular expression will _NOT_ match all google.com URLs.
78+
linkcheck_ignore = [
79+
# we have links to localhost for explanatory purposes; obviously
80+
# they will never work in the linkchecker
81+
r'^http://localhost:\d+',
82+
]
83+
linkcheck_anchors_ignore_for_url = [
84+
# Github uses anchor-looking links for highlighting lines but
85+
# handles the actual resolution with Javascript, so skip anchor
86+
# checks for Github URLs:
87+
r'^https://github\.com',
88+
]

docs/customise-client/overview.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Overview (Client)
33
======================================
44

55

6-
Auspice allows you to customise the appearance and functionality of Auspice `when the client is built <../introduction/how-to-run.html#auspice-build>`_.
6+
Auspice allows you to customise the appearance and functionality of Auspice :ref:`when the client is built <auspice-build>`.
77
This is how Auspice running locally and nextstrain.org look different, despite both using "Auspice".
88

99
.. image:: ../assets/auspice-vs-nextstrain.png
@@ -21,7 +21,7 @@ This is achieved by providing a JSON at build time to Auspice which defines the
2121
`Here's <https://github.com/nextstrain/nextstrain.org/blob/master/auspice-client/customisations/config.json>`_ the file used by nextstrain.org to change the appearance of Auspice in the above image.
2222

2323

24-
See the `client customisation API <api.html>`_ for the available options.
24+
See the :doc:`client customisation API <./api>` for the available options.
2525

2626
AGPL Source Code Requirement
2727
============================

docs/customise-client/requests.rst

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Requests Made from the Client
22
=============================
33

4-
The Auspice client will make a number of requests to various endpoints, which this document aims to provide an overview of. Some of these are dependent on the `build-time customisations <./api>`__ in use, and we plan to allow more flexibility here using this mechanism.
4+
The Auspice client will make a number of requests to various endpoints, which this document aims to provide an overview of. Some of these are dependent on the :doc:`build-time customisations <./api>` in use, and we plan to allow more flexibility here using this mechanism.
55

66
Requests to the Auspice Server
77
------------------------------
@@ -36,15 +36,10 @@ The initial Auspice page (i.e. the one which displays a listing of available dat
3636
External Requests
3737
-----------------
3838

39-
Fonts
40-
~~~~~
41-
42-
Two initial requests for fonts are made, for `Google-hosted Lato fonts (CSS) <https://fonts.googleapis.com/css?family=Lato:100,200,300,400,500,700>`__ and `font-awesome (CSS) <https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css%22%3E>`__. These in turn make a number of subsequent requests for the individual font files etc.
43-
4439
Leaflet
4540
~~~~~~~
4641

47-
We use `Leaflet <https://leafletjs.com/>`__ to display the map tiles. There is one `initial CSS request <https://unpkg.com/leaflet@1.0.1/dist/leaflet.css>`__ which is always made, regardless of whether a map is displayed.
42+
We use `Leaflet <https://leafletjs.com/>`__ to display the map tiles.
4843

4944
If a map is displayed by Auspice the individual tiles are requested from api.mapbox.com. Panning and zooming of the map result in futher requests for tiles. These are requested using our hardcoded access key, however this may change to a build-time-customisation in the future.
5045

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ License and Copyright
4242

4343
Copyright © 2014-2020 Trevor Bedford and Richard Neher.
4444

45-
Source code to Nextstrain is made available under the terms of the `GNU Affero General Public License <LICENSE.txt>`_ (AGPL). Nextstrain is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
45+
Source code to Nextstrain is made available under the terms of the `GNU Affero General Public License <https://github.com/nextstrain/auspice/blob/-/LICENSE.txt>`_ (AGPL). Nextstrain is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
4646

4747

4848
.. toctree::

docs/introduction/how-to-run.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ This is the main command we'll run Auspice with, as it makes Auspice available i
4343

4444
For more complicated setups, where you define your own server handlers, see :ref:`supplying custom handlers to the Auspice server <server-api-supplying-custom-handlers>`.
4545

46+
.. _auspice-build:
47+
4648
``auspice build``
4749
-----------------
4850

docs/releases/v2.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ We've made more things available when you hover over the tree or click on a tree
114114
Display of second trees
115115
-----------------------
116116

117-
Auspice has had the ability to display two trees side-by-side for a while now (and `finally documented <../advanced-functionality/second-trees.md>`__). If you wanted to, say, compare influenza HA & NA trees, the URL used to look like "flu/seasonal/h3n2/ha:na/2y". This turned out to be problematic when coming up with suitable candidates for potential second-trees, and also made it impossible to compare, for instance, "ha/2y" with "na/3y"
117+
Auspice has had the ability to display two trees side-by-side for a while now (and :doc:`finally documented <../../advanced-functionality/second-trees>`). If you wanted to, say, compare influenza HA & NA trees, the URL used to look like "flu/seasonal/h3n2/ha:na/2y". This turned out to be problematic when coming up with suitable candidates for potential second-trees, and also made it impossible to compare, for instance, "ha/2y" with "na/3y"
118118

119119
We now use a more verbose syntax to define the display of multiple trees, specifying the entire pathname for both datasets. The above example is now "flu/seasonal/h3n2/ha/2y:flu/seasonal/h3n2/na/2y". Any available datasets can be compared using this URL syntax, even if the result is rather nonsensical. The old syntax will continue to work and will automatically correct to the new syntax (and show you a warning).
120120

docs/server/overview.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Currently the client is able to make three requests:
2727
For instance, when you're running ``auspice view`` if you go to `localhost:4000/charon/getAvailable <http://localhost:4000/charon/getAvailable>`_ you'll see a list of the available datasets and narratives known to the server.
2828
Similarly, nextstrain.org is a server which has handlers for these three API endpoints, so if you visit `nextstrain.org/charon/getAvailable <https://nextstrain.org/charon/getAvailable>`_ you'll see Nextstrain's available datasets.
2929

30-
See `the server API <../server/api.html>`_ for details about each of these requests.
30+
See :doc:`the server API <./api>` for details about each of these requests.
3131

3232
.. note::
3333
Note that "/charon" can be changed to any address you wish by customising the client at build time.
@@ -45,7 +45,7 @@ Customising the Default Auspice Server
4545
======================================
4646

4747
You can customise the default Auspice server by supplying your own handlers for each of the three GET requests.
48-
See `the API documentation <../server/api.html#supplying-custom-handlers-to-the-auspice-server>`_ for how to define these and provide them to `auspice view`.
48+
See :ref:`the API documentation <server-api-supplying-custom-handlers>` for how to define these and provide them to `auspice view`.
4949

5050

5151
AGPL Source Code Requirement

0 commit comments

Comments
 (0)