-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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
backport 6.x: doc: update file.data keyword documentation v1 6563 #9862
backport 6.x: doc: update file.data keyword documentation v1 6563 #9862
Conversation
Signed-off-by: jason taylor <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While reviewing our merging PR, I noticed a difference between the documentation for file.data
in 6 and the ones for 7 and 8. Left an inline comment about it :)
@@ -787,3 +787,4 @@ Notes | |||
pattern '<html' is absent from the first inspected chunk. | |||
|
|||
- ``file_data`` can also be used with SMTP |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A bit confused wrt why this was left here, but removed from 7 and 8 documentation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like I missed this part when I was fixing up the cherry-pick conflicts (I also apparently forgot the -x). I can get this fixed up.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see, thanks! I'll leave the decision to Victor in this, but IMHO a fixup works.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing the cherry-picked from
line in commit message needed to correlate backports. See 2440413
It can be done with git cherry-pick -x <commit-hash>
while cherry picking a commit.
I don't think this is critical for doc backports, esp contributed ones. And especially since we're not documenting this anywhere. See also https://redmine.openinfosecfoundation.org/issues/6568 |
continued in #9867 |
Make sure these boxes are signed before submitting your Pull Request -- thank you.
https://docs.suricata.io/en/latest/devguide/codebase/contributing/contribution-process.html
https://suricata.io/about/contribution-agreement/ (note: this is only required once)
Link to redmine ticket:
https://redmine.openinfosecfoundation.org/issues/6563
Describe changes:
Provide values to any of the below to override the defaults.
To use a pull request use a branch name like
pr/N
whereN
is thepull request number.
Alternatively,
SV_BRANCH
may also be a link to anOISF/suricata-verify pull-request.