From 37abcc3d6e5f3774a07bbd9219484d72844b684a Mon Sep 17 00:00:00 2001
From: Liviu Chircu <liviu@opensips.org>
Date: Tue, 7 Jul 2020 17:03:49 +0300
Subject: [PATCH] permissions docs: Update partition, db_url and address_table

(cherry picked from commit 180674b833ef9e82cb3f97105add2ada6843ddc1)
(cherry picked from commit 67c06628eae20cca4fc3e5509435b775a425d17e)
(cherry picked from commit 8ad9847f0b010b5344c1d9fdf4b4f65f347efae8)
---
 modules/dialplan/doc/dialplan_admin.xml       |  2 +-
 modules/permissions/doc/permissions_admin.xml | 34 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/dialplan/doc/dialplan_admin.xml b/modules/dialplan/doc/dialplan_admin.xml
index aaa3fd125e0..556c1bd5c8a 100644
--- a/modules/dialplan/doc/dialplan_admin.xml
+++ b/modules/dialplan/doc/dialplan_admin.xml
@@ -321,7 +321,7 @@
 		<title><varname>partition</varname> (string)</title>
 		<para>
 		Specify a new dialplan partition (data source).  This parameter may
-		be set multiple times.  Each partition may have a specific "db_url" or
+		be set multiple times.  Each partition may have a specific "db_url" and
 		"table_name".  If not specified, these values will be inherited from
 		<xref linkend="param_db_url"/>, db_default_url or
 		<xref linkend="param_table_name"/>, respectively.  The name of
diff --git a/modules/permissions/doc/permissions_admin.xml b/modules/permissions/doc/permissions_admin.xml
index f64d76f70e7..97781695c2b 100644
--- a/modules/permissions/doc/permissions_admin.xml
+++ b/modules/permissions/doc/permissions_admin.xml
@@ -342,17 +342,17 @@ modparam("permissions", "deny_suffix", ".deny")
 	<section id="param_db_url" xreflabel="db_url">
 		<title><varname>db_url</varname> (string)</title>
 		<para>
-		This is URL of the database to be used for loading the date related to
+		The URL of the database to be used for loading the data related to
 		IP-based checking (<quote>address</quote> table).
 		</para>
 		<para>
 		This parameter is optional and it is needed only if you use
 		functions related to IP-based checking. If you do so, you need to
-		explicitly set this parameter (it is not covered by 
+		explicitly set this parameter (it will not inherit from
 		<quote>db_default_url</quote>)
 		</para>
 		<para>
-		Since version 2.2, this URL represents the db_url for the 
+		Since version 2.2, this URL represents the db_url for the
 		<quote>default</quote> partition.
 		</para>
 		<para>
@@ -374,8 +374,8 @@ modparam("permissions", "db_url", "&exampledb;")
 		<para>
 		Name of database table containing matching rules used by
 		<function moreinfo="none">allow_register</function> function.
-		Since version 2.2, this table name represents the table name
-		for the <quote>default</quote> partition.
+		Since version 2.2, this table name also represents the default table
+		name for partitions without a 'table_name' setting.
 		</para>
 		<para>
 		<emphasis>
@@ -394,23 +394,23 @@ modparam("permissions", "address_table", "pbx")
 	<section id="param_partition" xreflabel="partition">
 		<title><varname>partition</varname> (string)</title>
 		<para>
-			Create a partition containg an url and a table name. Partitions
-		allow you to use different databases or different tables from
-		the same database. It is IMPORTANT that you split the paramteres by
-		";". Also, it is very IMPORTANT to put ";" after the last parameter,
-		elseway it will not be taken into consideration.
+		Specify a new IP-based checking partition (data source).  This
+		parameter may be set multiple times.  Each partition may have a
+		specific "db_url" and "table_name".  If not specified, these values
+		will be inherited from <xref linkend="param_db_url"/>, db_default_url
+		or <xref linkend="param_address_table"/>, respectively.  The name of
+		the default partition is 'default'.
 		</para>
 		<para>
-		<emphasis>
-			The db_url for a partition is mandatory. The table name, instead,
-		has a default value 'address'.
-		</emphasis>
 		</para>
 		<example>
 		<title>Set <varname>partition</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("permissions", "partition", "my_part: db_url=<quote>some_url</quote>; table_name=<quote>some_table</quote>;")
+modparam("permissions", "partition", "
+	inbound:
+		db_url = postgres://opensips:opensipsrw@127.0.0.1/opensips;
+		table_name = address")
 ...
 
 </programlisting>
@@ -460,7 +460,7 @@ modparam("permissions", "ip_col", "ipess")
 		<title><varname>mask_col</varname> (string)</title>
 		<para>
 		Name of address table column containing network mask of
-		the address.  Possible values are 0-128. It should be up to 32 if 
+		the address.  Possible values are 0-128. It should be up to 32 if
 		the IP is v4 and up to 128 if the IP is v6.
 		</para>
 		<para>
@@ -529,7 +529,7 @@ modparam("permissions", "proto_col", "transport")
 		<title><varname>pattern_col</varname> (string)</title>
 		<para>
 		Name of address table column containinga a pattern (a shell wildcard
-		pattern, like the ones used for file name matching) that is matched 
+		pattern, like the ones used for file name matching) that is matched
 		against the arguments received by
 		<function moreinfo="none">check_address</function>
 		or <function moreinfo="none">check_source_address</function>.