Module: kamailio
Branch: master
Commit: 711144a1fa3e1dfa540cc7ccd0ce1c14faeba42f
URL: https://github.com/kamailio/kamailio/commit/711144a1fa3e1dfa540cc7ccd0ce1c1…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2015-09-01T14:18:02+02:00
drouting: notes about the format of duration attribute
---
Modified: modules/drouting/doc/drouting_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/711144a1fa3e1dfa540cc7ccd0ce1c1…
Patch: https://github.com/kamailio/kamailio/commit/711144a1fa3e1dfa540cc7ccd0ce1c1…
---
diff --git a/modules/drouting/doc/drouting_admin.xml b/modules/drouting/doc/drouting_admin.xml
index cebbe60..f3cffd9 100644
--- a/modules/drouting/doc/drouting_admin.xml
+++ b/modules/drouting/doc/drouting_admin.xml
@@ -469,7 +469,11 @@
be small enough such that subsequent intervals do not overlap.
For non-recurring intervals, durations of any positive length are
permitted, zero-length duration means <quote>forever</quote>.
- Negative-length durations are not allowed.
+ Negative-length durations are not allowed. In the common case of
+ a duration less than one day, the value starts with 'PT' followed by
+ number of hours, minutes and seconds, e.g., a duration of 8 hours
+ and 30 minutes is written 'PT8H30M'. See RFC 2445 DURATION
+ specifications for full format.
</para>
</listitem>
<listitem>
@@ -612,7 +616,7 @@
Here is an example of evaluating multiple Byxxx parameters.
</para>
<para>
- dtstart=<quote>19970105T083000</quote> duration=<quote>10M</quote>
+ dtstart=<quote>19970105T083000</quote> duration=<quote>PT10M</quote>
freq=<quote>yearly</quote> interval=<quote>2</quote>
bymonth=<quote>1</quote> byday=<quote>SU</quote>
</para>
Module: kamailio
Branch: master
Commit: 4ae2f50adacc93e919f4a1ae02b29c532d8a86cc
URL: https://github.com/kamailio/kamailio/commit/4ae2f50adacc93e919f4a1ae02b29c5…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2015-09-01T14:13:14+02:00
README.md: added notes about licensing
---
Modified: README.md
---
Diff: https://github.com/kamailio/kamailio/commit/4ae2f50adacc93e919f4a1ae02b29c5…
Patch: https://github.com/kamailio/kamailio/commit/4ae2f50adacc93e919f4a1ae02b29c5…
---
diff --git a/README.md b/README.md
index ef83f9f..1488c4b 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,18 @@ To keep a coherent and consitent history of the development, the commit messages
* https://www.kamailio.org/wiki/devel/github-contributions
+Contributions must conform with licensing rules of Kamailio project.
+
+## License
+
+Main License: GPLv2.
+
+Each source code file contains at the top the license and copyright details. Most of the code is licensed under GPLv2, some parts of the code are licensed under BSD.
+
+### New Contributions Licensing
+
+New contributions to core and several main modules (auth, corex, sl, tls, tm) have to be done under BSD license. New contributions under GPL must grant the GPL-OpenSSL linking exception. Contributions to existing components released under BSD must be done under BSD as well.
+
## Documentation
The main index for documentation is available at: