Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix all but 2 broken links and redirects #3019

Merged
merged 22 commits into from Feb 2, 2022
Merged

Fix all but 2 broken links and redirects #3019

merged 22 commits into from Feb 2, 2022

Conversation

stevepiercy
Copy link
Collaborator

This PR fixes all broken links to be compatible with MyST syntax when imported into the Plone 6 Docs, with a couple of problems:

Can someone advise what should be done with these two links?

@stevepiercy stevepiercy mentioned this pull request Feb 1, 2022
Merged
@stevepiercy stevepiercy added this to the Plone 6.0 milestone Feb 1, 2022
@sneridagh
Copy link
Member

@stevepiercy the first one should point to kitconcept.volto repo (replace plone.volto with kitconcept.volto) remove the last one, it's outdated anyways.

@stevepiercy
Copy link
Collaborator Author

Just deleting the second link would make that entire page read strangely. Should I remove the entire page? See https://docs.voltocms.com/addons/i18n/

@stevepiercy
Copy link
Collaborator Author

FWIW, there is i18n in docs/volto/recipes/i18n.md. Not sure whether that is the authoritative source of i18n.

@stevepiercy
Copy link
Collaborator Author

meh. Build fails: https://github.com/plone/volto/runs/5021895439?check_suite_focus=true#step:6:115

Error: Failed downloading the Cypress binary.

Does that happen often?

@stevepiercy
Copy link
Collaborator Author

I am confused and do not know how to proceed.

There are two i18n things.

Both @sneridagh and @nileshgulia1 say that addons/i18n has incorrect information. Just removing or updating links might make the entire page false. Should the page be removed or updated?

Please advise or push commits to this PR. Thank you!

stevepiercy
stevepiercy commented Feb 2, 2022
View reviewed changes
Copy link
Collaborator Author

@stevepiercy stevepiercy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly English grammar and syntax fixes, but keep one line per sentence and shorter sentences.

docs/source/addons/i18n.md Outdated Show resolved Hide resolved
docs/source/addons/i18n.md Outdated Show resolved Hide resolved
docs/source/addons/i18n.md Outdated Show resolved Hide resolved
docs/source/addons/i18n.md Outdated Show resolved Hide resolved
docs/source/addons/i18n.md Outdated Show resolved Hide resolved
docs/source/recipes/i18n.md Outdated Show resolved Hide resolved
docs/source/recipes/i18n.md Outdated Show resolved Hide resolved
docs/source/recipes/i18n.md Outdated Show resolved Hide resolved
docs/source/recipes/i18n.md Outdated Show resolved Hide resolved
docs/source/recipes/i18n.md Show resolved Hide resolved
ksuess and others added 8 commits February 2, 2022 09:45
@ksuess @stevepiercy
grammar and syntax fixes
156e51b 
Co-authored-by: Steve Piercy <web@stevepiercy.com>
@ksuess @stevepiercy
grammar and syntax fixes
ec91796 
Co-authored-by: Steve Piercy <web@stevepiercy.com>
@ksuess @stevepiercy
grammar and syntax fixes
f465b2e 
Co-authored-by: Steve Piercy <web@stevepiercy.com>
@ksuess @stevepiercy
mark technical terms
e8e69bd 
Co-authored-by: Steve Piercy <web@stevepiercy.com>
@ksuess @stevepiercy
Better wording
0cdf1e7 
Co-authored-by: Steve Piercy <web@stevepiercy.com>
@ksuess @stevepiercy
Clear instructions and result
9cd06db 
Co-authored-by: Steve Piercy <web@stevepiercy.com>
@ksuess @stevepiercy
grammar and syntax fixes
9640799 
Co-authored-by: Steve Piercy <web@stevepiercy.com>
@ksuess @stevepiercy
Clear instructions and result
28a352e 
Co-authored-by: Steve Piercy <web@stevepiercy.com>
@ksuess @stevepiercy
MySt adjustments
e6b10b4 
Co-Authored-By: Steve Piercy <web@stevepiercy.com>
@ksuess
Copy link
Member

ksuess commented Feb 2, 2022

Done. Thanks for reviewing the review ;-)

@sneridagh sneridagh force-pushed the linkcheck branch 2 times, most recently from 65d929a to c95c40c Compare February 2, 2022 12:18
@sneridagh
Merge branch 'plone6-docs' into linkcheck
f13f1c0 
* plone6-docs: (25 commits)
  Add projectId for Cypress dashboard (#3023)
  Docs: faster onboarding, identify running processes, improve internal proxy clarification (#3010)
  Pin pyOpenSSL to 21.1.0
  Back to development
  Release 14.7.0
  Prepare for release
  Fix changelog
  Look ma, no `momentjs`! (#2910)
  Back to development
  Release 14.6.0
  Prepare for release
  Fix ObjectWidget story (#3009)
  Use `volto.config.js` as dynamic configuration for addons. It adds up… (#3008)
  fix: enable url with 'underscore' char
  fix: fixed italian translations
  Back to development
  Release 14.5.0
  Prepare for release
  Chenges to lockfile not saved, apparently :/
  Fix `language-independent-field` CSS class styling (#3005)
  ...
@sneridagh
Copy link
Member

@stevepiercy @ksuess Now it's ok... :( Sorry for the force pushes, I messed it up merging (twice) master instead of plone6-docs T_T

@stevepiercy
Copy link
Collaborator Author

Some changes got overwritten when you merged master into both linkcheck and plone6-docs. I think the cleaner way is to git reset hard on the commits before the merge commits, force push, and then we go from there. All these extra merge commits are impossible to review and make sure nothing got clobbered.

@stevepiercy
Copy link
Collaborator Author

OK, we got this straightened out with git reset hard and pushing to undo the merge commits. Merging!

@stevepiercy stevepiercy merged commit 139caed into plone6-docs Feb 2, 2022
@stevepiercy stevepiercy deleted the linkcheck branch February 2, 2022 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nileshgulia1 nileshgulia1 nileshgulia1 approved these changes

@sneridagh sneridagh sneridagh approved these changes

@ksuess ksuess ksuess approved these changes

@tiberiuichim tiberiuichim Awaiting requested review from tiberiuichim

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Plone 6.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@stevepiercy @sneridagh @ksuess @nileshgulia1