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

[DRAFT] Merge old and new documentation #657

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Conversation

jofranz
Copy link
Member

@jofranz jofranz commented Nov 28, 2022

In this PR @Fabian-SYSTOPIA and I are working on an attempt to merge the old confluence wiki pages into the existing docs pages.

0681e6d currently has some todo comments which need to be resolved before merging!

To make collaboration easier I created this PR to be able to use line-by-line comments

systopia-reference-16162

@bjendres
Copy link
Member

Should we maybe merge that into a branch first? It might be good to review these (old) docs, and a lot might have changed since then...

@jofranz
Copy link
Member Author

jofranz commented Nov 29, 2022

Can't see the advantage of merging the docs-merge into something like docs-merge-final but I'm open to suggestions. My thought were working on it in this PR here until we have a final version to show you @bjendres and or others for a final review?

@bjendres
Copy link
Member

My thought were working on it in this PR here until we have a final version to show you @bjendres and or others for a final review?

If it's only one PR for the docs consolidation, then yes, that is ok. Is it already complete or are there more sources?

@bjendres
Copy link
Member

bjendres commented Dec 2, 2022

Hm, there's still has a bunch of wrong/outdated/weird things in it. Do you want me to look into this?

## Status
In the course of the development the project unfortunately split into three branches, mostly due to some very tight deadlines with different requirements. Since early July 2014 there is a joint version, merging the branches of Xavier Dutoit (tttp) and Björn Endres (SYSTOPIA). Both versions have, individually, been used in production environments since the beginning of 2014.

Maintainer: Björn Endres (endres (at) systopia.de) and Xavier Dutoit (xavier (at) tttp.eu)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can remove Xavier as a maintainer, but he should still be credited for the initial development

@jofranz
Copy link
Member Author

jofranz commented Dec 6, 2022

Only this one

@bjendres bjendres marked this pull request as draft August 23, 2024 11:45
@bjendres bjendres added this to the 1.12 milestone Aug 23, 2024
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.

3 participants