Skip to content
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

Add latest MDM categories #93

Merged
merged 4 commits into from
Aug 16, 2022
Merged

Add latest MDM categories #93

merged 4 commits into from
Aug 16, 2022

Conversation

michaelstingl
Copy link
Contributor

@michaelstingl michaelstingl commented Aug 12, 2022

Issue: #92
Blocked by #64

  1. update mdm_tables.adoc from iOS app repo (only needed for local builds, can be removed after Update the mdm table link for master only #64 merge)
  2. add MDM categories to mdm.adoc

1) update mdm_tables.adoc from master (only needed for local builds)
2) add MDM categories to mdm.adoc
only item will be moved to other category…
@michaelstingl michaelstingl linked an issue Aug 12, 2022 that may be closed by this pull request
@mmattel
Copy link
Contributor

mmattel commented Aug 16, 2022

I have taken a look to this PR and propose NOT to implement the current changes to the mdm table in this repo but add the changes to configuration.adoc in the IOS repo. That file is, as far I know autogenerated and all changes should go there. The text changes and new content referenced by tags can go into this document.

When the changes have been added into configuration.adoc and removed from this PR, I will adapt this PR to include the file based on the git tag. This was already discussed and gives us the ability to freeze content for a IOS major/minor release and also link our "next" to the master version of the IOS repo. In addition, manual intervention reduces to a minimum.

We use the method of including "foreign" content successfully for a while now and it works very well.

Note that it was planned to auto-generate images and store them in images which will get linked here too, but if you look into the content of that folder, you see text strings instead of images... also see the readme.md for what folder should have which content.

@hosy fyi

@michaelstingl
Copy link
Contributor Author

When the changes have been added into configuration.adoc and removed from this PR, I will adapt this PR

The mdm_tables.adoc in this PR is a copy of the configuration.adoc from the IOS repo. It should be deleted before the merge.

@mmattel
Copy link
Contributor

mmattel commented Aug 16, 2022

I need clarification:

  1. does the configuration.adoc at the ios repo contain all changes you have proposed here?
  2. if not, will the configuration.adoc file get updated and when

@michaelstingl
Copy link
Contributor Author

  • does the configuration.adoc at the ios repo contain all changes you have proposed here?

yes

@mmattel
Copy link
Contributor

mmattel commented Aug 16, 2022

I just have made the first changes according the discussion above. Local build runs fine and tests show that no missing tags are present. Note that no checks have been made with regards to correctness of the source content.

@mmattel mmattel marked this pull request as ready for review August 16, 2022 14:32
@mmattel
Copy link
Contributor

mmattel commented Aug 16, 2022

Backport to 11.10 only but needs checking if the include source has all data and omit those things which are not present.

@mmattel mmattel merged commit 50bfe59 into master Aug 16, 2022
@delete-merged-branch delete-merged-branch bot deleted the add-mdm-categories branch August 16, 2022 14:34
mmattel added a commit that referenced this pull request Aug 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build options missing in the documentation
2 participants