From 2ac999f00a86725a89fcfd40e18a130e0473b515 Mon Sep 17 00:00:00 2001
From: Summer Long <slong@redhat.com>
Date: Wed, 19 Feb 2014 16:08:07 +1000
Subject: [PATCH] Added sample file for Identity Service.

Added the policy.json file, and rearranged listing into sections.

Change-Id: Ied3775b122897b3815f62a86c01d1d2844f5f0fc
Partial-Bug: #1281348
---
 .../section_keystone-sample-conf-files.xml    | 67 ++++++++++++-------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/doc/common/section_keystone-sample-conf-files.xml b/doc/common/section_keystone-sample-conf-files.xml
index 92369f0ad4..3c45bc604b 100644
--- a/doc/common/section_keystone-sample-conf-files.xml
+++ b/doc/common/section_keystone-sample-conf-files.xml
@@ -4,26 +4,47 @@
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
     xml:id="sample-configuration-files">
     <title>Identity Service sample configuration files</title>
-    <itemizedlist>
-        <listitem>
-            <para>
-                <filename>etc/keystone.conf.sample</filename>
-           </para>
-            <para>
-                <programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone.conf.sample"/></programlisting></para>
-        </listitem>
-        <listitem>
-            <para>
-                <filename>etc/keystone-paste.ini</filename>
-           </para>
-            <para>
-                <programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone-paste.ini"/></programlisting></para>
-        </listitem>
-        <listitem>
-            <para>
-                <literal>etc/logging.conf.sample</literal>
-           </para>
-            <para><programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/logging.conf.sample"/></programlisting></para>
-        </listitem>
-    </itemizedlist>
-</section>
+    <para>All the files in this section can be found in the <systemitem>/etc/keystone</systemitem>
+        directory.</para>
+    <section xml:id="section_keystone.conf">
+        <title>keystone.conf</title>
+        <para>The majority of the Identity service configuration is performed from the
+            <filename>keystone.conf</filename> file.</para>
+          <para>
+                <programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone.conf.sample"/>
+                </programlisting>
+          </para>
+    </section>
+    <section xml:id="section_keystone-paste.ini">
+         <title>keystone-paste.ini</title>
+         <para>The <filename>keystone-paste.ini</filename> file configures the
+             Web Service Gateway Interface (WSGI) middleware pipeline for
+             the Identity Service.
+         </para>
+         <para>
+             <programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone-paste.ini"/>
+             </programlisting>
+         </para>
+    </section>
+    <section xml:id="section_keystone-logging.conf">
+         <title>logging.conf</title>
+         <para>A special logging configuration file can be specified in the
+             <filename>keystone.conf</filename> configuration file (for example,
+             <filename>/etc/keystone/logging.conf</filename>). For details, see the Python
+             logging module documentation (
+             <link xlink:href="http://docs.python.org/2/howto/logging.html#configuring-logging">Python Logging</link>).</para>
+         <para>
+             <programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/logging.conf.sample"/>
+             </programlisting>
+         </para>
+    </section>
+    <section xml:id="section_keystone-policy.json">
+         <title>policy.json</title>
+         <para>The <filename>policy.json</filename> file defines additional access controls that
+             apply to the Identity Service.</para>
+         <para>
+            <programlisting language="json"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/policy.json"/>
+            </programlisting>
+         </para>
+    </section>
+</section>
\ No newline at end of file