diff --git a/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/Multi_Tenancy.xml b/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/Multi_Tenancy.xml
index 6b3c5d2d81..046d22ee88 100644
--- a/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/Multi_Tenancy.xml
+++ b/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/Multi_Tenancy.xml
@@ -162,7 +162,8 @@
                 <listitem>
                     <para>
                         Correlates to the partitioned (discriminator) approach.  It is an error to attempt to open a
-                        session without a tenant identifier using this strategy.
+                        session without a tenant identifier using this strategy.  This strategy is not yet implemented
+                        in Hibernate as of 4.0 and 4.1.  Its support is planned for 5.0.
                     </para>
                 </listitem>
             </varlistentry>
diff --git a/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_database.png b/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_database.png
new file mode 100644
index 0000000000..84822ec4e5
Binary files /dev/null and b/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_database.png differ
diff --git a/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_database.svg b/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_database.svg
new file mode 100644
index 0000000000..38cbf07554
--- /dev/null
+++ b/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_database.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="400px" height="400px" viewBox="0 0 400 400" enable-background="new 0 0 400 400" xml:space="preserve">
+<g>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="451.2393" y1="550.3125" x2="584.1797" y2="550.3125" gradientTransform="matrix(1 0 0 1 -192 -211)">
+		<stop  offset="0" style="stop-color:#F3D99F"/>
+		<stop  offset="0.459" style="stop-color:#FAF8ED"/>
+		<stop  offset="0.9836" style="stop-color:#E3A835"/>
+	</linearGradient>
+	<path fill="url(#SVGID_1_)" stroke="#AB710A" stroke-width="1.2013" stroke-linejoin="round" stroke-miterlimit="10" d="
+		M392.177,285.951c-0.177-0.01-0.401-0.021-0.597-0.031c-0.039,0.734-0.175,1.463-0.387,2.165c-0.064,0.217-0.139,0.427-0.215,0.638
+		c-0.065,0.18-0.142,0.356-0.217,0.534c0.021,0.048,0.002,0-0.098,0.21c-0.098,0.21-0.203,0.42-0.312,0.624
+		c-0.25,0.462-0.528,0.912-0.834,1.345c-0.504,0.717-1.074,1.392-1.683,2.021c-0.771,0.804-1.608,1.552-2.494,2.23
+		c-0.472,0.363-0.95,0.719-1.44,1.062c-0.353,0.245-0.709,0.481-1.067,0.713c-0.324,0.208-0.396,0.25-0.646,0.399
+		c-0.385,0.238-0.776,0.468-1.17,0.69c-0.574,0.327-1.151,0.644-1.736,0.944c-1.301,0.673-2.635,1.286-3.98,1.857
+		c-2.719,1.147-5.507,2.106-8.334,2.957c-4.572,1.368-9.24,2.381-13.945,3.191c-12.86,2.218-26.09,2.678-39.101,1.81
+		c-12.298-0.819-24.896-2.78-36.396-7.385c-4.02-1.604-7.938-3.549-11.379-6.19c-1.338-1.026-2.588-2.188-3.646-3.502
+		c-0.54-0.672-1.026-1.385-1.437-2.144c-0.217-0.401-0.408-0.815-0.578-1.244c-0.107-0.272-0.135-0.932-0.531-0.677
+		c0.059-0.049,0.135-0.104,0.201-0.146c0.082-0.058-0.098-0.535-0.119-0.646c-0.105-0.479-0.18-0.971-0.204-1.46
+		c-0.697,0.037-0.604-0.021-0.57,0.578c0.036,0.647,0.07,1.299,0.105,1.948c0.13,2.438,0.261,4.875,0.393,7.312
+		c0.398,7.426,2.526,65.109,2.63,67.02c0.152,2.86,0.821,5.536,2.285,8.043c1.827,3.123,4.448,5.606,7.28,7.813
+		c1.485,1.16,3.103,2.174,4.729,3.117c0.844,0.487,1.709,0.938,2.569,1.396c0.368,0.196,0.748,0.371,1.124,0.556
+		c0.289,0.144,0.294,0.146,0.602,0.292c0.437,0.205,0.871,0.407,1.311,0.598c0.557,0.241,1.109,0.487,1.672,0.718
+		c1.211,0.495,2.434,0.958,3.664,1.405c2.477,0.897,5.012,1.623,7.557,2.308c0.099,0.025,0.099,0.025,0.459,0.119
+		c0.39,0.099,0.774,0.195,1.164,0.288c0.493,0.12,0.989,0.233,1.486,0.349c0.902,0.205,1.811,0.394,2.718,0.577
+		c2.568,0.524,5.162,0.938,7.761,1.275c4.52,0.589,9.062,0.93,13.617,1.038c9.441,0.227,18.909-0.502,28.18-2.346
+		c9.291-1.848,18.74-4.875,26.695-10.127c5.562-3.671,11.322-9.271,11.703-16.37c0.219-4.078,2.598-66.387,2.953-73.012
+		c0.085-1.609,0.082-3.254,0.26-4.855c-0.1-0.006-0.195-0.012-0.296-0.018C391.975,285.947,392.102,285.95,392.177,285.951
+		L392.177,285.951z"/>
+	<g>
+		
+			<radialGradient id="SVGID_2_" cx="443.2275" cy="472.4014" r="113.4365" gradientTransform="matrix(1 0 0 1 -192 -211)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#FAF8ED"/>
+			<stop  offset="0.9836" style="stop-color:#E3A835"/>
+		</radialGradient>
+		<path fill="url(#SVGID_2_)" stroke="#AB710A" stroke-width="1.2013" stroke-linejoin="round" stroke-miterlimit="10" d="
+			M325.708,260.852c8.188,0,16.041,0.559,23.281,1.57c7.312,1.023,14.065,2.525,19.94,4.407c5.979,1.918,11.096,4.245,14.965,6.89
+			c3.967,2.709,6.648,5.768,7.608,9.067c0.99,3.399,0.062,6.737-2.532,9.858c-2.666,3.207-7.08,6.174-12.937,8.725
+			c-5.979,2.604-13.416,4.751-21.929,6.26c-8.614,1.523-18.236,2.376-28.399,2.376s-19.785-0.853-28.401-2.376
+			c-8.511-1.509-15.947-3.656-21.929-6.26c-5.854-2.551-10.269-5.518-12.937-8.725c-2.594-3.121-3.521-6.459-2.532-9.858
+			c0.961-3.302,3.645-6.358,7.608-9.067c3.871-2.645,8.985-4.972,14.967-6.89c5.873-1.882,12.627-3.384,19.939-4.407
+			C309.665,261.408,317.52,260.852,325.708,260.852z"/>
+	</g>
+</g>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="421.2871" y1="-4.5" x2="421.2871" y2="-123.5384" gradientTransform="matrix(1 0 0 -1 -96 195)">
+	<stop  offset="0" style="stop-color:#86BF40"/>
+	<stop  offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<polygon fill="url(#SVGID_3_)" points="343.225,234.604 343.225,178.389 307.352,178.389 307.352,234.604 279.354,234.604 
+	325.289,280.538 371.223,234.604 "/>
+<polygon fill="#94AEBD" points="363.512,152.833 288.564,152.833 260.075,204.552 391.346,204.552 "/>
+<rect x="181.857" y="40.9" fill="#86BF40" width="35.872" height="78.404"/>
+<g>
+	
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="200.749" y1="550.3125" x2="333.6875" y2="550.3125" gradientTransform="matrix(1 0 0 1 -192 -211)">
+		<stop  offset="0" style="stop-color:#F3D99F"/>
+		<stop  offset="0.459" style="stop-color:#FAF8ED"/>
+		<stop  offset="0.9836" style="stop-color:#E3A835"/>
+	</linearGradient>
+	<path fill="url(#SVGID_4_)" stroke="#AB710A" stroke-width="1.2013" stroke-linejoin="round" stroke-miterlimit="10" d="
+		M141.682,285.951c-0.175-0.01-0.401-0.021-0.596-0.031c-0.036,0.734-0.174,1.463-0.385,2.165c-0.065,0.217-0.14,0.427-0.216,0.638
+		c-0.065,0.18-0.139,0.356-0.217,0.534c0.022,0.048,0,0-0.096,0.21c-0.098,0.21-0.203,0.42-0.314,0.624
+		c-0.248,0.462-0.527,0.912-0.83,1.345c-0.505,0.717-1.075,1.392-1.684,2.021c-0.771,0.804-1.61,1.552-2.494,2.23
+		c-0.474,0.363-0.949,0.719-1.439,1.062c-0.354,0.245-0.709,0.481-1.07,0.713c-0.324,0.208-0.394,0.25-0.645,0.399
+		c-0.385,0.238-0.777,0.468-1.172,0.69c-0.571,0.327-1.149,0.644-1.733,0.944c-1.301,0.673-2.634,1.286-3.982,1.857
+		c-2.718,1.147-5.507,2.106-8.335,2.957c-4.573,1.368-9.243,2.381-13.945,3.191c-12.862,2.218-26.09,2.678-39.099,1.81
+		c-12.298-0.819-24.897-2.78-36.396-7.385c-4.02-1.604-7.937-3.549-11.38-6.19c-1.339-1.026-2.588-2.188-3.646-3.502
+		c-0.537-0.672-1.025-1.385-1.432-2.144c-0.219-0.401-0.41-0.815-0.579-1.244c-0.108-0.272-0.136-0.932-0.531-0.677
+		c0.057-0.049,0.136-0.104,0.201-0.146c0.081-0.058-0.097-0.535-0.121-0.646c-0.105-0.479-0.178-0.971-0.203-1.46
+		c-0.699,0.037-0.604-0.021-0.57,0.578c0.035,0.647,0.069,1.299,0.105,1.948c0.13,2.438,0.261,4.875,0.392,7.312
+		c0.398,7.426,2.527,65.109,2.631,67.02c0.151,2.86,0.821,5.536,2.284,8.043c1.828,3.123,4.448,5.606,7.28,7.813
+		c1.486,1.16,3.101,2.174,4.73,3.117c0.844,0.487,1.706,0.938,2.567,1.396c0.369,0.196,0.75,0.371,1.125,0.556
+		c0.289,0.144,0.295,0.146,0.603,0.292c0.434,0.205,0.868,0.407,1.308,0.598c0.557,0.241,1.11,0.487,1.673,0.718
+		c1.21,0.495,2.433,0.958,3.663,1.405c2.478,0.897,5.012,1.623,7.556,2.308c0.099,0.025,0.099,0.025,0.462,0.119
+		c0.386,0.099,0.773,0.195,1.161,0.288c0.496,0.12,0.992,0.233,1.489,0.349c0.903,0.205,1.809,0.394,2.717,0.577
+		c2.567,0.524,5.16,0.938,7.761,1.275c4.516,0.589,9.062,0.93,13.615,1.038c9.442,0.227,18.91-0.502,28.178-2.346
+		c9.292-1.848,18.743-4.875,26.698-10.127c5.559-3.671,11.322-9.271,11.703-16.37c0.219-4.078,2.597-66.387,2.953-73.012
+		c0.086-1.609,0.082-3.254,0.261-4.855c-0.1-0.006-0.199-0.012-0.297-0.018C141.481,285.947,141.607,285.95,141.682,285.951
+		L141.682,285.951z"/>
+	<g>
+		
+			<radialGradient id="SVGID_5_" cx="192.7339" cy="472.4014" r="113.4383" gradientTransform="matrix(1 0 0 1 -192 -211)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#FAF8ED"/>
+			<stop  offset="0.9836" style="stop-color:#E3A835"/>
+		</radialGradient>
+		<path fill="url(#SVGID_5_)" stroke="#AB710A" stroke-width="1.2013" stroke-linejoin="round" stroke-miterlimit="10" d="
+			M75.216,260.852c8.188,0,16.041,0.559,23.279,1.57c7.312,1.023,14.066,2.525,19.94,4.407c5.982,1.918,11.097,4.245,14.967,6.89
+			c3.967,2.709,6.65,5.768,7.612,9.067c0.987,3.399,0.061,6.737-2.535,9.858c-2.667,3.207-7.081,6.174-12.937,8.725
+			c-5.979,2.604-13.417,4.751-21.928,6.26c-8.616,1.523-18.237,2.376-28.399,2.376c-10.166,0-19.787-0.853-28.401-2.376
+			c-8.512-1.509-15.948-3.656-21.929-6.26c-5.855-2.551-10.269-5.518-12.935-8.725c-2.596-3.121-3.524-6.459-2.534-9.858
+			c0.962-3.302,3.644-6.358,7.609-9.067c3.871-2.645,8.985-4.972,14.968-6.89c5.874-1.882,12.627-3.384,19.938-4.407
+			C59.173,261.408,67.025,260.852,75.216,260.852z"/>
+	</g>
+</g>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="170.313" y1="-4.5" x2="170.313" y2="-123.5384" gradientTransform="matrix(1 0 0 -1 -96 195)">
+	<stop  offset="0" style="stop-color:#86BF40"/>
+	<stop  offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<polygon fill="url(#SVGID_6_)" points="92.247,234.604 92.247,178.389 56.375,178.389 56.375,234.604 28.379,234.604 
+	74.313,280.538 120.246,234.604 "/>
+<polygon fill="#94AEBD" points="113.021,152.833 38.071,152.833 9.583,204.552 140.853,204.552 "/>
+<polygon fill="#86BF40" points="56.361,99.985 56.361,178.389 92.234,178.389 92.234,135.858 307.352,135.858 307.352,178.389 
+	343.227,178.389 343.227,99.985 "/>
+<path fill="#424242" d="M275.075,51.364c0,1.99-1.614,3.604-3.603,3.604H127.312c-1.989,0-3.604-1.613-3.604-3.604V11.719
+	c0-1.99,1.614-3.604,3.604-3.604h144.161c1.988,0,3.604,1.614,3.604,3.604L275.075,51.364L275.075,51.364z"/>
+<text transform="matrix(1 0 0 1 39.5 327.5)" font-family="'Frutiger-BoldCn'" font-size="12">CUSTOMER (</text>
+<text transform="matrix(1 0 0 1 39.5 339.9004)" font-family="'Frutiger-BoldCn'" font-size="12">ID BIGINT,</text>
+<text transform="matrix(1 0 0 1 39.5 352.2998)" font-family="'Frutiger-BoldCn'" font-size="12">NAME VARCHAR,</text>
+<text transform="matrix(1 0 0 1 39.5 364.7002)" font-family="'Frutiger-BoldCn'" font-size="12">...</text>
+<text transform="matrix(1 0 0 1 39.5 377.0996)" font-family="'Frutiger-BoldCn'" font-size="12">)</text>
+<text transform="matrix(1 0 0 1 292.5 327.5)" font-family="'Frutiger-BoldCn'" font-size="12">CUSTOMER (</text>
+<text transform="matrix(1 0 0 1 292.5 339.9004)" font-family="'Frutiger-BoldCn'" font-size="12">ID BIGINT,</text>
+<text transform="matrix(1 0 0 1 292.5 352.2998)" font-family="'Frutiger-BoldCn'" font-size="12">NAME VARCHAR,</text>
+<text transform="matrix(1 0 0 1 292.5 364.7002)" font-family="'Frutiger-BoldCn'" font-size="12">...</text>
+<text transform="matrix(1 0 0 1 292.5 377.0996)" font-family="'Frutiger-BoldCn'" font-size="12">)</text>
+<text transform="matrix(1 0 0 1 142.875 40.5801)" fill="#FFFFFF" font-family="'Frutiger-BoldCn'" font-size="24">Application</text>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="74.3188" y1="164.2451" x2="74.3188" y2="250.498">
+	<stop  offset="0" style="stop-color:#86BF40"/>
+	<stop  offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<rect x="56.383" y="175.495" fill="url(#SVGID_7_)" width="35.871" height="29.135"/>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="325.2891" y1="164.2451" x2="325.2891" y2="250.498">
+	<stop  offset="0" style="stop-color:#86BF40"/>
+	<stop  offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<rect x="307.354" y="175.495" fill="url(#SVGID_8_)" width="35.87" height="29.135"/>
+</svg>
diff --git a/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_discriminator.png b/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_discriminator.png
new file mode 100644
index 0000000000..dcc3ad6ed9
Binary files /dev/null and b/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_discriminator.png differ
diff --git a/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_discriminator.svg b/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_discriminator.svg
new file mode 100644
index 0000000000..cb55a6671f
--- /dev/null
+++ b/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_discriminator.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="400px" height="400px" viewBox="0 0 400 400" enable-background="new 0 0 400 400" xml:space="preserve">
+<g>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="235.0928" y1="-79.4072" x2="368.0312" y2="-79.4072" gradientTransform="matrix(1 0 0 -1 -96 195)">
+		<stop  offset="0" style="stop-color:#F3D99F"/>
+		<stop  offset="0.459" style="stop-color:#FAF8ED"/>
+		<stop  offset="0.9836" style="stop-color:#E3A835"/>
+	</linearGradient>
+	<path fill="url(#SVGID_1_)" stroke="#AB710A" stroke-width="1.2013" stroke-linejoin="round" stroke-miterlimit="10" d="
+		M272.025,221.045c-0.176-0.008-0.4-0.021-0.596-0.029c-0.037,0.732-0.174,1.461-0.386,2.166c-0.063,0.215-0.14,0.424-0.216,0.633
+		c-0.064,0.183-0.139,0.36-0.217,0.537c0.022,0.047,0.002,0.002-0.096,0.209c-0.098,0.211-0.203,0.42-0.312,0.625
+		c-0.251,0.463-0.529,0.914-0.832,1.342c-0.505,0.719-1.075,1.392-1.684,2.021c-0.772,0.805-1.608,1.553-2.494,2.233
+		c-0.473,0.362-0.949,0.72-1.439,1.06c-0.352,0.244-0.709,0.482-1.068,0.715c-0.324,0.207-0.395,0.248-0.645,0.401
+		c-0.387,0.235-0.777,0.464-1.172,0.688c-0.572,0.326-1.151,0.643-1.735,0.943c-1.3,0.674-2.634,1.286-3.981,1.857
+		c-2.719,1.148-5.508,2.109-8.334,2.957c-4.573,1.371-9.242,2.381-13.946,3.193c-12.861,2.219-26.09,2.678-39.099,1.809
+		c-12.298-0.819-24.897-2.781-36.396-7.383c-4.018-1.607-7.937-3.551-11.379-6.191c-1.338-1.027-2.588-2.188-3.646-3.503
+		c-0.539-0.673-1.026-1.386-1.434-2.144c-0.216-0.402-0.41-0.816-0.578-1.242c-0.108-0.275-0.135-0.933-0.532-0.678
+		c0.058-0.049,0.137-0.104,0.204-0.148c0.079-0.055-0.098-0.534-0.122-0.645c-0.106-0.479-0.177-0.97-0.203-1.459
+		c-0.699,0.036-0.603-0.021-0.571,0.576c0.036,0.648,0.07,1.299,0.105,1.949c0.13,2.438,0.262,4.876,0.393,7.312
+		c0.398,7.426,2.526,65.11,2.629,67.02c0.153,2.859,0.823,5.536,2.286,8.04c1.826,3.124,4.449,5.607,7.279,7.815
+		c1.487,1.16,3.101,2.175,4.73,3.116c0.844,0.49,1.707,0.941,2.568,1.398c0.368,0.196,0.75,0.371,1.125,0.555
+		c0.288,0.144,0.295,0.146,0.602,0.29c0.434,0.205,0.869,0.41,1.31,0.599c0.556,0.241,1.109,0.487,1.672,0.718
+		c1.211,0.495,2.433,0.959,3.662,1.406c2.479,0.897,5.013,1.624,7.557,2.308c0.097,0.025,0.097,0.025,0.46,0.119
+		c0.388,0.098,0.775,0.193,1.163,0.289c0.495,0.118,0.991,0.231,1.488,0.346c0.902,0.208,1.809,0.394,2.717,0.579
+		c2.568,0.522,5.161,0.938,7.761,1.276c4.517,0.587,9.062,0.928,13.615,1.035c9.443,0.228,18.91-0.501,28.181-2.343
+		c9.291-1.849,18.74-4.878,26.695-10.129c5.561-3.671,11.321-9.269,11.704-16.369c0.22-4.076,2.596-66.386,2.953-73.011
+		c0.086-1.608,0.082-3.254,0.26-4.856c-0.1-0.006-0.197-0.012-0.297-0.017C271.826,221.041,271.953,221.044,272.025,221.045
+		L272.025,221.045z"/>
+	<g>
+		
+			<radialGradient id="SVGID_2_" cx="227.0781" cy="-1.4951" r="113.4384" gradientTransform="matrix(1 0 0 -1 -96 195)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#FAF8ED"/>
+			<stop  offset="0.9836" style="stop-color:#E3A835"/>
+		</radialGradient>
+		<path fill="url(#SVGID_2_)" stroke="#AB710A" stroke-width="1.2013" stroke-linejoin="round" stroke-miterlimit="10" d="
+			M205.559,195.945c8.189,0,16.043,0.558,23.282,1.571c7.312,1.024,14.066,2.525,19.938,4.407
+			c5.982,1.918,11.097,4.245,14.967,6.892c3.967,2.709,6.65,5.767,7.611,9.064c0.99,3.4,0.062,6.738-2.534,9.861
+			c-2.667,3.207-7.079,6.172-12.935,8.723c-5.98,2.602-13.418,4.751-21.931,6.262c-8.615,1.522-18.237,2.375-28.399,2.375
+			c-10.165,0-19.786-0.853-28.4-2.375c-8.511-1.511-15.948-3.66-21.928-6.262c-5.855-2.551-10.27-5.516-12.937-8.723
+			c-2.595-3.123-3.522-6.461-2.533-9.861c0.96-3.299,3.645-6.355,7.611-9.064c3.869-2.646,8.984-4.974,14.966-6.892
+			c5.874-1.882,12.627-3.382,19.939-4.407C189.517,196.503,197.369,195.945,205.559,195.945z"/>
+	</g>
+</g>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="205.5615" y1="134.5928" x2="205.5615" y2="253.6306">
+	<stop  offset="0" style="stop-color:#86BF40"/>
+	<stop  offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<polygon fill="url(#SVGID_3_)" points="223.498,169.696 223.498,113.482 187.625,113.482 187.625,169.696 159.627,169.696 
+	205.562,215.631 251.496,169.696 "/>
+<polygon fill="#94AEBD" points="243.365,87.928 168.416,87.928 139.927,139.646 271.197,139.646 "/>
+<rect x="187.626" y="35.08" fill="#86BF40" width="35.872" height="78.404"/>
+<path fill="#424242" d="M281.246,48.863c0,1.99-1.615,3.604-3.604,3.604H133.482c-1.991,0-3.604-1.614-3.604-3.604V9.22
+	c0-1.991,1.613-3.604,3.604-3.604h144.161c1.987,0,3.604,1.614,3.604,3.604V48.863z"/>
+<text transform="matrix(1 0 0 1 164.5 259)" font-family="'Frutiger-BoldCn'" font-size="11">CUSTOMER (</text>
+<text transform="matrix(1 0 0 1 164.5 270)" font-family="'Frutiger-BoldCn'" font-size="11">ID BIGINT,</text>
+<text transform="matrix(1 0 0 1 164.5 281)" font-family="'Frutiger-BoldCn'" font-size="11">NAME VARCHAR,</text>
+<text transform="matrix(1 0 0 1 164.5 292)" font-family="'Frutiger-BoldCn'" font-size="11">...</text>
+<text transform="matrix(1 0 0 1 164.5 303)" font-family="'Frutiger-BoldCn'" font-size="11">TENANT_ID VARCHAR</text>
+<text transform="matrix(1 0 0 1 164.5 314)" font-family="'Frutiger-BoldCn'" font-size="11">)</text>
+<text transform="matrix(1 0 0 1 147.9751 38.0801)" fill="#FFFFFF" font-family="'Frutiger-BoldCn'" font-size="24">Application</text>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="205.5605" y1="99.2612" x2="205.5605" y2="185.5127">
+	<stop  offset="0" style="stop-color:#86BF40"/>
+	<stop  offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<rect x="187.625" y="110.511" fill="url(#SVGID_4_)" width="35.871" height="29.135"/>
+</svg>
diff --git a/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_schema.png b/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_schema.png
new file mode 100644
index 0000000000..2756ba2ed6
Binary files /dev/null and b/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_schema.png differ
diff --git a/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_schema.svg b/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_schema.svg
new file mode 100644
index 0000000000..f344c5b23a
--- /dev/null
+++ b/documentation/src/main/docbook/devguide/en-US/chapters/multi-tenancy/images/multitenacy_schema.svg
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="400px" height="400px" viewBox="0 0 400 400" enable-background="new 0 0 400 400" xml:space="preserve">
+<g>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="326.6055" y1="-142.313" x2="459.5439" y2="-142.313" gradientTransform="matrix(1 0 0 -1 -96 195)">
+		<stop  offset="0" style="stop-color:#F3D99F"/>
+		<stop  offset="0.459" style="stop-color:#FAF8ED"/>
+		<stop  offset="0.9836" style="stop-color:#E3A835"/>
+	</linearGradient>
+	<path fill="url(#SVGID_1_)" stroke="#AB710A" stroke-width="1.2013" stroke-linejoin="round" stroke-miterlimit="10" d="
+		M363.54,283.952c-0.175-0.011-0.401-0.021-0.595-0.032c-0.039,0.734-0.176,1.463-0.389,2.166c-0.063,0.216-0.14,0.426-0.216,0.637
+		c-0.063,0.18-0.14,0.357-0.216,0.534c0.021,0.048,0.002,0-0.096,0.21s-0.204,0.42-0.312,0.624
+		c-0.251,0.463-0.529,0.913-0.832,1.345c-0.506,0.717-1.074,1.391-1.683,2.021c-0.772,0.804-1.611,1.552-2.494,2.231
+		c-0.474,0.363-0.952,0.719-1.442,1.061c-0.351,0.245-0.709,0.482-1.068,0.713c-0.324,0.209-0.395,0.25-0.643,0.4
+		c-0.387,0.238-0.777,0.468-1.172,0.69c-0.574,0.327-1.152,0.644-1.736,0.944c-1.299,0.673-2.633,1.285-3.979,1.857
+		c-2.722,1.148-5.508,2.107-8.334,2.957c-4.576,1.369-9.243,2.381-13.949,3.192c-12.858,2.218-26.088,2.678-39.098,1.81
+		c-12.298-0.82-24.896-2.781-36.397-7.385c-4.017-1.605-7.935-3.549-11.379-6.191c-1.337-1.025-2.586-2.188-3.645-3.502
+		c-0.54-0.672-1.026-1.385-1.436-2.142c-0.217-0.403-0.41-0.817-0.578-1.243c-0.108-0.274-0.135-0.934-0.531-0.679
+		c0.059-0.049,0.136-0.103,0.203-0.147c0.08-0.057-0.098-0.535-0.121-0.644c-0.107-0.481-0.176-0.972-0.203-1.462
+		c-0.698,0.038-0.602-0.021-0.571,0.578c0.035,0.648,0.07,1.299,0.104,1.949c0.133,2.438,0.264,4.875,0.394,7.312
+		c0.397,7.426,2.524,65.108,2.629,67.018c0.155,2.861,0.823,5.538,2.287,8.043c1.826,3.122,4.448,5.607,7.28,7.814
+		c1.484,1.16,3.099,2.174,4.729,3.117c0.844,0.488,1.708,0.938,2.568,1.396c0.369,0.197,0.75,0.372,1.126,0.557
+		c0.287,0.143,0.295,0.146,0.601,0.291c0.434,0.205,0.87,0.407,1.309,0.599c0.558,0.24,1.111,0.486,1.672,0.717
+		c1.214,0.495,2.436,0.958,3.665,1.405c2.477,0.897,5.012,1.623,7.556,2.308c0.098,0.025,0.098,0.025,0.46,0.119
+		c0.388,0.098,0.775,0.195,1.162,0.288c0.497,0.12,0.992,0.234,1.488,0.347c0.903,0.206,1.811,0.395,2.717,0.579
+		c2.567,0.524,5.163,0.938,7.761,1.275c4.52,0.589,9.062,0.93,13.616,1.038c9.442,0.227,18.911-0.501,28.181-2.345
+		c9.293-1.848,18.741-4.876,26.694-10.128c5.562-3.671,11.323-9.27,11.705-16.369c0.219-4.079,2.597-66.387,2.952-73.012
+		c0.086-1.61,0.084-3.254,0.261-4.856c-0.101-0.006-0.196-0.011-0.297-0.017C363.338,283.948,363.466,283.95,363.54,283.952
+		L363.54,283.952z"/>
+	<g>
+		
+			<radialGradient id="SVGID_2_" cx="318.5908" cy="-64.4004" r="113.4382" gradientTransform="matrix(1 0 0 -1 -96 195)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#FAF8ED"/>
+			<stop  offset="0.9836" style="stop-color:#E3A835"/>
+		</radialGradient>
+		<path fill="url(#SVGID_2_)" stroke="#AB710A" stroke-width="1.2013" stroke-linejoin="round" stroke-miterlimit="10" d="
+			M297.07,258.852c8.191,0,16.044,0.559,23.283,1.57c7.312,1.023,14.064,2.525,19.939,4.407c5.979,1.918,11.096,4.245,14.964,6.89
+			c3.968,2.709,6.65,5.768,7.612,9.067c0.99,3.399,0.061,6.737-2.535,9.858c-2.666,3.207-7.078,6.174-12.934,8.725
+			c-5.98,2.604-13.418,4.751-21.93,6.26c-8.615,1.523-18.236,2.377-28.4,2.377c-10.162,0-19.783-0.854-28.399-2.377
+			c-8.513-1.509-15.95-3.656-21.93-6.26c-5.854-2.551-10.269-5.518-12.935-8.725c-2.597-3.121-3.523-6.459-2.535-9.858
+			c0.961-3.302,3.646-6.358,7.611-9.067c3.87-2.645,8.984-4.972,14.965-6.89c5.875-1.882,12.629-3.384,19.94-4.407
+			C281.027,259.409,288.882,258.852,297.07,258.852z"/>
+	</g>
+</g>
+<rect x="180.977" y="94.169" fill="#86BF40" width="35.871" height="70.285"/>
+<g>
+	
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="130.9292" y1="-142.313" x2="263.8682" y2="-142.313" gradientTransform="matrix(1 0 0 -1 -96 195)">
+		<stop  offset="0" style="stop-color:#F3D99F"/>
+		<stop  offset="0.459" style="stop-color:#FAF8ED"/>
+		<stop  offset="0.9836" style="stop-color:#E3A835"/>
+	</linearGradient>
+	<path fill="url(#SVGID_3_)" stroke="#AB710A" stroke-width="1.2013" stroke-linejoin="round" stroke-miterlimit="10" d="
+		M167.86,283.952c-0.174-0.011-0.401-0.021-0.594-0.032c-0.037,0.734-0.174,1.463-0.386,2.166c-0.063,0.216-0.138,0.426-0.216,0.637
+		c-0.065,0.18-0.139,0.357-0.216,0.534c0.022,0.048,0,0-0.096,0.21c-0.099,0.21-0.204,0.42-0.314,0.624
+		c-0.249,0.463-0.527,0.913-0.831,1.345c-0.503,0.717-1.075,1.391-1.682,2.021c-0.773,0.804-1.611,1.552-2.494,2.231
+		c-0.474,0.363-0.95,0.719-1.44,1.061c-0.352,0.245-0.709,0.482-1.07,0.713c-0.324,0.209-0.394,0.25-0.643,0.4
+		c-0.386,0.238-0.778,0.468-1.173,0.69c-0.571,0.327-1.149,0.644-1.734,0.944c-1.3,0.673-2.634,1.285-3.98,1.857
+		c-2.72,1.148-5.509,2.107-8.336,2.957c-4.574,1.369-9.244,2.381-13.947,3.192c-12.862,2.218-26.089,2.678-39.097,1.81
+		c-12.3-0.82-24.897-2.781-36.397-7.385c-4.019-1.605-7.936-3.549-11.38-6.191c-1.336-1.025-2.585-2.188-3.645-3.502
+		c-0.539-0.672-1.026-1.385-1.433-2.142c-0.218-0.403-0.41-0.817-0.579-1.243c-0.108-0.274-0.136-0.934-0.532-0.679
+		c0.059-0.049,0.136-0.103,0.203-0.147c0.08-0.057-0.097-0.535-0.121-0.644c-0.107-0.481-0.178-0.972-0.203-1.462
+		c-0.7,0.038-0.604-0.021-0.571,0.578c0.035,0.648,0.07,1.299,0.105,1.949c0.13,2.438,0.261,4.875,0.392,7.312
+		c0.399,7.426,2.527,65.108,2.63,67.018c0.153,2.861,0.822,5.538,2.285,8.043c1.828,3.122,4.45,5.607,7.281,7.814
+		c1.486,1.16,3.101,2.174,4.729,3.117c0.845,0.488,1.707,0.938,2.569,1.396c0.37,0.197,0.749,0.372,1.126,0.557
+		c0.286,0.143,0.293,0.146,0.601,0.291c0.434,0.205,0.869,0.407,1.307,0.599c0.557,0.24,1.113,0.486,1.673,0.717
+		c1.21,0.495,2.432,0.958,3.663,1.405c2.478,0.897,5.012,1.623,7.556,2.308c0.098,0.025,0.098,0.025,0.46,0.119
+		c0.387,0.098,0.774,0.195,1.164,0.288c0.495,0.12,0.99,0.234,1.487,0.347c0.903,0.206,1.809,0.395,2.717,0.579
+		c2.568,0.524,5.162,0.938,7.761,1.275c4.515,0.589,9.063,0.93,13.615,1.038c9.444,0.227,18.911-0.501,28.18-2.345
+		c9.292-1.848,18.741-4.876,26.696-10.128c5.559-3.671,11.323-9.27,11.705-16.369c0.219-4.079,2.595-66.387,2.953-73.012
+		c0.086-1.61,0.083-3.254,0.26-4.856c-0.1-0.006-0.198-0.011-0.296-0.017C167.661,283.948,167.788,283.95,167.86,283.952
+		L167.86,283.952z"/>
+	<g>
+		
+			<radialGradient id="SVGID_4_" cx="122.9121" cy="-64.4004" r="113.4382" gradientTransform="matrix(1 0 0 -1 -96 195)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#FAF8ED"/>
+			<stop  offset="0.9836" style="stop-color:#E3A835"/>
+		</radialGradient>
+		<path fill="url(#SVGID_4_)" stroke="#AB710A" stroke-width="1.2013" stroke-linejoin="round" stroke-miterlimit="10" d="
+			M101.394,258.852c8.19,0,16.042,0.559,23.281,1.57c7.312,1.023,14.065,2.525,19.938,4.407c5.983,1.918,11.097,4.245,14.968,6.89
+			c3.966,2.709,6.65,5.768,7.611,9.067c0.989,3.399,0.062,6.737-2.534,9.858c-2.667,3.207-7.08,6.174-12.937,8.725
+			c-5.98,2.604-13.417,4.751-21.928,6.26c-8.616,1.523-18.238,2.377-28.4,2.377c-10.164,0-19.787-0.854-28.401-2.377
+			c-8.511-1.509-15.948-3.656-21.928-6.26c-5.855-2.551-10.269-5.518-12.935-8.725c-2.597-3.121-3.523-6.459-2.535-9.858
+			c0.961-3.302,3.644-6.358,7.611-9.067c3.87-2.645,8.984-4.972,14.965-6.89c5.875-1.882,12.628-3.384,19.939-4.407
+			C85.352,259.409,93.204,258.852,101.394,258.852z"/>
+	</g>
+</g>
+<polygon fill="#94AEBD" points="236.716,71.166 161.766,71.166 133.278,122.885 264.547,122.885 "/>
+<polygon fill="#86BF40" points="315.436,232.604 315.436,176.39 315.436,137.82 82.388,137.82 82.388,176.39 82.388,232.604 
+	54.391,232.605 100.325,278.538 146.258,232.604 118.259,232.604 118.259,176.39 118.259,173.692 279.562,173.692 279.562,176.39 
+	279.562,232.604 251.566,232.605 297.501,278.538 343.436,232.604 "/>
+<rect x="180.977" y="38.9" fill="#86BF40" width="35.871" height="54.85"/>
+<path fill="#424242" d="M274.598,49.364c0,1.989-1.615,3.603-3.604,3.603h-144.16c-1.99,0-3.605-1.614-3.605-3.603V9.72
+	c0-1.991,1.615-3.604,3.605-3.604h144.16c1.989,0,3.604,1.614,3.604,3.604V49.364z"/>
+<text transform="matrix(1 0 0 1 62.5 325.5)" font-family="'Frutiger-BoldCn'" font-size="12">CUSTOMER (</text>
+<text transform="matrix(1 0 0 1 62.5 337.9004)" font-family="'Frutiger-BoldCn'" font-size="12">ID BIGINT,</text>
+<text transform="matrix(1 0 0 1 62.5 350.2998)" font-family="'Frutiger-BoldCn'" font-size="12">NAME VARCHAR,</text>
+<text transform="matrix(1 0 0 1 62.5 362.7002)" font-family="'Frutiger-BoldCn'" font-size="12">...</text>
+<text transform="matrix(1 0 0 1 62.5 375.0996)" font-family="'Frutiger-BoldCn'" font-size="12">)</text>
+<text transform="matrix(1 0 0 1 264.5 325.5)" font-family="'Frutiger-BoldCn'" font-size="12">CUSTOMER (</text>
+<text transform="matrix(1 0 0 1 264.5 337.9004)" font-family="'Frutiger-BoldCn'" font-size="12">ID BIGINT,</text>
+<text transform="matrix(1 0 0 1 264.5 350.2998)" font-family="'Frutiger-BoldCn'" font-size="12">NAME VARCHAR,</text>
+<text transform="matrix(1 0 0 1 264.5 362.7002)" font-family="'Frutiger-BoldCn'" font-size="12">...</text>
+<text transform="matrix(1 0 0 1 264.5 375.0996)" font-family="'Frutiger-BoldCn'" font-size="12">)</text>
+<text transform="matrix(1 0 0 1 141.6475 38.5801)" fill="#FFFFFF" font-family="'Frutiger-BoldCn'" font-size="24">Application</text>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="297.501" y1="197.5" x2="297.501" y2="316.5378">
+	<stop  offset="0" style="stop-color:#86BF40"/>
+	<stop  offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<polygon fill="url(#SVGID_5_)" points="315.438,232.604 315.438,176.389 279.564,176.389 279.564,232.604 251.566,232.604 
+	297.502,278.538 343.436,232.604 "/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="100.3247" y1="197.5" x2="100.3247" y2="316.5378">
+	<stop  offset="0" style="stop-color:#86BF40"/>
+	<stop  offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<polygon fill="url(#SVGID_6_)" points="118.259,232.604 118.259,176.389 82.387,176.389 82.387,232.604 54.391,232.604 
+	100.325,278.538 146.258,232.604 "/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="198.9121" y1="82.5" x2="198.9121" y2="168.7514">
+	<stop  offset="0" style="stop-color:#86BF40"/>
+	<stop  offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<rect x="180.977" y="93.75" fill="url(#SVGID_7_)" width="35.871" height="29.135"/>
+</svg>