Re: [PATCH] Update the cil docs to match the current behaviour.

[James Carter <jwcart2@gmail.com>]

This patch is malformed. It looks like leading spaces and blank lines
(at the very least) have been stripped.
Thanks,
Jim


On Mon, Jun 29, 2020 at 3:44 PM bauen1 <j2468h@googlemail.com> wrote:
>
> Some features where dropped or change since the docs were last updated.
>
> Signed-off-by: bauen1 <j2468h@gmail.com>
> ---
> secilc/docs/cil_call_macro_statements.md | 6 ++++--
> secilc/docs/cil_container_statements.md | 2 +-
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/secilc/docs/cil_call_macro_statements.md b/secilc/docs/cil_call_macro_statements.md
> index 17c46ed9..98b70368 100644
> --- a/secilc/docs/cil_call_macro_statements.md
> +++ b/secilc/docs/cil_call_macro_statements.md
> @@ -44,7 +44,7 @@ macro
> Declare a macro in the current namespace with its associated parameters. The macro identifier is used by the [`call`](cil_call_macro_statements.md#call) statement to instantiate the macro and resolve any parameters. The call statement may be within the body of a macro.
> -Note that when resolving macros the callers namespace is not checked, only the following places:
> +When resolving macros the following places are checked in this order:
> - Items defined inside the macro
> @@ -52,6 +52,8 @@ Note that when resolving macros the callers namespace is not checked, only the f
> - Items defined in the same namespace of the macro
> +- Items defined in the callers namespace
> +
> - Items defined in the global namespace
> **Statement definition:**
> @@ -80,7 +82,7 @@ Note that when resolving macros the callers namespace is not checked, only the f
> <tr class="odd">
> <td align="left"><p><code>param_type</code></p></td>
> <td align="left"><p>Zero or more parameters that are passed to the macro. The <code>param_type</code> is a keyword used to determine the declaration type (e.g. <code>type</code>, <code>class</code>, <code>categoryset</code>).</p>
> -<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>block</code>, <code>name</code> (a string), <code>classmap</code></p></td>
> +<p>The list of valid <code>param_type</code> entries are: <code>type</code>, <code>typealias</code>, <code>role</code>, <code>user</code>, <code>sensitivity</code>, <code>sensitivityalias</code>, <code>category</code>, <code>categoryalias</code>, <code>categoryset</code> (named or anonymous), <code>level</code> (named or anonymous), <code>levelrange</code> (named or anonymous), <code>class</code>, <code>classpermission</code> (named or anonymous), <code>ipaddr</code> (named or anonymous), <code>name</code> (a string), <code>classmap</code></p></td>
> </tr>
> <tr class="even">
> <td align="left"><p><code>param_id</code></p></td>
> diff --git a/secilc/docs/cil_container_statements.md b/secilc/docs/cil_container_statements.md
> index a570cb23..58b3224d 100644
> --- a/secilc/docs/cil_container_statements.md
> +++ b/secilc/docs/cil_container_statements.md
> @@ -254,7 +254,7 @@ This example will instantiate the optional block `ext_gateway.move_file` into po
> in
> --
> -Allows the insertion of CIL statements into a named container ([`block`](cil_container_statements.md#block), [`optional`](cil_container_statements.md#optional) or [`macro`](cil_call_macro_statements.md#macro)). This statement is not allowed in [`booleanif`](cil_conditional_statements.md#booleanif) or [`tunableif`](cil_conditional_statements.md#tunableif) statements.
> +Allows the insertion of CIL statements into a named container ([`block`](cil_container_statements.md#block), [`optional`](cil_container_statements.md#optional) or [`macro`](cil_call_macro_statements.md#macro)). This statement is not allowed in [`booleanif`](cil_conditional_statements.md#booleanif) or [`tunableif`](cil_conditional_statements.md#tunableif) statements. This only works for containers that aren't inherited using [`blockinherit`](cil_conditional_statements.md#blockinherit).
> **Statement definition:**
>
> --
> 2.27.0
>