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

Documentation updates (Thanks @guydebros!) #1031

Merged
merged 5 commits into from
Aug 22, 2020
Merged

Documentation updates (Thanks @guydebros!) #1031

merged 5 commits into from
Aug 22, 2020

Conversation

wren
Copy link
Member

@wren wren commented Aug 22, 2020 •
edited
Loading

This is an amalgamation of #980, #981, and #982 to fix merge conflicts.

Checklist

  • I have read the contributing doc.
  • I have included a link to the relevant issue number.
  • I have tested this code locally.
  • I have checked to ensure there aren't other open pull requests
    for the same issue.
  • I have written new tests for these changes, as needed.
  • All tests pass.

@guydebros @wren
updated README.md:
b32c6a9 
- corrected information about encryption
- made additions based on proposed changes to overview.md
- made other changes for clarity and grammar
@guydebros @wren
ongoing changes to overview.md
0fa21d7
@guydebros @wren
added note that pycrypto is required
ffe6e90 
made other small changes for grammar and clarity
@guydebros @wren
added new python decryption script to encryption.md
c0f7f22
@guydebros @wren
updated encryption.md to clarify dependencies
87b2501 
other relatively small changes for clarity

straightened quotes
This was referenced Aug 22, 2020
Closed
Closed
Closed
micahellison
micahellison approved these changes Aug 22, 2020
View reviewed changes
Copy link
Member

@micahellison micahellison left a comment

Choose a reason for hiding this comment

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

📚📕📔📗📘📙📚

@micahellison micahellison merged commit 29234dd into jrnl-org:develop Aug 22, 2020
@wren wren deleted the docs-updates branch August 22, 2020 19:35
wren added a commit that referenced this pull request Oct 17, 2020
@wren @guydebros
Documentation updates (Thanks @guydebros!) (#1031)
ec12e17 
* updated README.md:

- corrected information about encryption
- made additions based on proposed changes to overview.md
- made other changes for clarity and grammar

* ongoing changes to overview.md

* added note that `pycrypto` is required

made other small changes for grammar and clarity

* added new python decryption script to encryption.md

* updated encryption.md to clarify dependencies

other relatively small changes for clarity

straightened quotes

Co-authored-by: Guy B. deBros <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@micahellison micahellison micahellison approved these changes

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
@wren @micahellison @guydebros