-
Notifications
You must be signed in to change notification settings - Fork 180
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Review and Tech Edit of the Model Documentation #414
Review and Tech Edit of the Model Documentation #414
Conversation
637336d
to
136622f
Compare
This work has progressed to a point where we can merge this PR, and continue working on more documentation refinements in another PR before closing out #212. |
dc909e3
to
911b4be
Compare
Please review the schema docs in this archive. Please focus your review on:
This schema documentation is still not great, but it is improved from before. I plan to continue to work on improving it during the early part of sprint 22, so don't worry about missing or inadequate documentation at this time. |
@david-waltermire-nist Overall this looks very good!
I don't know if this is within the scope of what you wanted reviewed or not. When I click the "Catalog Schema" link on the right, the introductory text for the Schema Reference is XML-specific. I have a few observations:
- When I click the JSON button and get the JSON Sechema Reference, the last sentence in the first section still talks about - and links to - the XML Schema, rather than the JSON Schema.
A few other notes that don't need to be addressed now, but should be considered for future revisions:
|
@david-waltermire-nist - The site looks great! Thank you, all!
|
@david-waltermire-nist: Here are few additional comments. Due to our deadline constraints, please feel free to ignore the comments that are not OSCAL release-stoppers. AS A MORE GENERAL RULE - in this page in particular, abreviations are used before they are spelled out. NOTE: I am provided the comments incrementally - I still have to review Schema Reference. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See separate comment with my changes. Some are optional, or could be deferred, but some should be addressed now.
@brianrufgsa I made the following changes:
Fixed.
Fixed.
I rewrote the intro paragraph to be more neutral. Once I post updated content to this issue, please give it another look and let me know what you think.
Not sure how to address this. Can you create an issue for this? We can consider what to do in the next sprint.
I removed this text. I will talk with @wendellpiez about adding a general capability to link to the relevant schema.
IMHO, we modeled it, so no harm in keeping it.
I agree. This will be the focus of future refinements to these docs.
Hopefully, my new intro paragraph will help, but we can do a bunch of terminology cleanup going forward. Can you create a new issue raising these points? Thanks for the comments! |
For some reason, I can't see your requested changes. Can you jump on Gitter? |
Here are the promised updates to the Scenario page (see comment above): |
@david-waltermire-nist - I am on gitter now - but my comments were submitted 13 hours ago (part 1), 4 hours ago (part 2) and then the file abnove (2 hours ago)- see above. |
Changed the namespace for examples to: http://csrc.nist.gov/ns/oscal/example. Added support for listing valid-values for flags and fields. Valid values can be assigned directly in the define-flag or define-field, or they can be defined or overridden in a referencing flag or field entry. Fixed some typos and formatting in the document generation templates. Added support for anchor "a" tags in documentation markup processing. Anchors could be included before, but they would not render in the final documentation. Added support to use the description of a define-flag, define-field, or define-assembly in a content model. This can overridden by defining a description on the referencing flag, field, or assembly entry.
…lso added JSON validation of generated files
…ehavior of sub-scripts run
b0d3dbb
to
9436d0c
Compare
generated from commit a795cec
- Improved the schema documentation. - Changed the namespace for examples to: http://csrc.nist.gov/ns/oscal/example. - Added support for listing valid-values for flags and fields. Valid values can be assigned directly in the define-flag or define-field, or they can be defined or overridden in a referencing flag or field entry. - Fixed some typos and formatting in the document generation templates. - Added support for anchor "a" tags in documentation markup processing. Anchors could be included before, but they would not render in the final documentation. - Added support to use the description of a define-flag, define-field, or define-assembly in a content model. This can overridden by defining a description on the referencing flag, field, or assembly entry. - Added hack to map filenames between XML and JSON during conversion. Also added JSON validation of generated files - Improved runtime use of the runall script, allow for more selective behavior of sub-scripts run
Committer Notes
For issue #212, this PR provides edited catalog and profile model documentation that more completely describes the use of the elements in these models.
All Submissions:
Changes to Core Features: