diff --git a/doc/cli-reference/ch_cli_glance_property_keys.xml b/doc/cli-reference/ch_cli_glance_property_keys.xml
index fe30c846af..30a7cfed80 100644
--- a/doc/cli-reference/ch_cli_glance_property_keys.xml
+++ b/doc/cli-reference/ch_cli_glance_property_keys.xml
@@ -15,9 +15,13 @@
         with the <option>property</option> option for both the <command>glance
             image-update</command> and <command>glance image-create</command> commands. For
         example:</para>
-    <screen><prompt>$</prompt> <userinput>glance image-update <replaceable>img-uuid</replaceable> --property architecture=x86_64</userinput></screen>
+    <screen><prompt>$</prompt> <userinput>glance image-update <replaceable>IMG-UUID</replaceable> --property architecture=x86_64</userinput></screen>
     <note><para>Behavior set using image properties overrides
-        behavior set using flavors.</para></note>
+        behavior set using flavors. For more information, refer to
+        <link
+            xlink:href="http://docs.openstack.org/admin-guide-cloud/content/">
+            <citetitle>OpenStack Cloud Administrator Guide</citetitle></link>
+    </para></note>
     <table rules="all">
         <caption>Property keys</caption>
         <col width="12%"/>
@@ -217,6 +221,14 @@
                     </itemizedlist>
                 </td>
             </tr>
+            <tr>
+                <td>libvirt API driver</td>
+                <td>hw_rng_model</td>
+                <td>Adds a random-number generator device to the image's instances. The cloud
+                    administrator can enable and control device behavior by configuring the
+                    instance's flavor. By default, the generator device is disabled.</td>
+                <td><literal>virtio</literal></td>
+            </tr>
             <tr valign="top">
                 <td>libvirt API driver</td>
                 <td>hw_machine_type</td>
diff --git a/doc/common/section_cli_nova_customize_flavors.xml b/doc/common/section_cli_nova_customize_flavors.xml
index c107dccd78..85fbc93103 100644
--- a/doc/common/section_cli_nova_customize_flavors.xml
+++ b/doc/common/section_cli_nova_customize_flavors.xml
@@ -46,7 +46,7 @@
             <tr>
                 <td><literal>Name</literal></td>
                 <td>A descriptive name.
-                        <replaceable>xx</replaceable>.<replaceable>size_name</replaceable>
+                        <replaceable>XX</replaceable>.<replaceable>SIZE_NAME</replaceable>
                     is typically not required, though some third party
                     tools may rely on it.</td>
             </tr>
@@ -106,7 +106,8 @@
     </table>
     <para>Flavor customization can be limited by the hypervisor in use. For example the
             <systemitem>libvirt</systemitem> driver enables quotas on CPUs available to a VM, disk
-        tuning, bandwidth I/O, watchdog behavior, and instance VIF traffic control.</para>
+        tuning, bandwidth I/O, watchdog behavior, random number generator device control, and
+        instance VIF traffic control.</para>
         <variablelist>
             <varlistentry><term>CPU limits</term>
                 <listitem><para>You can configure the CPU limits with control parameters with the <command>nova</command>
@@ -225,8 +226,8 @@
                         <literal>hw_watchdog_action</literal> is not specified, the watchdog is
                     disabled.</para>
                 <para>To set the behavior, use:</para>
-                <screen><prompt>$</prompt> <userinput>nova flavor-key <replaceable>flavorName</replaceable> set hw_watchdog_action=<replaceable>action</replaceable></userinput></screen>
-                <para>Valid <replaceable>action</replaceable> values are:</para>
+                <screen><prompt>$</prompt> <userinput>nova flavor-key <replaceable>FLAVOR-NAME</replaceable> set hw_watchdog_action=<replaceable>ACTION</replaceable></userinput></screen>
+                <para>Valid <replaceable>ACTION</replaceable> values are:</para>
                 <itemizedlist>
                            <listitem>
                                <para><literal>disabled</literal>&mdash;(default) The device is not
@@ -251,6 +252,26 @@
                             flavors.</para></note>
                 </listitem>
             </varlistentry>
+            <varlistentry>
+                <term>Random-number generator</term>
+                <listitem><para>If a random-number generator device has been added to the instance through its image
+                    properties, the device can be enabled and configured using:</para>
+                    <screen><prompt>$</prompt> <userinput>nova flavor-key <replaceable>FLAVOR-NAME</replaceable> set hw_rng:allowed=True</userinput>
+<prompt>$</prompt> <userinput>nova flavor-key <replaceable>FLAVOR-NAME</replaceable> set hw_rng:rate_bytes=<replaceable>RATE-BYTES</replaceable></userinput>
+<prompt>$</prompt> <userinput>nova flavor-key <replaceable>FLAVOR-NAME</replaceable> set hw_rng:rate_period=<replaceable>RATE-PERIOD</replaceable></userinput></screen>
+                    <para>Where:</para>
+                <itemizedlist>
+                    <listitem>
+                        <para><replaceable>RATE-BYTES</replaceable>&mdash;(Integer) Allowed amount of
+                            bytes that the guest can read from the host's entropy per period.</para>
+                    </listitem>
+                    <listitem>
+                        <para><replaceable>RATE-PERIOD</replaceable>&mdash;(Integer) Duration of the
+                            read period in seconds.</para>
+                    </listitem>
+                </itemizedlist>
+                </listitem>
+            </varlistentry>
             <varlistentry><term>Instance VIF traffic control</term>
                 <listitem><para>Flavors can also be assigned to particular projects. By
                     default, a flavor is public and available to all projects.