status: 2023q1: drm-drivers: corrections, suggestions

[grahamperrin]

One correction to spelling, add a missing word, minor adjustments to grammar.

Whilst here: a handful of other suggestions.

[lsalvadore]

Approved by the status team, once you have decided if mentioning 13.1 or not.

[grahamperrin]

Thanks.

I have this now amongst local commits, I'll not push to freebsd main until after the 13.2-related doc slush ends.

% git -C /usr/doc log -n 2 --oneline 
d4f7257766 (HEAD -> main) Porter's Handbook: wildcard arch, arch-neutral
af41f05cfc status: 2023q1: drm-drivers: minor changes
% 

[lsalvadore]

@grahamperrin: I am fine with you waiting to push this as long as it does not slow down the status reports publication. For now, as you know, we are still waiting some reports and working on some submissions, so there is no hurry.

However, please let me encourage you to play a bit with git, in particular with git branch, git cherry-pick and git reset. For example, in this case, you can push af41f05cfc without pushing d4f7257766 by doing the following:

• create a duplicate of your main branch with git branch duplicate main (the duplicate branch will be named duplicate);
• checkout your main branch with git checkout main (in case you have not already checked out it);
• hard reset you main branch to the commit that preceds af41f05cfc with git reset --hard af41f05cfc;
• cherry-pick the commit for this pull request with git cherry-pick af41f05cfc;
• push the change with git push;
• put back d4f7257766 in your main branch with git cherry-pick d4f7257766.

In general, I suggest you use a new branch for each change and use your main branch to track upstream only. Once a change is ready in some branch, then you cherry-pick it in your main branch and push. (For changes that need more commits in the same branch, you would need to play with git rebase and git merge, but I guess this is not needed much in doc.)

You should be safe experimenting with git as long as you ensure the two following conditions are always satisfied:

• whenever you use git reset or some other command that drops commits you still have the same commits in another backup branch;
• whenever you git push you check carefully what you are actually pushing.

[grahamperrin]

… I'll not push to freebsd main until after the 13.2-related doc slush ends. …

Through trying to work with branches with git at the command line, I ended up with

• two commits pushed too soon
• the one commit that I did want pushed, not pushed.

For now, I prefer to not discuss command-line use.

[lsalvadore]

Thanks @grahamperrin for the commit and if you ever want want or need to train your git skills feel free to ask me for help if you want. You might also want to consider creating a new git repository completely unrelated to FreeBSD and fully in your control to practice with extra safety.