Skip to content

Commit bb821b6

Browse files
authored
Merge pull request #3933 from clarissecheung/GH-3710-fix-broken-documentation-links
Fix broken documentation links (#3710)
2 parents a3a68fa + 9e3f990 commit bb821b6

72 files changed

Lines changed: 105 additions & 104 deletions

File tree

Some content is hidden

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

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ For more information about this file see also [Keep a Changelog](http://keepacha
2525
- Added `PEcAn.data.land::to_co2e()` for converting SOC change, CH4, and N2O to CO2-equivalent emissions using IPCC Global Warming Potential values.
2626

2727
### Fixed
28+
- Fixed broken pecanproject.github.io, pecan.gitbooks.io, and other outdated documentation links across book_source, tutorials, models, modules, web, and shiny files (#3710).
2829
- Added note to DEV-INTRO.md documenting Traefik workaround for Apple Silicon (ARM64) Macs: use `traefik:v2.11` with `platform: linux/arm64` to fix 404 errors (#3910)
2930
- Fixed `web/08-finished.php`: show database info instead of "Still running" when workflow folder doesn't exist locally (#3501).
3031

DEV-INTRO.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ A better way of doing this is developed as part of GSOC, in which case you can l
253253

254254
## PEcAn URLs
255255

256-
You can check the RabbitMQ server used by pecan using <https://rabbitmq.pecan.localhost> on the same server that the docker stack is running on. You can use rstudio either with <http://server/rstudio> or at <http://rstudio.pecan.localhost>. To check the traefik dashboard you can use <http://traefik.pecan.localhost>.
256+
You can check the RabbitMQ server used by pecan using <https://rabbitmq.pecan.localhost> on the same server that the docker stack is running on. You can use rstudio either with `http://server/rstudio` or at <http://rstudio.pecan.localhost>. To check the traefik dashboard you can use <http://traefik.pecan.localhost>.
257257

258258
If the stack is running on a remote machine, you can use ssh and port forwarding to connect to the server. For example `ssh -L 8000:localhost:80` will allow you to use <http://rabbitmq.pecan.localhost:8000/> in your browser to connect to the remote PEcAn server RabbitMQ.
259259

base/utils/R/datasets.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#' Standardized variable names and units for PEcAn
33
#'
44
#' A lookup table giving standard names, units and descriptions for variables in PEcAn input/output files.
5-
#' Originally based on the \href{https://nacp.ornl.gov/MsTMIP_variables.shtml}{MsTMIP} standards,
5+
#' Originally based on the \href{https://nacp-prod.ornl.gov/MsTMIP_variables.shtml}{MsTMIP} standards,
66
#' with additions to accomodate a wider range of model inputs and outputs.
77
#' The standard_vars table replaces both `mstmip_vars` and `mstmip_local`,
88
#' both of which are now deprecated.
@@ -13,7 +13,7 @@
1313
#' @format data frame, all columns character
1414
#' \describe{
1515
#' \item{Variable.Name}{Short name suitable for programming with}
16-
#' \item{standard_name}{Name used in the NetCDF \href{http://cfconventions.org/Data/cf-standard-names/current/build/cf-standard-name-table.html}{CF metadata conventions} }
16+
#' \item{standard_name}{Name used in the NetCDF \href{https://cf-convention.github.io/Data/cf-standard-names/current/build/cf-standard-name-table.html}{CF metadata conventions} }
1717
#' \item{Units}{Standard units for this variable. Do not call variables by these names if they are in different units.
1818
#' See `ud_convert` for conversions to and from non-standard units}
1919
#' \item{Long.Name}{Human-readable variable name, suitable for e.g. axis labels}

base/utils/R/read.output.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#' surface runoff (Qs), subsurface runoff (Qsb), and rainfall (Rainf).
1212
#'
1313
#' For more details, see the [MsTMIP
14-
#' variables](http://nacp.ornl.gov/MsTMIP_variables.shtml)
14+
#' variables](https://nacp-prod.ornl.gov/MsTMIP_variables.shtml)
1515
#' documentation.
1616
#'
1717
#' @param runid the ID distinguishing the model run. Can be omitted

base/utils/man/read.output.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

base/utils/man/standard_vars.Rd

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

book_source/01_introduction/03_how_to_use_book.Rmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ We have no strict rules about this, but it's useful to have tags that give some
8181
If section organization changes, it is fine to move header tags, but **avoid altering existing tags** as this will break all the links pointing to that tag.
8282
(Note that it is also possible to link to section headings by their exact title. However, this is not recommended because these section titles could change, which would break the links.)
8383

84-
When referring to PEcAn packages or specific functions, it is a good idea to link to the [rendered package documentation](https://pecanproject.github.io/pkgdocs.html).
85-
For instance, here are links to the [`models/ed`](https://pecanproject.github.io/models/ed/docs/index.html) package, the [`PEcAn.ED2::modify_ed2in`](https://pecanproject.github.io/models/ed/docs/reference/modify_ed2in.html) function, and the PEcAnRTM package [vignette](https://pecanproject.github.io/modules/rtm/docs/articles/pecanrtm.vignette.html).
84+
When referring to PEcAn packages or specific functions, it is a good idea to link to the [rendered package documentation](https://pecanproject.github.io/package-documentation/develop/).
85+
For instance, here are links to the [`PEcAn.ED2`](https://pecanproject.github.io/package-documentation/develop/PEcAn.ED2/) package, the [`PEcAn.ED2::modify_ed2in`](https://pecanproject.github.io/package-documentation/develop/PEcAn.ED2/reference/modify_ed2in.html) function, and the PEcAnRTM package [vignette](https://pecanproject.github.io/package-documentation/develop/PEcAnRTM/articles/pecanrtm.vignette.html).
8686
If necessary, you can also link directly to specific lines or blocks in the source code on GitHub, [like this](https://github.com/PecanProject/pecan/blob/develop/models/ed/R/create_veg.R#L11-L25).
8787
(To get a link to a line, click its line number. To then select a block, shift-click another line number.)
8888

book_source/02_demos_tutorials_workflows/05_developer_workflows/02_git/01_using-git.Rmd

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ If you would like to make changes to a release branch, you must follow a differe
283283

284284
#### Tags
285285

286-
Git supports two types of tags: lightweight and annotated. For more information see the [Tagging Chapter in the Git documentation](http://git-scm.com/book/ch2-6.html).
286+
Git supports two types of tags: lightweight and annotated. For more information see the [Tagging Chapter in the Git documentation](https://git-scm.com/book/en/v2/Git-Basics-Tagging).
287287

288288
Lightweight tags are useful, but here we discuss the annotated tags that are used for marking stable versions, major releases, and versions associated with published results.
289289

@@ -312,7 +312,7 @@ To tag an earlier commit, just append the commit SHA to the command, e.g.
312312
* GitHub help pages,
313313
[https://help.github.com](https://help.github.com)/
314314
* Main GIT page
315-
[http://git-scm.com/documentation](http://git-scm.com/documentation)
315+
[https://git-scm.com/doc](https://git-scm.com/doc)
316316
* Another set of pages about branching,
317317
[http://sandofsky.com/blog/git-workflow.html](http://sandofsky.com/blog/git-workflow.html)
318318
* [Stackoverflow highest voted questions tagged "git"](http://stackoverflow.com/questions/tagged/git?sort=votes&pagesize=50)
@@ -322,8 +322,7 @@ To tag an earlier commit, just append the commit SHA to the command, e.g.
322322

323323
When in doubt, the first step is to click the "Help" button at the top of the page.
324324

325-
* [GitHub Flow](http://scottchacon.com/2011/08/31/github-flow.html) by
326-
Scott Chacon (Git evangelist and Ruby developer working on GitHub.com)
325+
* [GitHub Flow](https://docs.github.com/en/get-started/quickstart/github-flow)
327326
* [GitHub FAQ](https://help.github.com/)
328327
* [Using Pull Requests](https://help.github.com/articles/using-pull-requests)
329328
* [SSH Keys](https://help.github.com/articles/generating-ssh-keys)

book_source/02_demos_tutorials_workflows/05_developer_workflows/02_git/02_Github-issues.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Note:
4545

4646

4747
(from The Pragmatic Programmer, available as
48-
[ebook](http://proquestcombo.safaribooksonline.com/0-201-61622-X/223)
48+
[ebook](https://github.com/lighthousand/books/blob/master/the-pragmatic-programmer.pdf)
4949
through UI libraries, hardcopy on David’s bookshelf)\
5050

5151
* focus on “user stories”, e.g. specific use cases

book_source/02_demos_tutorials_workflows/05_developer_workflows/04_docker/07_migrate.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ProxyPassReverse /bety/ http://pecan.localhost/bety/
3434
RedirectMatch permanent ^/bety$ /bety/
3535
```
3636

37-
Once this modified we can restart apache using `systemctl restart apache2`. At this point BETY is running in a container and is accessable trough the webserver at http://server/bety/.
37+
Once this modified we can restart apache using `systemctl restart apache2`. At this point BETY is running in a container and is accessable trough the webserver at `http://server/bety/`.
3838

3939

4040
To upgrade to a new version of BETY you can now use the docker commands. You can use the following commands to stop BETY, pull the latest image down, migrate the database (you made a backup correct?) and start BETY again.

0 commit comments

Comments
 (0)