search

Cantera / cantera-website

Official Cantera Website
https://cantera.org
Other
15 stars 26 forks source link

Fix link formatting in reST #197

Closed ischoegl closed 2 years ago

ischoegl commented 2 years ago

Switch Markdown to reST syntax ...

bryanwweber commented 2 years ago

I'm not sure what the status of testing is right now with respect to merged PRs, so I'm not merging this pending a check on that. @ischoegl feel free to merge if this is good to go.

ischoegl commented 2 years ago

@bryanwweber ... thanks! I'm not familiar enough with how testing gets treated at this point, so I want to make sure the fix is applied as appropriate (this change doesn't apply to 2.5.1). Fwiw, I assume that testing will replace main once 2.6.0 is released?

bryanwweber commented 2 years ago

Fwiw, I assume that testing will replace main once 2.6.0 is released?

That's not the usual purpose of the testing branch, but I think that's the plan for this release. My comment was saying that I know there have been several PRs targeting the testing branch lately, and I'm not sure how this change relates to those PRs. I suppose since there are no merge conflicts, testing is up-to-date with changes affecting this line, but I wasn't sure...

ischoegl commented 2 years ago

Thanks for the clarification! This PR is based on testing, so I think this is ok then.

speth commented 2 years ago

testing was originally introduced as a way to see rendered versions of changes on testing.cantera.org, before GitHub had an interface for downloading built artifacts (or at least, before I knew how to use that feature).

I've been using it as a staging area for changes specific to the 2.6.0 release, with the expectation that we will merge it into the main branch when we release the final version of 2.6.0. I think changes from main can be freely merged and pushed into this branch.