<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [x] Commit message has the format required by CONTRIBUTING guide
- [x] Commits are split per component (core, individual modules, libs, utils, ...)
- [x] Each component has a single commit (if not, squash them into one commit)
- [x] No commits to README files for modules (changes must be done to docbook files
in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change
- [ ] Small bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds new functionality)
- [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [ ] Tested changes locally
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
Seems I managed to submit a corrupted doc file with my last PR. Tested it plenty this time and fixed a typo while I was at it.
Also I see this is showing my previous PR as well. I'm not sure how to make it not do that. Any tips would be appreciated.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3067
-- Commit Summary --
* stirshaken: Add PVs to allow access to x509 subject and ppt grants
* Merge branch 'kamailio:master' into master
* stirshaken: fix doc typos
-- File Changes --
M src/modules/stirshaken/doc/stirshaken_admin.xml (5)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3067.patchhttps://github.com/kamailio/kamailio/pull/3067.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3067
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/3067(a)github.com>
Module: kamailio
Branch: master
Commit: 1986ac41e38d2bd7600a19527cf00164876e77e3
URL: https://github.com/kamailio/kamailio/commit/1986ac41e38d2bd7600a19527cf0016…
Author: Trevor Peirce <trev(a)acrovoice.ca>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2022-04-01T13:52:31+02:00
stirshaken: fix doc typos
---
Modified: src/modules/stirshaken/doc/stirshaken_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/1986ac41e38d2bd7600a19527cf0016…
Patch: https://github.com/kamailio/kamailio/commit/1986ac41e38d2bd7600a19527cf0016…
---
diff --git a/src/modules/stirshaken/doc/stirshaken_admin.xml b/src/modules/stirshaken/doc/stirshaken_admin.xml
index 1e7c7001ef..f54747d0cf 100644
--- a/src/modules/stirshaken/doc/stirshaken_admin.xml
+++ b/src/modules/stirshaken/doc/stirshaken_admin.xml
@@ -275,8 +275,7 @@ modparam("stirshaken", "vs_certsubject_pvname", "$vn(certsubject)")
</programlisting>
</example>
</section>
- </section>
- <section>
+ <section>
<title><varname>vs_pptgrants_pvname</varname> (str)</title>
<para>
If vs_pptgrants_pvname is set then the JSON string of the authenticated PASSporT's grants will be written to this pseudo-variable when
@@ -422,7 +421,7 @@ request_route {
</para>
<para>
The parameters can contain pseudo-variables.
- If origid is empty, an unique identifier will be generated wih libuuid, e.g. "3f31bd2b-9fc4-4084-b0b0-566506c46292".
+ If origid is empty, an unique identifier will be generated with libuuid, e.g. "3f31bd2b-9fc4-4084-b0b0-566506c46292".
</para>
<para>
This function can be used from ANY_ROUTE.