-
Notifications
You must be signed in to change notification settings - Fork 259
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
docs: improve handling of ResourceItem descriptions #1761
docs: improve handling of ResourceItem descriptions #1761
Conversation
f3372f1
to
25b1d62
Compare
docs/manuals/source/DocumentationStyleGuide/BareosSpecificFormatting/BareosConfiguration.rst
Outdated
Show resolved
Hide resolved
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.
Nicely done, now to be able to build the PR,
@sebsura do you want to fix the extra openssl command we have in the C code
sphinx-build -M html ../b-at-bareos/docs/manuals/source docs/BareosMainReference -j16
Running Sphinx v5.3.0
/bareos/git/b-at-bareos/docs/manuals
INFO generate-resource-descriptions.createSphinx: Create RST/Sphinx files ...
INFO generate-resource-descriptions.__init__: format-version: 2
INFO generate-resource-descriptions.createSphinx: daemon: bareos-dir, resource: Catalog
INFO generate-resource-descriptions.createSphinx: daemon: bareos-dir, resource: Client
Traceback (most recent call last):
File "scripts/generate-resource-descriptions.py", line 507, in <module>
createSphinx(data)
File "scripts/generate-resource-descriptions.py", line 455, in createSphinx
sphinx.writeResourceDirectives(
File "scripts/generate-resource-descriptions.py", line 193, in writeResourceDirectives
self.out.write(self.getConvertedResourceDirectives(daemon, resourcename))
File "scripts/generate-resource-descriptions.py", line 289, in getConvertedResourceDirectives
"description": self.getDescription(data),
File "scripts/generate-resource-descriptions.py", line 264, in getDescription
raise RuntimeError(f"Description is not plain text: '{description}'")
RuntimeError: Description is not plain text: 'List of valid TLSv1.2 and lower Ciphers; see :command:`openssl ciphers`'
Configuration error:
There is a programmable error in your configuration file:
Traceback (most recent call last):
File "/usr/local/lib/python3.8/site-packages/sphinx/config.py", line 350, in eval_config_file
exec(code, namespace)
File "/bareos/git/b-at-bareos/docs/manuals/source/conf.py", line 417, in <module>
subprocess.check_call(
File "/usr/lib64/python3.8/subprocess.py", line 364, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['scripts/generate-resource-descriptions.py', '--sphinx', 'source/include/autogenerated/bareos-dir-config-schema.json']' returned non-zero exit status 1.
I did the description changes in a minimal way, by rewriting the description in the C code ( |
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 comments
docs/manuals/source/include/autogenerated/bareos-dir-config-schema.json
Outdated
Show resolved
Hide resolved
@bruno-at-bareos When you finished your review, I'd like to squash some of the commits together. |
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.
Thanks everything looks good now.
I would recommend to backport to 23 (at least) so the rules and the sphinx generator are in place.
to do so, you may want to go for squashing commits first maybe.
2f3792e
to
3353a23
Compare
Explain that description strings in ResourceItem structures are plain text only.
Also clarifiy the description and fix the resource type to STRING. Co-authored-by: Bruno Friedmann @bareos <89836284+bruno-at-bareos@users.noreply.github.com>
82f6c2c
to
f3e6b11
Compare
Thank you for contributing to the Bareos Project!
Document and make sure, that ResourceItem descriptions are plain text.
Please check
If you have any questions or problems, please give a comment in the PR.
Helpful documentation and best practices
Checklist for the reviewer of the PR (will be processed by the Bareos team)
Make sure you check/merge the PR using
devtools/pr-tool
to have some simple automated checks run and a proper changelog record added.General
Source code quality