Move lists out of descriptions and into main content.

Author: RossBugginsNHS

Gemfile

@@ -10,6 +10,9 @@ source "https://rubygems.org"
 gem "jekyll", "~> 4.4.1"
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 gem "minima", "~> 2.5"
+
+gem 'jekyll-json-feed'
+
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.
 # gem "github-pages", group: :jekyll_plugins

Gemfile.lock

@@ -40,6 +40,8 @@ GEM
       jekyll (>= 3.7, < 5.0)
     jekyll-include-cache (0.2.1)
       jekyll (>= 3.7, < 5.0)
+    jekyll-json-feed (1.0.1)
+      jekyll (>= 3.3, < 5.0)
     jekyll-sass-converter (3.0.0)
       sass-embedded (~> 1.54)
     jekyll-seo-tag (2.8.0)
@@ -89,6 +91,7 @@ DEPENDENCIES
   http_parser.rb (~> 0.6.0)
   jekyll (~> 4.4.1)
   jekyll-feed (~> 0.12)
+  jekyll-json-feed
   just-the-docs
   minima (~> 2.5)
   tzinfo (>= 1, < 3)

_config.yml

@@ -32,8 +32,8 @@ twitter_username: jekyllrb
 github_username:  jekyll
 
 plugins_dir: _plugins
-#plugins:
-  #- tags
+plugins:
+  - jekyll-json-feed
 
 safe: false
 

_safs/d/d06.md

@@ -6,25 +6,7 @@ tags: [documentation,vision,roadmap,diagrams,models]
 nav_order: 2.76
 
 requirement: |
-  The architecture documentation **SHOULD** be appropriate in scope and quality for the solution covering (but not exclusively) :- 
-
-  - Architecture Vision 
-  - Architecture Roadmap 
-  - Layer Diagrams 
-  - Capability Model 
-  - Non functional requirements 
-  - Conceptual Architecture 
-  - Logical Architecture 
-  - Physical (including network, infrastructure etc.) 
-  - Solution Architecture Overview (SDO) 
-  - Key Architecture Decisions (KADs) 
-  - Data Models 
-  - Data Flows 
-  - API Specifications 
-  - Volume and Performance Models 
-  - Architecture Decision Records 
-  - Assumption, Risks, Issues and Dependencies 
-  - Cyber Assessment Framework compliance  
+  The architecture documentation **SHOULD** be appropriate in scope and quality for the solution covering (but not exclusively) as defined in D06.
 
 more_info: |
  asd
@@ -50,4 +32,32 @@ further_reading:
       content: |
         google.com
       url: https://www.google.com
+
+documentation:
+  - Architecture Vision 
+  - Architecture Roadmap 
+  - Layer Diagrams 
+  - Capability Model 
+  - Non functional requirements 
+  - Conceptual Architecture 
+  - Logical Architecture 
+  - Physical (including network, infrastructure etc.) 
+  - Solution Architecture Overview (SDO) 
+  - Key Architecture Decisions (KADs) 
+  - Data Models 
+  - Data Flows 
+  - API Specifications 
+  - Volume and Performance Models 
+  - Architecture Decision Records 
+  - Assumption, Risks, Issues and Dependencies 
+  - Cyber Assessment Framework compliance  
+
 ---
+
+<ul>
+{%- for document in page.documentation  -%}
+<li>
+{{ document  | markdownify}}
+</li>
+{% endfor %}
+<ul>

_safs/nf/nf05.md

@@ -6,9 +6,8 @@ tags: [auditing,logging]
 nav_order: 2.55
 
 requirement: |
-  Audit & logging requirements **MUST** be defined and solutions can support them  
-    - https://www.ncsc.gov.uk/collection/device-security-guidance/managing-deployed-devices/logging-and-protective-monitoring 
-    - https://www.ncsc.gov.uk/collection/cloud/the-cloud-security-principles/principle-13-audit-information-and-alerting-for-customers 
+  Audit & logging requirements **MUST** be defined and solutions can support them, as defined in NF05.
+
 
 more_info: |
  asd
@@ -34,4 +33,17 @@ further_reading:
       content: |
         google.com
       url: https://www.google.com
+
+
+auditing:
+  - https://www.ncsc.gov.uk/collection/device-security-guidance/managing-deployed-devices/logging-and-protective-monitoring 
+  - https://www.ncsc.gov.uk/collection/cloud/the-cloud-security-principles/principle-13-audit-information-and-alerting-for-customers 
 ---
+
+<ul>
+{%- for audit in page.auditing  -%}
+<li>
+{{ audit  | markdownify}}
+</li>
+{% endfor %}
+<ul>

_safs/sd/sd04.md

@@ -7,13 +7,7 @@ nav_order: 2.34
 description: Design Principles
 
 requirement: |
-    Solution design **SHOULD** follow good practice design principles e.g.  
-    - Separation of concerns 
-    - Encapsulation / Modularisation 
-    - Loose coupling 
-    - High cohesion / single responsibility 
-    - Design for flexibility/change 
-    - Etc. 
+    Solution design **SHOULD** follow good practice design principles as outlined in SD04.
 
 more_info: |
  asd
@@ -39,4 +33,20 @@ further_reading:
       content: |
         google.com
       url: https://www.google.com
+
+design_principles:
+  - Separation of concerns 
+  - Encapsulation / Modularisation 
+  - Loose coupling 
+  - High cohesion / single responsibility 
+  - Design for flexibility/change 
+  - Etc. 
 ---
+
+<ul>
+{%- for principle in page.design_principles  -%}
+<li>
+{{ principle  | markdownify}}
+</li>
+{% endfor %}
+<ul>

_safs/sd/sd11.md

@@ -7,14 +7,7 @@ nav_order: 2.392
 description: External Policies
 
 requirement: |
-    Solutions **MUST** adhere to (Aalto needs updating with full list) 
-
-    - Government "Secure by Design" policy Link 
-    - NCSC CAF  Link 
-    - Access Control Guidelines Link 
-    - Policy - Strong Auth/MFA Link 
-    - Storage and Processing of Data Outside of the UK - Information Governance Policy Link 
-    - NHS England’s API strategy & policy statements e.g. API Landscape policy document (Word - API Landscape policy v1.0 (digital.nhs.uk) 
+    Solutions **MUST** adhere to policies outlined in SD11. (Aalto needs updating with full list) 
 
 more_info: |
  asd
@@ -40,4 +33,20 @@ further_reading:
       content: |
         google.com
       url: https://www.google.com
+
+extenal_policies:
+  - Government "Secure by Design" policy Link 
+  - NCSC CAF  Link 
+  - Access Control Guidelines Link 
+  - Policy - Strong Auth/MFA Link 
+  - Storage and Processing of Data Outside of the UK - Information Governance Policy Link 
+  - NHS England’s API strategy & policy statements e.g. API Landscape policy document (Word - API Landscape policy v1.0 (digital.nhs.uk) 
 ---
+
+<ul>
+{%- for policy in page.extenal_policies  -%}
+<li>
+{{ policy  | markdownify}}
+</li>
+{% endfor %}
+<ul>