[sr-dev] git:master:49befc18: Merge pull request #217 from eschmidbauer/master

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 49befc1814690020c87403ab01c9c477cd0aa86c
URL: https://github.com/kamailio/kamailio/commit/49befc1814690020c87403ab01c9c477cd0aa86c

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2015-06-19T15:29:19+02:00

Merge pull request #217 from eschmidbauer/master

added doc for proirites inside permission's module

---

Modified: modules/permissions/doc/permissions_admin.xml

---

Diff:  https://github.com/kamailio/kamailio/commit/49befc1814690020c87403ab01c9c477cd0aa86c.diff
Patch: https://github.com/kamailio/kamailio/commit/49befc1814690020c87403ab01c9c477cd0aa86c.patch

---

diff --git a/modules/permissions/doc/permissions_admin.xml b/modules/permissions/doc/permissions_admin.xml
index ce93321..a38e304 100644
--- a/modules/permissions/doc/permissions_admin.xml
+++ b/modules/permissions/doc/permissions_admin.xml
@@ -707,10 +707,12 @@ modparam("permissions", "tag_col", "peer_tag")
 		</example>
 	</section>
 	<section id ="permissions.p.priority_col">
-		<title><varname>priority_col</varname> (integer)</title>
+		<title><varname>priority_col</varname> (string)</title>
 		<para>
 		The column name used to store the priority of the corresponding rule from the database
-		row.
+		row. Priority values should be integer. When db_mode is set to 1 (caching), priorities
+                are ordered from highest to lowest. In non-caching mode, priority order (ASC vs DESC)
+                is determined by database.
 		</para>
 		<para>
 		<emphasis>