Codeberg/Documentation
42
199
Fork
You've already forked Documentation
161

Currently: Documentation upstreaming #277

Closed
opened 2022年11月05日 15:37:34 +01:00 by fnetX · 8 comments
Owner
Copy link

Hello everyone,

during the hackathon these days, we're taking the effort to try and upstream this documentation.

This means:

  • we are implementing a package that can be depended on by upstream Gitea to include the docs
  • the docs are included within each instance's build and served there to match the current version
  • this might mean changes to the licensing to sync with upstream Gitea docs (Apache 2.0 license)

The effort can be followed in: https://codeberg.org/Codeberg/Gitea-Documentation/

Hello everyone, during the hackathon these days, we're taking the effort to try and upstream this documentation. This means: - we are implementing a package that can be depended on by upstream Gitea to include the docs - the docs are included within each instance's build and served there to match the current version - this might mean changes to the licensing to sync with upstream Gitea docs (Apache 2.0 license) The effort can be followed in: https://codeberg.org/Codeberg/Gitea-Documentation/
Contributor
Copy link

@svarmorsdrummen: Did you want to reference a different issue? (Why did you add the self-referencing link?)

@svarmorsdrummen: Did you want to reference a different issue? (Why did you add the self-referencing link?)
Contributor
Copy link

Since I've just stumbled upon this in a different context:

https://opensource.stackexchange.com/questions/12477/is-cc-by-sa-3-0-compatible-with-apache-2-0

I think this could be relevant for the upstreaming effort as well, even though Codeberg Docs uses CC-BY-SA 4.0. Gitea and Forgejo docs are, if I'm not mistaken, licensed under Apache-2.0, which could mean that it's impossible (or at least risky) to combine both.

So documentation upstreaming might require relicensing either Codeberg docs to Apache-2.0/CC-BY or Forgejo Docs to to CC-BY-SA (caveat: Forgejo itself is MIT-licensed and the docs are part of its source tree, so that might open up an entirely different can of worms). But unless there's a CLA that I don't know about, asking each contributor for permission would be a big effort at this point.

I don't know a good solution to this. For my own project, I plan on refraining from the use of CC-BY-SA and instead use Apache-2.0 throughout the whole project, which in that context seems like a good fit (and, at this point, is still feasible 🙈). YMMV.

As always when I talk about licenses and copyright: I am not a lawyer and this is not legal advice.

Since I've just stumbled upon this in a different context: https://opensource.stackexchange.com/questions/12477/is-cc-by-sa-3-0-compatible-with-apache-2-0 I think this could be relevant for the upstreaming effort as well, even though Codeberg Docs uses CC-BY-SA 4.0. Gitea and Forgejo docs are, if I'm not mistaken, licensed under Apache-2.0, which could mean that it's impossible (or at least risky) to combine both. So documentation upstreaming might require relicensing either Codeberg docs to Apache-2.0/CC-BY or Forgejo Docs to to CC-BY-SA (caveat: Forgejo itself is MIT-licensed and the docs are part of its source tree, so that might open up an entirely different can of worms). But unless there's a CLA that I don't know about, asking each contributor for permission would be a big effort at this point. I don't know a good solution to this. For my own project, I plan on refraining from the use of CC-BY-SA and instead use Apache-2.0 throughout the whole project, which in that context seems like a good fit (and, at this point, is still feasible 🙈). YMMV. As always when I talk about licenses and copyright: I am not a lawyer and this is not legal advice.

Forgejo needs documentation and I'd like to build upon Codeberg documentation to do so. The upside is that, in addition to having existing end-user content, the tooling is in place and the effort to make it into an independent package was bootstrapped.

My focus will be on adding sections that are not relevant to Codeberg but required for Forgejo:

  • Installation
  • Upgrade
  • Internal CI/CD

And the release notes which matter to both Forgejo and Codeberg when it comes to user facing features or bug fixes.

What I'm unsure about is how to go about doing that since it can be argued it is out of scope and that Forgejo should build its documentation independently and borrow from the Codeberg documentation rather than trying to contribute to it.

What do you think?

Forgejo [needs documentation](https://codeberg.org/forgejo/meta/issues/67) and I'd like to build upon Codeberg documentation to do so. The upside is that, in addition to having existing end-user content, the tooling is in place and [the effort to make it into an independent package](https://codeberg.org/Codeberg/Gitea-Documentation/) was bootstrapped. My focus will be on adding sections that are not relevant to Codeberg but required for Forgejo: * Installation * Upgrade * Internal CI/CD And the release notes which matter to both Forgejo and Codeberg when it comes to user facing features or bug fixes. What I'm unsure about is how to go about doing that since it can be argued it is out of scope and that Forgejo should build its documentation independently and borrow from the Codeberg documentation rather than trying to contribute to it. What do you think?
Author
Owner
Copy link

The current state is that with the creation of Forgejo, there is no longer a clear direction for us.

The goal should IMHO still be to combine the forces and help with good Forgejo end-user docs based on what Codeberg already offers, but given some disagreement between collaborators, I will not push this forward personally.

The current state is that with the creation of Forgejo, there is no longer a clear direction for us. The goal should IMHO still be to combine the forces and help with good Forgejo end-user docs based on what Codeberg already offers, but given some disagreement between collaborators, I will not push this forward personally.
Contributor
Copy link

Maybe keep all Codeberg-related (+ possibly onboarding/Getting Started) docs here and link to built-in Forgejo docs (once they are ready) for everything else?

Maybe keep all Codeberg-related (+ possibly onboarding/Getting Started) docs here and link to built-in Forgejo docs (once they are ready) for everything else?
Author
Owner
Copy link

This project went stale. However, the Forgejo team now maintains a documentation, and synching with them makes a lot of sense. Should be discussed in a fresh issue, though.

This project went stale. However, the Forgejo team now maintains a documentation, and synching with them makes a lot of sense. Should be discussed in a fresh issue, though.

The documentation is at https://codeberg.org/forgejo/website/src/branch/main/src/pages/docs and is actively maintained. It is bare bones in terms of layout: this is almost 100% content, with just a URL to the source from which it is paired / sync when appropriate.

That absolutely does not solve many of the issue discussed here. But it certainly solves one major issue: having updated content 😄

The documentation is at https://codeberg.org/forgejo/website/src/branch/main/src/pages/docs and is actively maintained. It is bare bones in terms of layout: this is almost 100% content, with just a URL to the source from which it is paired / sync when appropriate. That absolutely does not solve many of the issue discussed here. But it certainly solves one major issue: having updated content 😄
Sign in to join this conversation.
No Branch/Tag specified
main
renovate/mstruebing-editorconfig-checker-3.x
renovate/lycheeverse-lychee-0.x
renovate/markdownlint-cli2-0.x
renovate/markdown-it-14.x
renovate/davidanson-markdownlint-cli2-0.x
renovate/node-lts-slim
renovate/npm-pnpm-vulnerability
ci_pr_close_no_preview
pr-554
pr/554
gitea-icons-shortcode
No results found.
Labels
Clear labels
Codeberg Pages
Issues affecting Codeberg Pages
Documentation Usability
Issues related to using and reading docs.codeberg.org
Forgejo
Good First Issue! 👋
Kind: Bug
Kind: Documentation
Kind: Enhancement
Kind: Feature
Kind: Question
Kind: Security
Licensing
Part: Generator
This is related to the generation of the documentation, not to the content itself
Priority: High
The priority is high
Priority: Low
The priority is low
Priority: Medium
The priority is medium
Reviewed: Confirmed
Something has been confirmed
Reviewed: Duplicate
Something exists already
Reviewed: Invalid
Something was marked as invalid
Reviewed: Wontfix
Something won't be fixed
Status: Blocked
Status: Help wanted
Contributions are welcome!
Status: In progress
Work is in progress
Status: Needs feedback
Feedback is needed
Status: Ready for Review
Work is completed
Status: Review
Review is in progress / Reviewers wanted
Status: Stale
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
5 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
Codeberg/Documentation#277
Reference in a new issue
Codeberg/Documentation
No description provided.
Delete branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?