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

Update glossary.md #171

Merged
merged 14 commits into from
Aug 28, 2023
Merged

Update glossary.md #171

merged 14 commits into from
Aug 28, 2023

Conversation

stufraser1
Copy link
Member

@stufraser1 stufraser1 commented Aug 3, 2023 •
edited by odscjen
Loading

Updating to add loss components and adjust other entries. Removes images as discussed in #157.

Merge checklist

  • Update the changelog (style guide)
  • Run ./manage.py pre-commit

@stufraser1
Update glossary.md
ec3dcfc 
Updating to add loss components and adjust other entries.
Removes images as discussed in #157.
matamadio
matamadio previously approved these changes Aug 3, 2023
View reviewed changes
Copy link
Contributor

@matamadio matamadio left a comment

Choose a reason for hiding this comment

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

Just remove ** ** around "gains" in disaster impact definition.

@stufraser1
Update glossary.md
0740492 
remove emphasis in a definition of impacts
@stufraser1
Update changelog.md
6f7f955
@stufraser1
Copy link
Member Author

Just remove ** ** around "gains" in disaster impact definition.

Edited.

@stufraser1
Copy link
Member Author

@odscjen for your review, pre-commit, and merge please

odscjen
odscjen requested changes Aug 4, 2023
View reviewed changes
Copy link
Contributor

@odscjen odscjen left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Some copy editing changes suggested alongside adding in some interpage links to make it clear where definitions rely on each other.

I've merged the latest dev and once suggestions have been addressed I'll run pre-commit and merge this branch into dev

docs/glossary.md Outdated Show resolved Hide resolved
docs/glossary.md Outdated Show resolved Hide resolved
docs/glossary.md Outdated Show resolved Hide resolved
docs/glossary.md Outdated Show resolved Hide resolved
docs/glossary.md Outdated Show resolved Hide resolved
docs/glossary.md Outdated Show resolved Hide resolved
docs/glossary.md Show resolved Hide resolved
docs/glossary.md Outdated Show resolved Hide resolved
stufraser1
stufraser1 commented Aug 28, 2023
View reviewed changes
Copy link
Member Author

@stufraser1 stufraser1 left a comment

Choose a reason for hiding this comment

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

accepted most, but not formatting definition to use bullet lists.

@stufraser1
Update glossary.md
ef245e5 
minor updates
@stufraser1
Copy link
Member Author

@odscjen please run pre-commmits and merge when convenient

@odscjen odscjen self-requested a review August 28, 2023 09:26
@odscjen odscjen merged commit 4893401 into dev Aug 28, 2023
4 checks passed
@odscjen odscjen deleted the docs-glossary branch August 28, 2023 09:26
@odscjen odscjen mentioned this pull request Aug 28, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@odscjen odscjen odscjen approved these changes

@matamadio matamadio matamadio left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@stufraser1 @matamadio @odscjen