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

Update Documentation #2008

Merged
merged 25 commits into from
Nov 8, 2023
Merged

Conversation

AlvinSchiller
Copy link
Collaborator

@AlvinSchiller AlvinSchiller commented Apr 4, 2023

I started to update / harmonise the documentation.
This includes the source and the wiki repo.
Renamings have been made in both (if existing).

As the wiki repo does not support Branches or PullRequest the dev state can be seen here:
Git: https://github.com/AlvinSchiller/RPi-Jukebox-RFID.wiki.git
Wiki: https://github.com/AlvinSchiller/RPi-Jukebox-RFID/wiki

The change includes:

  • Move docs from source repo to wiki
  • Update deprecated RPi OS distro names (and even remove in places where not neccessary -> see Question 'file renaming')
  • Harmonise installation guide (e.g. links to RPi OS Images, Image flashing, etc...)
  • Fix / remove links to deprecated docs / installscripts

Questions

  • Some files will better be renamed, but this would break links in existing issues / discussions / branches (e.g. master).
    Should the old files persist and only link to the new ones, or is this acceptable?

@AlvinSchiller
Copy link
Collaborator Author

@s-martin Before i continue and deep dive is this desirable? And are there maybe other edge cases that have to be considered?

@s-martin
Copy link
Collaborator

s-martin commented Apr 28, 2023

Hi, sorry for the late reply.

Thanks for making the effort. From my point of view it absolutely makes sense.

Future3 already has a thorough Sphinx / readthedocs documentation, but I think V2 needs some polishing!

Nevertheless I would keep the components docs in the repo as this is often installed optionally and it’s important to keep the source code and the docs in sync.

But the general docs could reside in the wiki.

@AlvinSchiller
Copy link
Collaborator Author

Nevertheless I would keep the components docs in the repo as this is often installed optionally and it’s important to keep the source code and the docs in sync.

Totally agree. I didn't want to move the component docs at all (or others directly bound to some elements). Helped me a few times already :)

Questions
* Some files will better be renamed, but this would break links in existing issues / discussions / branches (e.g. master).
Should the old files persist and only link to the new ones, or is this acceptable?

What would be your prefered way with the general docs? Delete the files or keep it and redirect?

@AlvinSchiller AlvinSchiller marked this pull request as ready for review May 8, 2023 01:14
@AlvinSchiller
Copy link
Collaborator Author

AlvinSchiller commented May 8, 2023

To merge the changes in the wiki repo:

a. Simple commandline:

b. To Merge with a prefered tool (like VS Code, ...):

  • clone the original wiki from: https://github.com/MiczFlor/RPi-Jukebox-RFID.wiki.git
  • add my wiki repo as a new remote 'AlvinSchiller': git remote add AlvinSchiller https://github.com/AlvinSchiller/RPi-Jukebox-RFID.wiki.git
  • git fetch --all
  • use the tool to pull / merge / rebase the changes from my wiki repo master branch
  • push to "origin"

@AlvinSchiller AlvinSchiller mentioned this pull request May 8, 2023
6 tasks
@AlvinSchiller
Copy link
Collaborator Author

AlvinSchiller commented May 8, 2023

@s-martin @pabera
I saw that the gitter links are not valid anymore (404).
As gitter seems to be transformed to matrix should the links be deleted? Or create a matrix channel alternatively?

@pabera
Copy link
Collaborator

pabera commented May 8, 2023

As gitter seems to be transformed to matrix should the links be deleted? Or create a matrix channel alternatively?

Sounds like a good idea. We already have a Matrix Channel

@AlvinSchiller
Copy link
Collaborator Author

AlvinSchiller commented May 8, 2023

Ok, I looked a little further and apparently the gitter room is still available at https://matrix.to/#/#phoniebox_community:gitter.im

So the URL should probably just be updated.

@coveralls
Copy link

coveralls commented May 15, 2023

Pull Request Test Coverage Report for Build 6804771841

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 7 unchanged lines in 1 file lost coverage.
  • Overall coverage remained the same at 76.82%

Files with Coverage Reduction New Missed Lines %
GPIODevices/rotary_encoder.py 7 86.59%
Totals Coverage Status
Change from base Build 6804326855: 0.0%
Covered Lines: 633
Relevant Lines: 824

💛 - Coveralls

@pabera
Copy link
Collaborator

pabera commented Aug 14, 2023

Should this be merged at some point?

@AlvinSchiller
Copy link
Collaborator Author

My wiki repo has been rebased on the latest changes.

@AlvinSchiller
Copy link
Collaborator Author

Raspberry Pi OS Bookworm was released a few days ago, which brings buster in oldoldstable state and also updates the imager software, so new flashes will most likely use bullseye (as the last issues/questions also show).

As there seem to be no bigger issues with bullseye, I would update the docs again to strip out Debian version names as much as possible, and would replace the bullseye warning on the installation page, with a warning that bookworm is currently not supported (#2084).

Any concerns about breaking links with renaming wiki headers or the like?

@AlvinSchiller
Copy link
Collaborator Author

AlvinSchiller commented Oct 24, 2023

Also are there any known issues with 64bit in 2.x?
This is currently stated as unsupported in the docs but a lot users seem to use it.

@s-martin
Copy link
Collaborator

s-martin commented Oct 24, 2023

I think it’s ok to update the names and the links.

I remember some issues reported, which were supposedly caused by 64bit, but right now I’m not sure, if 64 bit is really unsupported.
@pabera were the 64 bit issues regarding future3?

@pabera
Copy link
Collaborator

pabera commented Oct 30, 2023

I think it’s ok to update the names and the links.

I remember some issues reported, which were supposedly caused by 64bit, but right now I’m not sure, if 64 bit is really unsupported. @pabera were the 64 bit issues regarding future3?

It's not super supported at the moment. At the other side, I have not really tested it either. with 32bit, we are safe for now.

pabera@99a5536

@s-martin
Copy link
Collaborator

s-martin commented Nov 8, 2023

I think we could merge this, after the conflicts have been solved.

@s-martin s-martin added this to the 2.5 milestone Nov 8, 2023
@s-martin s-martin merged commit 0457616 into MiczFlor:develop Nov 8, 2023
23 of 25 checks passed
@AlvinSchiller
Copy link
Collaborator Author

@s-martin I rebased the wiki repo with the latest changes as well. Should i push it now or are you on it?

@s-martin
Copy link
Collaborator

s-martin commented Nov 8, 2023

Please push it

@AlvinSchiller
Copy link
Collaborator Author

AlvinSchiller commented Nov 8, 2023

Please push it

@s-martin I dont have the needed write rights to push to the wiki :(

@AlvinSchiller AlvinSchiller deleted the fix/documentation branch November 8, 2023 23:41
@s-martin
Copy link
Collaborator

s-martin commented Nov 9, 2023

I assume you mean this way https://docs.github.com/en/communities/documenting-your-project-with-wikis/adding-or-editing-wiki-pages#adding-or-editing-wiki-pages-locally to push your changes?

I’ll look into it and then I will do it tonight or @MiczFlor grants you the rights and you can do it yourself - whatever happens first :)

N.B. I was today years old, when I learned that the wiki is just another git repo ;)

@AlvinSchiller
Copy link
Collaborator Author

AlvinSchiller commented Nov 9, 2023

HowTo is also here -> #2008 (comment)
;)

Just a note: due to some files containing invalid characters the checkout (and therefor the push) is currently not possible on Windows. After the changes have been applied this is not a problem anymore.

@s-martin
Copy link
Collaborator

s-martin commented Nov 9, 2023

ok, looks like i pushed the wiki successfully : )

@AlvinSchiller
Copy link
Collaborator Author

Yes, looks good :)

AlvinSchiller added a commit to AlvinSchiller/RPi-Jukebox-RFID that referenced this pull request Dec 21, 2023
* Renamed INSTALL-stretch.md to INSTALL.md

* Update links to 'one line installer'

* Moved and Merged UPGRADE.md to wiki

* Moved INSTALL-COMPLETE-GUIDE.md to wiki

* Moved PHONIEBOX_ReadOnly to wiki

* Removed unused images (contained in the wiki)

* Update link to the english phoniebox website
set https for phoniebox.de URL

* Updated dead links

* fix branch aware link

* fix doc: default to master branch

* fixed gitter links. Added matrix badge

* Updated gitter badge. better image resolution

* change occurences of "buster" in comments and docs

* renamed var DEBIAN_VERSION_NAME to DEBIAN_CODENAME

* change occurences of "buster" in docs.

* harmonized spelling of 'Raspberry Pi OS'

* renamed DEBIAN_VERSION_NAME to DEBIAN_CODENAME
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.

4 participants