Skip to content

Commit

Permalink
Revert "Clearn up remaining 22.12 to 23.11 version changes."
Browse files Browse the repository at this point in the history
23.11 changes belong in the staging branch, not main where they will be
automatically deployed to the live site used for 22.12.

This reverts commit 4080d95.
  • Loading branch information
jrtc27 committed Nov 7, 2023
1 parent 4080d95 commit c706374
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
<!--
NOTE: A release version is also in README.md.
-->
[Current release: 23.11]()
[Current release: 22.12]()
2 changes: 1 addition & 1 deletion src/downloading/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ Images are compressed using the UNIX `xz` command, and must be decompressed
before they can be used; for example by running:

```
unxz cheribsd-memstick-arm64-aarch64c-23.11.img.xz
unxz cheribsd-memstick-arm64-aarch64c-22.12.img.xz
````
2 changes: 1 addition & 1 deletion src/features/c18n.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ CHERI-enabled software compartmentalization models:
within a process using CHERI capabilities limiting the access of attackers
who have achieved arbitrary code execution within a library.
Initial support for linker-based library compartmentalization is included
in the 23.11 release of CheriBSD. See the compartmentalization(7) manual
in the 22.12 release of CheriBSD. See the compartmentalization(7) manual
page on an installed system for more information.
2 changes: 1 addition & 1 deletion src/features/desktop.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CheriABI desktop environment (experimental)

As of the 23.11 release, the installer has gained the option to install a
As of the 22.12 release, the installer has gained the option to install a
desktop environment using the Mali Bifrost GPU on the Morello System-on-Chip.
The option installs a basic desktop environment using KDE and Wayland
compiled for CheriABI with the `cheri-desktop` package. It also
Expand Down
2 changes: 1 addition & 1 deletion src/morello-install/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ following command would write the image to a USB stick for use with a Morello
board:

```
dd if=cheribsd-memstick-arm64-aarch64c-23.11.img of=/dev/DISK bs=1048576
dd if=cheribsd-memstick-arm64-aarch64c-22.12.img of=/dev/DISK bs=1048576
```

It is also possible to write a live image to a USB stick, with appropriate
Expand Down
2 changes: 1 addition & 1 deletion src/nonfeatures/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Many other kernel features are not yet well validated, including:

## Alpha ZFS support

The 23.11 release includes Alpha support for the ZFS file system. It is
The 22.12 release includes Alpha support for the ZFS file system. It is
lightly tested, but works without known issues with a hybrid kernel. With
the pure capability kernel, filesystems can be created and used, but it must
not be the root file system as it currently hangs on boot.
Expand Down
2 changes: 1 addition & 1 deletion src/packages/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ They have different levels of completeness, maturity, security, and support.
extends FreeBSD ports, a collection of over 30,000 third-party
software adaptations to FreeBSD, with CHERI- and CheriBSD-specific patches.
The
[releng/23.11](https://github.com/CTSRD-CHERI/cheribsd-ports/tree/releng/23.11)
[releng/22.12](https://github.com/CTSRD-CHERI/cheribsd-ports/tree/releng/22.12)
CheriBSD ports branch contains ports matching the packages built for the current
release.

Expand Down

0 comments on commit c706374

Please sign in to comment.