Page MenuHomeFreeBSD

Release Information: corrections and updates; home, sidebars: release: remove 13.0, add 14.0
ClosedPublic

Authored by grahamperrin on Sep 10 2022, 8:02 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Oct 31, 2:15 AM
Unknown Object (File)
Tue, Oct 29, 12:26 PM
Unknown Object (File)
Tue, Oct 29, 12:26 PM
Unknown Object (File)
Tue, Oct 29, 12:26 PM
Unknown Object (File)
Tue, Oct 29, 12:22 PM
Unknown Object (File)
Tue, Oct 29, 12:11 PM
Unknown Object (File)
Wed, Oct 16, 11:30 AM
Unknown Object (File)
Tue, Oct 15, 7:35 AM
Subscribers

Details

Summary

13.0 is end of life, 14.0-RELEASE is scheduled.

This review addresses:

Test Plan

Reviewers here are initially my mentors, plus the releng group.

https://github.com/freebsd/freebsd-doc/compare/main...grahamperrin:freebsd-doc:patch-2 was OK'd in principle by @gjb a few days ago; today I added an edition of website/content/en/releases/_index.adoc (for bug 266094) then produced the diff for this review.

Diff Detail

Repository
R9 FreeBSD doc repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

grahamperrin created this revision.

I just noticed, the 13.0 section at https://www.freebsd.org/where/#download-rel130 must be removed.

Would reviewers like a broader diff, to include an edition of website/content/en/where.adoc? Or continue as is, then a separate review for Download FreeBSD a.k.a Get FreeBSD?

Approved.
Commit it please. We will handle the rest in another review, but go ahead with this one.

This revision is now accepted and ready to land.Sep 10 2022, 9:17 PM

Mirroring:

Notes to self, abridged:

% git -C /usr/doc apply /tmp/D36520.diff
% git status
On branch main
Your branch is up to date with 'origin/main'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   shared/releases.adoc
        modified:   website/content/en/releases/_index.adoc
        modified:   website/themes/beastie/layouts/index.html

no changes added to commit (use "git add" and/or "git commit -a")
% git -C /usr/doc add .

% 
% git status
On branch main
Your branch is up to date with 'origin/main'.

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   shared/releases.adoc
        modified:   website/content/en/releases/_index.adoc
        modified:   website/themes/beastie/layouts/index.html

% git -C /usr/doc commit -a
[main b1fcdc9515] home, sidebars, /releases/: updates, corrections
 3 files changed, 44 insertions(+), 21 deletions(-)
% git -C /usr/doc push freebsd HEAD:main
Enter passphrase for key '/home/grahamperrin/.ssh/id_rsa': 
Enumerating objects: 25, done.
Counting objects: 100% (25/25), done.
Delta compression using up to 4 threads
Compressing objects: 100% (12/12), done.
Writing objects: 100% (13/13), 1.68 KiB | 1.68 MiB/s, done.
Total 13 (delta 11), reused 0 (delta 0), pack-reused 0
To repo.freebsd.org:doc.git
   7365cde48d..b1fcdc9515  HEAD -> main
% git branch
* main
  patch-1
  patch-2
  patch-7
% git -C /usr/doc branch -d patch-2
error: The branch 'patch-2' is not fully merged.
If you are sure you want to delete it, run 'git branch -D patch-2'.
% git -C /usr/doc branch -D patch-2
Deleted branch patch-2 (was d8e242131a).
% rm /tmp/D36520.diff 
% git -C /usr/doc config --list | sort
branch.main.merge=refs/heads/main
branch.main.remote=origin
branch.patch-1.merge=refs/heads/patch-1
branch.patch-1.remote=origin
branch.patch-7.merge=refs/heads/patch-7
branch.patch-7.remote=origin
core.bare=false
core.filemode=true
core.logallrefupdates=true
core.repositoryformatversion=0
remote.freebsd.fetch=+refs/heads/*:refs/remotes/freebsd/*
remote.freebsd.fetch=+refs/notes/*:refs/notes/*
remote.freebsd.pushurl=git@repo.freebsd.org:doc.git
remote.freebsd.url=https://git.freebsd.org/doc.git
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.gh-resolved=base
remote.origin.url=https://github.com/grahamperrin/freebsd-doc.git
remote.upstream.fetch=+refs/heads/main:refs/remotes/upstream/main
remote.upstream.url=https://github.com/freebsd/freebsd-doc.git
safe.directory=/usr/doc
user.email=grahamperrin@FreeBSD.org
user.name=Graham Perrin
%
website/content/en/releases/_index.adoc
34

Incidentally, if I recall correctly, this is the line that required removal of a trailing whitespace (below), although I see nothing trailing here.

From my transcript of the commit session:

% git -C /usr/doc apply /tmp/D36520.diff 
/tmp/D36520.diff:76: trailing whitespace.
Production: 
warning: 1 line adds whitespace errors.
% nano /tmp/D36520.diff 
%

website/themes/beastie/layouts/partials/sidenav.html was omitted. Fixed by D36676.