PERFORCE change 24408 for review

[Chris Costello]

http://perforce.freebsd.org/chv.cgi?CH=24408

Change 24408 by chris at chris_holly on 2003/01/29 19:26:15

	Make the organization match what's specified in OUTLINE.TrustedBSD.

Affected files ...

.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/Makefile#4 edit
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/book.sgml#9 edit
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/chapters.ent#4 edit
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/kernelsec/security-policy.sgml#1 add
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/userlandsec/pure-userland.sgml#2 delete
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/userlandsec/security-policy.sgml#1 add
.. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/userlandsec/services.sgml#1 add

Differences ...

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/Makefile#4 (text+ko) ====

@@ -40,9 +40,11 @@
 
 SRCS+=	introduction/security-defined.sgml
 SRCS+=	introduction/security-definitions.sgml
+SRCS+=	kernelsec/security-policy.sgml
 SRCS+=	kernelsec/services.sgml
 SRCS+=	userlandsec/interaction.sgml
-SRCS+=	userlandsec/pure-userland.sgml
+SRCS+=	userlandsec/security-policy.sgml
+SRCS+=	userlandsec/services.sgml
 
 SYMLINKS=	${DESTDIR} index.html sec-arch.html
 

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/book.sgml#9 (text+ko) ====

@@ -206,6 +206,65 @@
           </listitem>
         </varlistentry>
       </variablelist>
+
+      <para><xref linkend="kernel-security">, Kernel Security</para>
+
+      <variablelist>
+        <varlistentry>
+          <term><xref linkend="kernel-security.security-policy">,
+            Kernel Security</term>
+
+          <listitem>
+            <para>A description of the many facets of the FreeBSD
+              kernel security policy</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+      <para><xref linkend="userland-security">, Userland Security</para>
+
+      <variablelist>
+        <varlistentry>
+          <term><xref linkend="userland-security.security-policy">,
+            Userland Security Policy</term>
+
+          <listitem>
+            <para>A tour of the different features that come together
+              to define a userland security policy</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><emphasis>[TO BE WRITTEN]</emphasis>, Mandatory
+            Interaction with Kernel Security Mechanisms</term>
+
+          <listitem>
+            <para>An explanation of the kernel's enforcement of
+              security policy on applications</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><emphasis>[TO BE WRITTEN]</emphasis>, Non-Mandatory
+            Interaction with Kernel Security Mechanisms</term>
+
+          <listitem>
+            <para>How applications can optionally use kernel security
+              primitives in order to more effectively enforce their
+              own security policy</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><xref linkend="userland-security.services">, Userland
+            Security Services</term>
+
+          <listitem>
+            <para>Purely userland security services such as SSH, PAM,
+              crypto, etc.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </section>
   </preface>
 
@@ -235,7 +294,7 @@
         their semantics, their usage, and their enforcement.</para>
     </partintro>
 
-    &chap.kernel-security.services;
+    &chap.kernel-security.security-policy;
   </part>
 
   <part id="userland-security">
@@ -251,8 +310,8 @@
         covered in this part.</para>
     </partintro>
 
-    &chap.userland-security.interaction;
-    &chap.userland-security.pure-userland;
+    &chap.userland-security.security-policy;
+    &chap.userland-security.services;
   </part>
 </book>
 

==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/chapters.ent#4 (text+ko) ====

@@ -2,6 +2,8 @@
 <!ENTITY chap.introduction.security-definitions	SYSTEM "introduction/security-definitions.sgml">
 
 <!ENTITY chap.kernel-security.services		SYSTEM "kernelsec/services.sgml">
+<!ENTITY chap.kernel-security.security-policy	SYSTEM "kernelsec/security-policy.sgml">
 
 <!ENTITY chap.userland-security.interaction	SYSTEM "userlandsec/interaction.sgml">
-<!ENTITY chap.userland-security.pure-userland	SYSTEM "userlandsec/pure-userland.sgml">
+<!ENTITY chap.userland-security.services	SYSTEM "userlandsec/services.sgml">
+<!ENTITY chap.userland-security.security-policy	SYSTEM "userlandsec/security-policy.sgml">
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message