Skip to content

docs: fix a few simple typos #477

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

Merged
josegonzalez merged 1 commit into from
Jul 12, 2021
Merged

docs: fix a few simple typos #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ included in the project:
[interactive rebase](https://help.github.com/articles/about-git-rebase/)
feature to tidy up your commits before making them public.
- Test cases should accompany any change in functionality to the code-base
- Any change to end-user functionality should include corrosponding documentation
- Any change to end-user functionality should include corresponding documentation

5. Locally merge (or rebase) the upstream development branch into your topic branch:

Expand Down
6 changes: 3 additions & 3 deletions beaver/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,16 +180,16 @@ def _replace_all(path, replacements):
def multiline_merge(lines, current_event, re_after, re_before):
""" Merge multi-line events based.

Some event (like Python trackback or Java stracktrace) spawn
Some event (like Python traceback or Java stacktrace) spawn
on multiple line. This method will merge them using two
regular expression: regex_after and regex_before.

If a line match re_after, it will be merged with next line.

If a line match re_before, it will be merged with previous line.

This function return a list of complet event. Note that because
we don't know if an event is complet before another new event
This function return a list of complete event. Note that because
we don't know if an event is complete before another new event
start, the last event will not be returned but stored in
current_event. You should pass the same current_event to
successive call to multiline_merge. current_event is a list
Expand Down