Members: 
	tutorials/kerberos_realm.mdwn:1.14->1.15 

Index: wikisrc/tutorials/kerberos_realm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_realm.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 02:09:32 -0000	1.14
+++ wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 02:10:44 -0000	1.15
@@ -112,24 +112,24 @@
    admin access, and [[!template id=man name="kpasswdd" section="8"]]
    for remote password changes.**
 
-   (a) Extract keys into the keytab at /etc/krb5.keytab for
-       [[!template id=man name="kadmind" section="8"]] and
-       [[!template id=man name="kpasswdd" section="8"]]:
+   1. Extract keys into the keytab at /etc/krb5.keytab for
+      [[!template id=man name="kadmind" section="8"]] and
+      [[!template id=man name="kpasswdd" section="8"]]:
 
-       [[!template id=programlisting text="""
+      [[!template id=programlisting text="""
 # kadmin -l ext kadmin/admin@EXAMPLE.COM
 # kadmin -l ext kadmin/changepw@EXAMPLE.COM
 """]]
 
-   (a) Create an access control list for admins:
+   1. Create an access control list for admins:
 
-       [[!template id=filecontent name="/var/heimdal/kadmind.acl" text="""
+      [[!template id=filecontent name="/var/heimdal/kadmind.acl" text="""
 jruser/admin@EXAMPLE.COM        all,get-keys
 """]]
 
-   (a) Add entries to /etc/inetd.conf for the services:
+   1. Add entries to /etc/inetd.conf for the services:
 
-       [[!template id=filecontent name="/etc/inetd.conf" text="""
+      [[!template id=filecontent name="/etc/inetd.conf" text="""
 # service       type    proto   wait    user    program                 argv
 kerberos-adm    stream  tcp     nowait  root    /usr/libexec/kadmind    kadmind
 kerberos-adm    stream  tcp6    nowait  root    /usr/libexec/kadmind    kadmind
@@ -137,10 +137,10 @@
 kpasswd         dgram   udp6    wait    root    /usr/libexec/kpasswdd   kpasswdd
 """]]
 
-   (a) Reboot or tell [[!template id=man name="inetd" section="8"]] to
-       reload /etc/inetd.conf:
+   1. Reboot or tell [[!template id=man name="inetd" section="8"]] to
+      reload /etc/inetd.conf:
 
-       [[!template id=programlisting text="""
+      [[!template id=programlisting text="""
 # service inetd reload
 """]]
 

Index: wikisrc/tutorials/kerberos_realm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_realm.mdwn,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 02:08:10 -0000	1.13
+++ wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 02:09:32 -0000	1.14
@@ -112,24 +112,24 @@
    admin access, and [[!template id=man name="kpasswdd" section="8"]]
    for remote password changes.**
 
-   a. Extract keys into the keytab at /etc/krb5.keytab for
-      [[!template id=man name="kadmind" section="8"]] and
-      [[!template id=man name="kpasswdd" section="8"]]:
+   (a) Extract keys into the keytab at /etc/krb5.keytab for
+       [[!template id=man name="kadmind" section="8"]] and
+       [[!template id=man name="kpasswdd" section="8"]]:
 
-      [[!template id=programlisting text="""
+       [[!template id=programlisting text="""
 # kadmin -l ext kadmin/admin@EXAMPLE.COM
 # kadmin -l ext kadmin/changepw@EXAMPLE.COM
 """]]
 
-   a. Create an access control list for admins:
+   (a) Create an access control list for admins:
 
-      [[!template id=filecontent name="/var/heimdal/kadmind.acl" text="""
+       [[!template id=filecontent name="/var/heimdal/kadmind.acl" text="""
 jruser/admin@EXAMPLE.COM        all,get-keys
 """]]
 
-   a. Add entries to /etc/inetd.conf for the services:
+   (a) Add entries to /etc/inetd.conf for the services:
 
-      [[!template id=filecontent name="/etc/inetd.conf" text="""
+       [[!template id=filecontent name="/etc/inetd.conf" text="""
 # service       type    proto   wait    user    program                 argv
 kerberos-adm    stream  tcp     nowait  root    /usr/libexec/kadmind    kadmind
 kerberos-adm    stream  tcp6    nowait  root    /usr/libexec/kadmind    kadmind
@@ -137,10 +137,10 @@
 kpasswd         dgram   udp6    wait    root    /usr/libexec/kpasswdd   kpasswdd
 """]]
 
-   a. Reboot or tell [[!template id=man name="inetd" section="8"]] to
-      reload /etc/inetd.conf:
+   (a) Reboot or tell [[!template id=man name="inetd" section="8"]] to
+       reload /etc/inetd.conf:
 
-      [[!template id=programlisting text="""
+       [[!template id=programlisting text="""
 # service inetd reload
 """]]
 

Index: wikisrc/tutorials/kerberos_realm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_realm.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 02:05:38 -0000	1.12
+++ wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 02:08:10 -0000	1.13
@@ -112,7 +112,7 @@
    admin access, and [[!template id=man name="kpasswdd" section="8"]]
    for remote password changes.**
 
-   1. Extract keys into the keytab at /etc/krb5.keytab for
+   a. Extract keys into the keytab at /etc/krb5.keytab for
       [[!template id=man name="kadmind" section="8"]] and
       [[!template id=man name="kpasswdd" section="8"]]:
 
@@ -121,13 +121,13 @@
 # kadmin -l ext kadmin/changepw@EXAMPLE.COM
 """]]
 
-   1. Create an access control list for admins:
+   a. Create an access control list for admins:
 
       [[!template id=filecontent name="/var/heimdal/kadmind.acl" text="""
 jruser/admin@EXAMPLE.COM        all,get-keys
 """]]
 
-   1. Add entries to /etc/inetd.conf for the services:
+   a. Add entries to /etc/inetd.conf for the services:
 
       [[!template id=filecontent name="/etc/inetd.conf" text="""
 # service       type    proto   wait    user    program                 argv
@@ -137,7 +137,7 @@
 kpasswd         dgram   udp6    wait    root    /usr/libexec/kpasswdd   kpasswdd
 """]]
 
-   1. Reboot or tell [[!template id=man name="inetd" section="8"]] to
+   a. Reboot or tell [[!template id=man name="inetd" section="8"]] to
       reload /etc/inetd.conf:
 
       [[!template id=programlisting text="""

Index: wikisrc/tutorials/kerberos_realm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_realm.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 02:04:24 -0000	1.11
+++ wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 02:05:38 -0000	1.12
@@ -135,7 +135,7 @@
 kerberos-adm    stream  tcp6    nowait  root    /usr/libexec/kadmind    kadmind
 kpasswd         dgram   udp     wait    root    /usr/libexec/kpasswdd   kpasswdd
 kpasswd         dgram   udp6    wait    root    /usr/libexec/kpasswdd   kpasswdd
-"""]
+"""]]
 
    1. Reboot or tell [[!template id=man name="inetd" section="8"]] to
       reload /etc/inetd.conf:

Members: 
	tutorials/kerberos_realm.mdwn:1.10->1.11 

Index: wikisrc/tutorials/kerberos_realm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_realm.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 01:27:12 -0000	1.10
+++ wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 02:04:24 -0000	1.11
@@ -65,7 +65,7 @@
 # verify_krb5_conf /etc/krb5.conf
 """]]
 
-1. Initialize the KDC:
+1. **Initialize the KDC:**
 
    [[!template id=programlisting text="""
 # kadmin -l init EXAMPLE.COM
@@ -78,7 +78,7 @@
    This will create the database at the default location under
    `/var/heimdal`.
 
-1. Create a user principal and an admin principal.
+1. **Create a user principal and an admin principal.**
    We'll call the user `jruser` for J. Random User.
 
    [[!template id=programlisting text="""
@@ -90,12 +90,62 @@
 Verifying - jruser/admin@EXAMPLE.COM's Password: 
 """]]
 
-   The admin principal `jruser/admin@EXAMPLE.COM` has no intrinsic
-   connection to `jruser@EXAMPLE.COM` but by convention is chosen to be
-   authorized like a [[!template id=man name="su" section="1"]]-style
-   superuser version of `jruser` for administrative tasks with the help
-   of [[!template id=man name="kadmind" section="8"]].
+   The admin principal `jruser/admin@EXAMPLE.COM` is used by
+   [[!template id=man name="kadmin" section="8"]] for remote access via
+   [[!template id=man name="kadmind" section="8"]].  It need not have
+   the same password as `jruser@EXAMPLE.COM`.
+
+1. **Start up `kdc`, the KDC daemon.**
+   Enable it in /etc/rc.conf:
+
+   [[!template id=filecontent name="/etc/rc.conf" text="""
+kdc=YES
+"""]]
+
+   Then either reboot or start it explicitly:
+
+   [[!template id=programlisting text="""
+# service kdc start
+"""]]
+
+1. **Enable [[!template id=man name="kadmind" section="8"]] for remote
+   admin access, and [[!template id=man name="kpasswdd" section="8"]]
+   for remote password changes.**
+
+   1. Extract keys into the keytab at /etc/krb5.keytab for
+      [[!template id=man name="kadmind" section="8"]] and
+      [[!template id=man name="kpasswdd" section="8"]]:
+
+      [[!template id=programlisting text="""
+# kadmin -l ext kadmin/admin@EXAMPLE.COM
+# kadmin -l ext kadmin/changepw@EXAMPLE.COM
+"""]]
+
+   1. Create an access control list for admins:
+
+      [[!template id=filecontent name="/var/heimdal/kadmind.acl" text="""
+jruser/admin@EXAMPLE.COM        all,get-keys
+"""]]
+
+   1. Add entries to /etc/inetd.conf for the services:
+
+      [[!template id=filecontent name="/etc/inetd.conf" text="""
+# service       type    proto   wait    user    program                 argv
+kerberos-adm    stream  tcp     nowait  root    /usr/libexec/kadmind    kadmind
+kerberos-adm    stream  tcp6    nowait  root    /usr/libexec/kadmind    kadmind
+kpasswd         dgram   udp     wait    root    /usr/libexec/kpasswdd   kpasswdd
+kpasswd         dgram   udp6    wait    root    /usr/libexec/kpasswdd   kpasswdd
+"""]
+
+   1. Reboot or tell [[!template id=man name="inetd" section="8"]] to
+      reload /etc/inetd.conf:
+
+      [[!template id=programlisting text="""
+# service inetd reload
+"""]]
 
 Now you can do `kinit jruser@EXAMPLE.COM` for
-[[client-side single sign-on|tutorials/kerberos_client]], and set up
-[[kerberized services|tutorials/kerberos_services]]!
+[[client-side single sign-on|tutorials/kerberos_client]], use
+[[!template id=man name="kpasswd" section="1"]] to change your password
+or [[!template id=man name="kpasswd" section="8"]] administer the
+realm, and set up [[kerberized services|tutorials/kerberos_services]]!

Index: wikisrc/tutorials/kerberos_services.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_services.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/tutorials/kerberos_services.mdwn	19 Jul 2026 01:38:41 -0000	1.11
+++ wikisrc/tutorials/kerberos_services.mdwn	19 Jul 2026 01:40:56 -0000	1.12
@@ -155,7 +155,7 @@
    `queue_directory`, matches the `unix_listener` path in Dovecot's
    auth service.
 
-1. Create a `submission` (port 587, [[!rfc 6409]]) and/or `submissions`
+1. Create `submission` (port 587, [[!rfc 6409]]) and/or `submissions`
    (port 465, [[!rfc 8314]]) services in master.cf
    ([[!template id=man name="master" section="5"]]) to handle
    authenticated mail submission:

Index: wikisrc/tutorials/kerberos_services.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_services.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/tutorials/kerberos_services.mdwn	19 Jul 2026 01:37:17 -0000	1.10
+++ wikisrc/tutorials/kerberos_services.mdwn	19 Jul 2026 01:38:41 -0000	1.11
@@ -10,8 +10,8 @@
 The answer will vary from service to service, and may sometimes be
 phrased in terms of GSS-API, but it will always have three parts:
 
-1. Determine the service's principal name, based on the protocol, the
-   service's hostname, and the realm name.
+1. **Determine the service's principal name**, based on the protocol,
+   the service's hostname, and the realm name.
 
    For example, IMAP uses “imap/_hostname_” ([[!rfc 9051]], [IANA
    GSSAPI/Kerberos/SASL Service
@@ -21,10 +21,10 @@
    (or “imap/imap.example.com@EXAMPLE.COM” if fully qualified with a
    realm name).
 
-2. Get a key for the service principal from the Kerberos KDC using
-   [[!template id=man name="kadmin" section="8"]]:
-   first `kadmin add` to generate a key for the service principal, and
-   then `kadmin ext` to extract it into a keytab.
+2. **Get a keytab for the service principal** from the Kerberos KDC
+   using [[!template id=man name="kadmin" section="8"]]:
+   first `kadmin add` to generate a key for the service principal in
+   the KDC database, and then `kadmin ext` to extract it into a keytab.
 
    The key is a secret shared between the service and the KDC.
    Anyone who knows the key can spoof the service, so you must keep
@@ -39,7 +39,7 @@
    [[!template id=man name="kadmin" section="8"]]
    remotely.
 
-3. Put the keytab in a file readable by the server software, for
+3. **Put the keytab in a file readable by the server software**, for
    example /usr/pkg/etc/dovecot/private/keytab, and point the software
    at the keytab and service principal name.
 

2. Fix smtpd_tls_security_level=encrypt option.  It's not
   smtpd_tls_security_level_encrypt=yes, which must have been a
   paste-o in previous editing.

Members: 
	tutorials/kerberos_services.mdwn:1.9->1.10 

Index: wikisrc/tutorials/kerberos_services.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_services.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/tutorials/kerberos_services.mdwn	19 Jul 2026 01:24:44 -0000	1.9
+++ wikisrc/tutorials/kerberos_services.mdwn	19 Jul 2026 01:37:17 -0000	1.10
@@ -155,19 +155,31 @@
    `queue_directory`, matches the `unix_listener` path in Dovecot's
    auth service.
 
-1. Create a `submission` (port 587) service in master.cf
-   ([[!template id=man name="master" section="5"]])
-   to handle authenticated mail submission ([[!rfc 6409]]):
+1. Create a `submission` (port 587, [[!rfc 6409]]) and/or `submissions`
+   (port 465, [[!rfc 8314]]) services in master.cf
+   ([[!template id=man name="master" section="5"]]) to handle
+   authenticated mail submission:
 
    [[!template id=filecontent name="/etc/postfix/master.cf" text="""
-# service  type private unpriv chroot wakeup maxproc command
-submission inet n       -      y      -      -       smtpd
-      -o smtpd_tls_security_level_encrypt=yes
+# service   type private unpriv chroot wakeup maxproc command
+submission  inet n       -      y      -      -       smtpd
+      -o smtpd_tls_security_level=encrypt
+      -o smtpd_sasl_auth_enable=yes
+      -o smtpd_client_restrictions=permit_sasl_authenticated,reject
+      -o local_header_rewrite_clients=permit_sasl_authenticated
+submissions inet n       -      y      -      -       smtpd
+      -o smtpd_tls_wrappermode=yes
       -o smtpd_sasl_auth_enable=yes
       -o smtpd_client_restrictions=permit_sasl_authenticated,reject
       -o local_header_rewrite_clients=permit_sasl_authenticated
 """]]
 
+   The difference between `submission`/587 and `submissions`/465 is
+   that `submission`/587 starts as plaintext, and is configured to
+   require a STARTTLS command to start the TLS session, whereas
+   `submissions`/465 starts immediately with a TLS session.  Most mail
+   clients will support both.
+
    You may also want to set options `smtpd_sender_login_maps` and
    `smtpd_sender_restrictions` to restrict senders to submit
    `MAIL FROM` envelope addresses that match their login names.

Index: wikisrc/tutorials/kerberos_realm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_realm.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 01:24:44 -0000	1.9
+++ wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 01:27:12 -0000	1.10
@@ -25,8 +25,8 @@
 
    [[!template id=filecontent name="example.com zonefile" text="""
 ; name           ttl     class   type    rrdata
-_kerberos        300     IN      TXT     "EXAMPLE.COM"
-_kerberos._tcp   300     IN      SRV     1 0 88 kdc
+\_kerberos        300     IN      TXT     "EXAMPLE.COM"
+\_kerberos._tcp   300     IN      SRV     1 0 88 kdc
 """]]
 
    For access to services under `example.com`, clients will consult

> 1. foo bar
>
>    [[!template id="filecontent" file="/etc/foo.conf" text="""
> [section]
>         foo = bar
> """]]

The indented line with eight spaces of indentation is rendered with
only five, because the current indentation level in the surrounding
text has three-space indentation.

So, _for lines with leading spaces_, add as much space as the current
indentation level has.

Members: 
	tutorials/kerberos_client.mdwn:1.10->1.11 
	tutorials/kerberos_realm.mdwn:1.8->1.9 
	tutorials/kerberos_services.mdwn:1.8->1.9 

Index: wikisrc/tutorials/kerberos_client.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_client.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/tutorials/kerberos_client.mdwn	19 Jul 2026 01:19:19 -0000	1.10
+++ wikisrc/tutorials/kerberos_client.mdwn	19 Jul 2026 01:24:44 -0000	1.11
@@ -9,7 +9,7 @@
 
    [[!template id=filecontent name="~/.krb5/config" text="""
 [libdefaults]
-        name_canon_rules = as-is:
+           name_canon_rules = as-is:
 """]]
 
 1. Get a ticket:
@@ -41,7 +41,7 @@
 
   [[!template id=filecontent name="~/.krb5/config" text="""
 [libdefaults]
-        name_canon_rules = nss:match_realm=EXAMPLE.COM
+          name_canon_rules = nss:match_realm=EXAMPLE.COM
 """]]
 
   See [[!template id=man name="krb5.conf" section="5"]] for more
@@ -57,12 +57,12 @@
 
      [[!template id=filecontent name="~/.krb5/config" text="""
 [libdefaults]
-        dns_lookup_realm = false
+             dns_lookup_realm = false
 [domain_realm]
-        example.com = EXAMPLE.COM
-        .example.com = EXAMPLE.COM
-        evil.net = EVIL.NET
-        .evil.net = EVIL.NET
+             example.com = EXAMPLE.COM
+             .example.com = EXAMPLE.COM
+             evil.net = EVIL.NET
+             .evil.net = EVIL.NET
 """]]
 
      The entry for example.com matches just example.com directly, and
@@ -145,8 +145,8 @@
 
    [[!template id=filecontent name="~/.krb5/config" text="""
 [libdefaults]
-        default_realm = EXAMPLE.COM
-        name_canon_rules = as-is:
+           default_realm = EXAMPLE.COM
+           name_canon_rules = as-is:
 """]]
 
 1. Uncomment the pam_krb5.so lines
Index: wikisrc/tutorials/kerberos_realm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_realm.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 01:19:19 -0000	1.8
+++ wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 01:24:44 -0000	1.9
@@ -51,12 +51,12 @@
 
    [[!template id=filecontent name="/etc/krb5.conf" text="""
 [libdefaults]
-        default_realm = EXAMPLE.COM
-        name_canon_rules = as-is:
+           default_realm = EXAMPLE.COM
+           name_canon_rules = as-is:
 [kdc]
-        # Prevent UDP amplification by not listening on UDP:
-        # https://github.com/heimdal/heimdal/issues/1216
-        ports = kerberos/tcp
+           # Prevent UDP amplification by not listening on UDP:
+           # https://github.com/heimdal/heimdal/issues/1216
+           ports = kerberos/tcp
 """]]
 
    Check it by running:
Index: wikisrc/tutorials/kerberos_services.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_services.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/tutorials/kerberos_services.mdwn	19 Jul 2026 01:06:25 -0000	1.8
+++ wikisrc/tutorials/kerberos_services.mdwn	19 Jul 2026 01:24:44 -0000	1.9
@@ -79,14 +79,14 @@
 
    [[!template id=programlisting text="""
 # kadmin add --random-key --max-ticket-life=unlimited \
-    --max-renewable-life=unlimited --use-defaults \
-    imap/imap.example.com
+       --max-renewable-life=unlimited --use-defaults \
+       imap/imap.example.com
 # kadmin add --random-key --max-ticket-life=unlimited \
-    --max-renewable-life=unlimited --use-defaults \
-    pop/pop.example.com
+       --max-renewable-life=unlimited --use-defaults \
+       pop/pop.example.com
 # kadmin add --random-key --max-ticket-life=unlimited \
-    --max-renewable-life=unlimited --use-defaults \
-    smtp/mail.example.com
+       --max-renewable-life=unlimited --use-defaults \
+       smtp/mail.example.com
 # mkdir -m 0700 /usr/pkg/etc/dovecot/private
 # cd /usr/pkg/etc/dovecot/private
 # kadmin ext -k keytab imap/imap.example.com
@@ -162,10 +162,10 @@
    [[!template id=filecontent name="/etc/postfix/master.cf" text="""
 # service  type private unpriv chroot wakeup maxproc command
 submission inet n       -      y      -      -       smtpd
-   -o smtpd_tls_security_level_encrypt=yes
-   -o smtpd_sasl_auth_enable=yes
-   -o smtpd_client_restrictions=permit_sasl_authenticated,reject
-   -o local_header_rewrite_clients=permit_sasl_authenticated
+      -o smtpd_tls_security_level_encrypt=yes
+      -o smtpd_sasl_auth_enable=yes
+      -o smtpd_client_restrictions=permit_sasl_authenticated,reject
+      -o local_header_rewrite_clients=permit_sasl_authenticated
 """]]
 
    You may also want to set options `smtpd_sender_login_maps` and

Members: 
	tutorials/kerberos_client.mdwn:1.9->1.10 
	tutorials/kerberos_realm.mdwn:1.7->1.8 

Index: wikisrc/tutorials/kerberos_client.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_client.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/tutorials/kerberos_client.mdwn	19 Jul 2026 01:06:25 -0000	1.9
+++ wikisrc/tutorials/kerberos_client.mdwn	19 Jul 2026 01:19:19 -0000	1.10
@@ -9,7 +9,7 @@
 
    [[!template id=filecontent name="~/.krb5/config" text="""
 [libdefaults]
-	name_canon_rules = as-is:
+        name_canon_rules = as-is:
 """]]
 
 1. Get a ticket:
@@ -41,7 +41,7 @@
 
   [[!template id=filecontent name="~/.krb5/config" text="""
 [libdefaults]
-	name_canon_rules = nss:match_realm=EXAMPLE.COM
+        name_canon_rules = nss:match_realm=EXAMPLE.COM
 """]]
 
   See [[!template id=man name="krb5.conf" section="5"]] for more
@@ -57,13 +57,12 @@
 
      [[!template id=filecontent name="~/.krb5/config" text="""
 [libdefaults]
-	dns_lookup_realm = false
-
+        dns_lookup_realm = false
 [domain_realm]
-	example.com = EXAMPLE.COM
-	.example.com = EXAMPLE.COM
-	evil.net = EVIL.NET
-	.evil.net = EVIL.NET
+        example.com = EXAMPLE.COM
+        .example.com = EXAMPLE.COM
+        evil.net = EVIL.NET
+        .evil.net = EVIL.NET
 """]]
 
      The entry for example.com matches just example.com directly, and
@@ -92,7 +91,7 @@
 
 [[!template id=filecontent name="~/.ssh/config" text="""
 Match host *.example.com
-	GSSAPIAuthentication yes
+        GSSAPIAuthentication yes
 """]]
 
 Now log in to foo.example.com without a password!
@@ -103,8 +102,8 @@
 
 [[!template id=filecontent name="~/.ssh/config" text="""
 Match host *.example.com
-	GSSAPIAuthentication yes
-	GSSAPIDelegateCredentials yes
+        GSSAPIAuthentication yes
+        GSSAPIDelegateCredentials yes
 """]]
 
 Now run kerberized applications on foo.example.com through ssh without
@@ -146,8 +145,8 @@
 
    [[!template id=filecontent name="~/.krb5/config" text="""
 [libdefaults]
-	default_realm = EXAMPLE.COM
-	name_canon_rules = as-is:
+        default_realm = EXAMPLE.COM
+        name_canon_rules = as-is:
 """]]
 
 1. Uncomment the pam_krb5.so lines
Index: wikisrc/tutorials/kerberos_realm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_realm.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 01:06:25 -0000	1.7
+++ wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 01:19:19 -0000	1.8
@@ -51,12 +51,12 @@
 
    [[!template id=filecontent name="/etc/krb5.conf" text="""
 [libdefaults]
-	default_realm = EXAMPLE.COM
-	name_canon_rules = as-is:
+        default_realm = EXAMPLE.COM
+        name_canon_rules = as-is:
 [kdc]
-	# Prevent UDP amplification by not listening on UDP:
-	# https://github.com/heimdal/heimdal/issues/1216
-	ports = kerberos/tcp
+        # Prevent UDP amplification by not listening on UDP:
+        # https://github.com/heimdal/heimdal/issues/1216
+        ports = kerberos/tcp
 """]]
 
    Check it by running:

> 1. Create a directory ~/.krb5 and a file ~/.krb5/config with the
>    following content to enable Kerberos on the client side:
>
>    [[!template id=filecontent name="~/.krb5/config" text="""
> [libdefaults]
> 	name_canon_rules = as-is:
> """]]

with the HTML fragment:

--------8<---------
<ol>
<li><p>Create a directory ~/.krb5 and a file ~/.krb5/config with the
following content to enable Kerberos on the client side:</p>

<p><fieldset>
<legend>~/.krb5/config</legend></p></li>
</ol>


<pre>
[libdefaults]
    name_canon_rules = as-is:
</pre>


<p></fieldset></p>
-------->8---------

This is full of <p>...</p> around opening and closing tags, rather
than balanced elements, which I hypothesize happens because of the
line breaks in the template.

Members: 
	templates/filecontent.mdwn:1.3->1.4 

Index: wikisrc/templates/filecontent.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/templates/filecontent.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/templates/filecontent.mdwn	23 Mar 2024 18:33:22 -0000	1.3
+++ wikisrc/templates/filecontent.mdwn	19 Jul 2026 01:15:21 -0000	1.4
@@ -1,10 +1,5 @@
 [[!templatebody <<ENDBODY
-<fieldset>
-<legend><TMPL_VAR raw_name></legend>
-<pre>
-<TMPL_VAR raw_text>
-</pre>
-</fieldset>
+<fieldset><legend><TMPL_VAR raw_name></legend><pre><TMPL_VAR raw_text></pre></fieldset>
 ENDBODY]]
 
 ## Description

Index: wikisrc/tutorials/kerberos_client.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_client.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/tutorials/kerberos_client.mdwn	19 Jul 2026 01:00:18 -0000	1.8
+++ wikisrc/tutorials/kerberos_client.mdwn	19 Jul 2026 01:06:25 -0000	1.9
@@ -8,16 +8,16 @@
    following content to enable Kerberos on the client side:
 
    [[!template id=filecontent name="~/.krb5/config" text="""
-   [libdefaults]
-   	name_canon_rules = as-is:
-   """]]
+[libdefaults]
+	name_canon_rules = as-is:
+"""]]
 
 1. Get a ticket:
 
    [[!template id=programlisting text="""
-   $ kinit jruser@EXAMPLE.COM
-   jruser@EXAMPLE.COM's Password: 
-   """]]
+$ kinit jruser@EXAMPLE.COM
+jruser@EXAMPLE.COM's Password: 
+"""]]
 
 Now any kerberized applications such as ssh and Firefox can
 authenticate as jruser@EXAMPLE.COM on your behalf to services!
@@ -40,9 +40,9 @@
   realm:
 
   [[!template id=filecontent name="~/.krb5/config" text="""
-  [libdefaults]
-  	name_canon_rules = nss:match_realm=EXAMPLE.COM
-  """]]
+[libdefaults]
+	name_canon_rules = nss:match_realm=EXAMPLE.COM
+"""]]
 
   See [[!template id=man name="krb5.conf" section="5"]] for more
   information about the syntax of ~/.krb5/config.
@@ -56,15 +56,15 @@
      name-to-realm mapping:
 
      [[!template id=filecontent name="~/.krb5/config" text="""
-     [libdefaults]
-     	dns_lookup_realm = false
+[libdefaults]
+	dns_lookup_realm = false
 
-     [domain_realm]
-     	example.com = EXAMPLE.COM
-     	.example.com = EXAMPLE.COM
-     	evil.net = EVIL.NET
-     	.evil.net = EVIL.NET
-     """]]
+[domain_realm]
+	example.com = EXAMPLE.COM
+	.example.com = EXAMPLE.COM
+	evil.net = EVIL.NET
+	.evil.net = EVIL.NET
+"""]]
 
      The entry for example.com matches just example.com directly, and
      the entry for .example.com matches any subdomain one level under
@@ -76,9 +76,9 @@
      program:
 
      [[!template id=programlisting text="""
-     $ KRB5_CONFIG=$HOME/.krb5/config.example firefox &
-     $ KRB5_CONFIG=$HOME/.krb5/config.evil ssh foo.evil.net
-     """]]
+$ KRB5_CONFIG=$HOME/.krb5/config.example firefox &
+$ KRB5_CONFIG=$HOME/.krb5/config.evil ssh foo.evil.net
+"""]]
 
      Make sure to set `[libdefaults] dns_lookup_realm = false` in each
      config file too in this case.
@@ -145,10 +145,10 @@
    with the following content:
 
    [[!template id=filecontent name="~/.krb5/config" text="""
-   [libdefaults]
-   	default_realm = EXAMPLE.COM
-   	name_canon_rules = as-is:
-   """]]
+[libdefaults]
+	default_realm = EXAMPLE.COM
+	name_canon_rules = as-is:
+"""]]
 
 1. Uncomment the pam_krb5.so lines
    ([[!template id=man name="pam_krb5" section="8"]]) in
Index: wikisrc/tutorials/kerberos_realm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_realm.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 01:00:18 -0000	1.6
+++ wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 01:06:25 -0000	1.7
@@ -24,10 +24,10 @@
    it easier for users:
 
    [[!template id=filecontent name="example.com zonefile" text="""
-   ; name           ttl     class   type    rrdata
-   _kerberos        300     IN      TXT     "EXAMPLE.COM"
-   _kerberos._tcp   300     IN      SRV     1 0 88 kdc
-   """]]
+; name           ttl     class   type    rrdata
+_kerberos        300     IN      TXT     "EXAMPLE.COM"
+_kerberos._tcp   300     IN      SRV     1 0 88 kdc
+"""]]
 
    For access to services under `example.com`, clients will consult
    `_kerberos.example.com` TXT records to find the realm name—see
@@ -50,28 +50,28 @@
    content:
 
    [[!template id=filecontent name="/etc/krb5.conf" text="""
-   [libdefaults]
-   	default_realm = EXAMPLE.COM
-   	name_canon_rules = as-is:
-   [kdc]
-   	# Prevent UDP amplification by not listening on UDP:
-   	# https://github.com/heimdal/heimdal/issues/1216
-   	ports = kerberos/tcp
-   """]]
+[libdefaults]
+	default_realm = EXAMPLE.COM
+	name_canon_rules = as-is:
+[kdc]
+	# Prevent UDP amplification by not listening on UDP:
+	# https://github.com/heimdal/heimdal/issues/1216
+	ports = kerberos/tcp
+"""]]
 
    Check it by running:
 
    [[!template id=programlisting text="""
-   # verify_krb5_conf /etc/krb5.conf
-   """]]
+# verify_krb5_conf /etc/krb5.conf
+"""]]
 
 1. Initialize the KDC:
 
    [[!template id=programlisting text="""
-   # kadmin -l init EXAMPLE.COM
-   Realm max ticket life [unlimited]:
-   Realm max renewable ticket life [unlimited]:
-   """]]
+# kadmin -l init EXAMPLE.COM
+Realm max ticket life [unlimited]:
+Realm max renewable ticket life [unlimited]:
+"""]]
 
    Hit return when prompted to use the defaults.
 
@@ -82,13 +82,13 @@
    We'll call the user `jruser` for J. Random User.
 
    [[!template id=programlisting text="""
-   # kadmin -l add --use-defaults jruser
-   jruser@EXAMPLE.COM's Password: 
-   Verifying - jruser@EXAMPLE.COM's Password: 
-   # kadmin -l add --use-defaults jruser/admin
-   jruser/admin@EXAMPLE.COM's Password: 
-   Verifying - jruser/admin@EXAMPLE.COM's Password: 
-   """]]
+# kadmin -l add --use-defaults jruser
+jruser@EXAMPLE.COM's Password: 
+Verifying - jruser@EXAMPLE.COM's Password: 
+# kadmin -l add --use-defaults jruser/admin
+jruser/admin@EXAMPLE.COM's Password: 
+Verifying - jruser/admin@EXAMPLE.COM's Password: 
+"""]]
 
    The admin principal `jruser/admin@EXAMPLE.COM` has no intrinsic
    connection to `jruser@EXAMPLE.COM` but by convention is chosen to be
Index: wikisrc/tutorials/kerberos_services.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_services.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/tutorials/kerberos_services.mdwn	19 Jul 2026 01:00:18 -0000	1.7
+++ wikisrc/tutorials/kerberos_services.mdwn	19 Jul 2026 01:06:25 -0000	1.8
@@ -78,37 +78,37 @@
    keytab:
 
    [[!template id=programlisting text="""
-   # kadmin add --random-key --max-ticket-life=unlimited \
-       --max-renewable-life=unlimited --use-defaults \
-       imap/imap.example.com
-   # kadmin add --random-key --max-ticket-life=unlimited \
-       --max-renewable-life=unlimited --use-defaults \

(Diff truncated)

Members: 
	tutorials/kerberos_client.mdwn:1.7->1.8 
	tutorials/kerberos_realm.mdwn:1.5->1.6 
	tutorials/kerberos_services.mdwn:1.6->1.7 

Index: wikisrc/tutorials/kerberos_client.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_client.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/tutorials/kerberos_client.mdwn	23 Aug 2023 12:02:26 -0000	1.7
+++ wikisrc/tutorials/kerberos_client.mdwn	19 Jul 2026 01:00:18 -0000	1.8
@@ -7,13 +7,17 @@
 1. Create a directory ~/.krb5 and a file ~/.krb5/config with the
    following content to enable Kerberos on the client side:
 
-       [libdefaults]
-               name_canon_rules = as-is:
+   [[!template id=filecontent name="~/.krb5/config" text="""
+   [libdefaults]
+   	name_canon_rules = as-is:
+   """]]
 
 1. Get a ticket:
 
-       $ kinit jruser@EXAMPLE.COM
-       jruser@EXAMPLE.COM's Password: 
+   [[!template id=programlisting text="""
+   $ kinit jruser@EXAMPLE.COM
+   jruser@EXAMPLE.COM's Password: 
+   """]]
 
 Now any kerberized applications such as ssh and Firefox can
 authenticate as jruser@EXAMPLE.COM on your behalf to services!
@@ -35,8 +39,10 @@
   `[libdefaults]` section of ~/.krb5/config matching the EXAMPLE.COM
   realm:
 
-      [libdefaults]
-              name_canon_rules = nss:match_realm=EXAMPLE.COM
+  [[!template id=filecontent name="~/.krb5/config" text="""
+  [libdefaults]
+  	name_canon_rules = nss:match_realm=EXAMPLE.COM
+  """]]
 
   See [[!template id=man name="krb5.conf" section="5"]] for more
   information about the syntax of ~/.krb5/config.
@@ -49,14 +55,16 @@
      different domains to different realms, and disable DNS
      name-to-realm mapping:
 
-         [libdefaults]
-                 dns_lookup_realm = false
-
-         [domain_realm]
-                 example.com = EXAMPLE.COM
-                 .example.com = EXAMPLE.COM
-                 evil.net = EVIL.NET
-                 .evil.net = EVIL.NET
+     [[!template id=filecontent name="~/.krb5/config" text="""
+     [libdefaults]
+     	dns_lookup_realm = false
+
+     [domain_realm]
+     	example.com = EXAMPLE.COM
+     	.example.com = EXAMPLE.COM
+     	evil.net = EVIL.NET
+     	.evil.net = EVIL.NET
+     """]]
 
      The entry for example.com matches just example.com directly, and
      the entry for .example.com matches any subdomain one level under
@@ -67,8 +75,10 @@
      environment variable set to whichever one you want to use for that
      program:
 
-         $ KRB5_CONFIG=$HOME/.krb5/config.example firefox &
-         $ KRB5_CONFIG=$HOME/.krb5/config.evil ssh foo.evil.net
+     [[!template id=programlisting text="""
+     $ KRB5_CONFIG=$HOME/.krb5/config.example firefox &
+     $ KRB5_CONFIG=$HOME/.krb5/config.evil ssh foo.evil.net
+     """]]
 
      Make sure to set `[libdefaults] dns_lookup_realm = false` in each
      config file too in this case.
@@ -80,8 +90,10 @@
 following stanza to the end of ~/.ssh/config
 ([[!template id=man name="ssh_config" section="5"]]):
 
-    Match host *.example.com
-            GSSAPIAuthentication yes
+[[!template id=filecontent name="~/.ssh/config" text="""
+Match host *.example.com
+	GSSAPIAuthentication yes
+"""]]
 
 Now log in to foo.example.com without a password!
 
@@ -89,9 +101,11 @@
 authenticate to kerberized applications on the remote host, you can
 also forward your Kerberos tickets with:
 
-    Match host *.example.com
-            GSSAPIAuthentication yes
-            GSSAPIDelegateCredentials yes
+[[!template id=filecontent name="~/.ssh/config" text="""
+Match host *.example.com
+	GSSAPIAuthentication yes
+	GSSAPIDelegateCredentials yes
+"""]]
 
 Now run kerberized applications on foo.example.com through ssh without
 a password!
@@ -130,9 +144,11 @@
    ([[!template id=man name="krb5.conf" section="5"]])
    with the following content:
 
-       [libdefaults]
-               default_realm = EXAMPLE.COM
-               name_canon_rules = as-is:
+   [[!template id=filecontent name="~/.krb5/config" text="""
+   [libdefaults]
+   	default_realm = EXAMPLE.COM
+   	name_canon_rules = as-is:
+   """]]
 
 1. Uncomment the pam_krb5.so lines
    ([[!template id=man name="pam_krb5" section="8"]]) in
Index: wikisrc/tutorials/kerberos_realm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_realm.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/tutorials/kerberos_realm.mdwn	8 Oct 2023 18:55:59 -0000	1.5
+++ wikisrc/tutorials/kerberos_realm.mdwn	19 Jul 2026 01:00:18 -0000	1.6
@@ -7,37 +7,37 @@
 hostnames under example.com.
 How do you set it up?
 
-1. Pick a realm name.
+1. **Pick a realm name.**
    This is normally the uppercase version of your organization's domain
    name in the DNS, EXAMPLE.COM.
 
    _Note:_ Unlike DNS domain names, Kerberos realm names are
    case-sensitive.
 
-1. Pick a host to run the Kerberos Key Distribution Center, say
+1. **Pick a host to run the Kerberos Key Distribution Center**, say
    kdc.example.com.
 
-   Make sure TCP and/or UDP traffic to kdc.example.com goes to the
+   Make sure TCP traffic on port 88 to kdc.example.com goes to the
    host, in case it is behind a NAT or firewall or similar.
 
-1. To make it easier for users, create DNS records in the
-   example.com. zone:
+1. **Optional: Create DNS records** in the example.com. zone, to make
+   it easier for users:
 
-       ; name           ttl     class   type    rrdata
-       _kerberos        300     IN      TXT     "EXAMPLE.COM"
-       _kerberos._tcp   300     IN      SRV     1 0 88 kdc
-       _kerberos._udp   300     IN      SRV     1 0 88 kdc
+   [[!template id=filecontent name="example.com zonefile" text="""
+   ; name           ttl     class   type    rrdata
+   _kerberos        300     IN      TXT     "EXAMPLE.COM"
+   _kerberos._tcp   300     IN      SRV     1 0 88 kdc
+   """]]
 
    For access to services under `example.com`, clients will consult
-   `_kerberos.example.com` TXT records to find the realm name
-   (see `dns_lookup_realm` in
-   [[!template id=man name="krb5.conf" section="5"]])
+   `_kerberos.example.com` TXT records to find the realm name—see
+   `dns_lookup_realm` in
+   [[!template id=man name="krb5.conf" section="5"]].
 
    To find the KDC for the realm EXAMPLE.COM, clients and services will
-   consult `_kerberos._tcp.example.com` or `_kerberos._udp.example.com`
-   SRV records
-   (see `dns_lookup_kdc` in
-   [[!template id=man name="krb5.conf" section="5"]]).
+   consult `_kerberos._tcp.example.com` SRV records—see
+   `dns_lookup_kdc` in
+   [[!template id=man name="krb5.conf" section="5"]].
 
    If you don't set this up, you will need to distribute
    [[!template id=man name="krb5.conf" section="5"]] files to all users
@@ -46,21 +46,32 @@
    [[!template id=man name="krb5.conf" section="5"]] man page for
    details.
 
-1. On kdc.example.com, create /etc/krb5.conf with the following content:
+1. **On kdc.example.com, create /etc/krb5.conf** with the following
+   content:
 
-       [libdefaults]

(Diff truncated)

Members: 
	tutorials/how_to_use_snapshots.mdwn:1.9->1.10 

Index: wikisrc/tutorials/how_to_use_snapshots.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_use_snapshots.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/tutorials/how_to_use_snapshots.mdwn	7 Jul 2026 03:03:30 -0000	1.9
+++ wikisrc/tutorials/how_to_use_snapshots.mdwn	18 Jul 2026 23:15:50 -0000	1.10
@@ -48,9 +48,11 @@
 To create and mount a persistent snapshot of the `/home` file system,
 via `/dev/fss0`:
 
-    # fssconfig fss0 /home /home/.snap/20260706.store
-    # mkdir /home/.snap/20260706
-    # mount /dev/fss0 /home/.snap/20260706
+[[!template id=programlisting text="""
+# fssconfig fss0 /home /home/.snap/20260706.store
+# mkdir /home/.snap/20260706
+# mount /dev/fss0 /home/.snap/20260706
+"""]]
 
 Users can then browse their home directories in /home/.snap as they
 existed at the time the snapshot was taken.  There's nothing special
@@ -59,14 +61,18 @@
 
 The snapshot can be unmounted and unconfigured:
 
-    # umount /home/.snap/20260706
-    # fssconfig -u fss0
+[[!template id=programlisting text="""
+# umount /home/.snap/20260706
+# fssconfig -u fss0
+"""]]
 
 But the snapshot will persist at `/home/.snap/20260706.store`, even
 after a reboot, and can be configured and mounted again:
 
-    # fssconfig fss0 /home /home/.snap/20260706.store
-    # mount /dev/fss0 /home/.snap/20260706
+[[!template id=programlisting text="""
+# fssconfig fss0 /home /home/.snap/20260706.store
+# mount /dev/fss0 /home/.snap/20260706
+"""]]
 
 ### Example: Recovering from a snapshot
 
@@ -74,7 +80,9 @@
 use, e.g., rsync (pkgsrc [[!pkgsrc net/rsync desc="net/rsync"]]) to
 revert files back to what they were in the snapshot:
 
-    # rsync -aHc --delete /home/.snap/20260706/bofh/. /home/bofh/.
+[[!template id=programlisting text="""
+# rsync -aHc --delete /home/.snap/20260706/bofh/. /home/bofh/.
+"""]]
 
 It is better to use rsync rather than
 [[!template id=man name="tar" section="1"]] for this purpose, in order
@@ -88,9 +96,11 @@
 snapshot's backing store file to irrevocably discard it and free up any
 space it was using in the file system:
 
-    # umount /home/.snap/20260706
-    # fssconfig -u fss0
-    # rm /home/.snap/20260706
+[[!template id=programlisting text="""
+# umount /home/.snap/20260706
+# fssconfig -u fss0
+# rm /home/.snap/20260706
+"""]]
 
 ### Example: Single-use snapshot to take a backup
 
@@ -103,21 +113,25 @@
 For example, to take an anonymous persistent snapshot of the file
 system `/var` and mount it at `/var/.snapshot`:
 
-    # fssconfig fss3 /var /var/
-    # mkdir /var/.snapshot
-    # mount /dev/fss3 /var/.snapshot
+[[!template id=programlisting text="""
+# fssconfig fss3 /var /var/
+# mkdir /var/.snapshot
+# mount /dev/fss3 /var/.snapshot
+"""]]
 
 Then you can take a backup of `/var` from the snapshot with your
 favourite backup archiving tool:
 
-    # tar -C /var/.snapshot -cf - . | ...
-    # tarsnap -C /var/.snapshot -cf var-20260706 .
-    # (cd /var/.snapshot && \
-          borg create borghost:/path/to/repo::var-20260706 .)
-    # ssh rsynchost mkdir /backups/$(hostname)/var/20260706 &&
-      rsync -aHc --link-dest=/backups/$(hostname)/var/latest/. \
-          /var/.snapshot/. rsynchost:/backups/$(hostname)/var/. &&
-      ssh rsynchost ln -sfn 20260706 /backups/$(hostname)/var/latest
+[[!template id=programlisting text="""
+# tar -C /var/.snapshot -cf - . | ...
+# tarsnap -C /var/.snapshot -cf var-20260706 .
+# (cd /var/.snapshot && \
+      borg create borghost:/path/to/repo::var-20260706 .)
+# ssh rsynchost mkdir /backups/$(hostname)/var/20260706 &&
+  rsync -aHc --link-dest=/backups/$(hostname)/var/latest/. \
+      /var/.snapshot/. rsynchost:/backups/$(hostname)/var/. &&
+  ssh rsynchost ln -sfn 20260706 /backups/$(hostname)/var/latest
+"""]]
 
 (Note that if you use [[!template id=man name="dump" section="8"]] and
 [[!template id=man name="restore" section="8"]] for backups,
@@ -128,8 +142,10 @@
 When the snapshot is unmounted and unconfigured, the backing store will
 automatically be discarded:
 
-    # umount /var/.snapshot
-    # fssconfig -u fss3
+[[!template id=programlisting text="""
+# umount /var/.snapshot
+# fssconfig -u fss3
+"""]]
 
 ## External snapshots with [[!template id=man name="fss" section="4"]]
 
@@ -151,8 +167,10 @@
 in `/var/tmp` for saving any data overwritten while the snapshot is
 active, and then mount it at `/mnt`:
 
-    # fssconfig fss1 /boot /var/tmp/
-    # mount /dev/fss1 /mnt
+[[!template id=programlisting text="""
+# fssconfig fss1 /boot /var/tmp/
+# mount /dev/fss1 /mnt
+"""]]
 
 [[!template id=man name="fssconfig" section="8"]] will create a
 temporary file with an unpredictable name in `/var/tmp/` as the backing
@@ -162,12 +180,16 @@
 A snapshot can also use a raw character disk device as the backing
 store:
 
-    # fssconfig fss1 /boot /dev/rld0e
+[[!template id=programlisting text="""
+# fssconfig fss1 /boot /dev/rld0e
+"""]]
 
 When done, you can unmount the snapshot and unconfigure it:
 
-    # umount /mnt
-    # fssconfig -u fss1
+[[!template id=programlisting text="""
+# umount /mnt
+# fssconfig -u fss1
+"""]]
 
 ## zfs snapshots
 
@@ -192,7 +214,9 @@
 
 To create a snapshot of a dataset, and all datasets under it atomically:
 
-    # zfs snapshot -r rpool/home@20260706
+[[!template id=programlisting text="""
+# zfs snapshot -r rpool/home@20260706
+"""]]
 
 The current state of /home will now be visible under
 `/home/.zfs/snapshot/20260706`.  If you have a separate zfs file system
@@ -207,4 +231,6 @@
 directory, but you can also roll back a whole file system to the latest
 snapshot with `zfs rollback`:
 
+[[!template id=programlisting text="""
     # zfs rollback rpool/home/jruser@20260706
+"""]]

Index: wikisrc/tutorials/x11/how_to_use_wsfb_uefi_bios_framebuffer.md
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/x11/how_to_use_wsfb_uefi_bios_framebuffer.md,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/tutorials/x11/how_to_use_wsfb_uefi_bios_framebuffer.md	21 Aug 2023 12:31:40 -0000	1.5
+++ wikisrc/tutorials/x11/how_to_use_wsfb_uefi_bios_framebuffer.md	18 Jul 2026 11:56:00 -0000	1.6
@@ -1,8 +1,14 @@
 [[!meta title="How to use Xorg's wsfb display driver with a UEFI/BIOS framebuffer, and change its resolution"]]
 [[!toc levels=3]]
 
-Background
-----------
+In an ideal world, you have a GPU that the kernel controls and exposes to X.Org through a user space API. This alllows you to use X.Org's built-in `modesetting` driver, which supports video mode configuration via `xrandr`, and with certain cards, acceleration of OpenGL applications.
+
+In some cases, all that's available is the basic 2D video framebuffer automatically configured by the machine's firmware. This is the case if you're using a GPU that isn't supported by NetBSD yet.
+
+The console system in NetBSD is called wsdisplay(4). A special X.Org driver is available that runs directly on top of the pre-existing NetBSD console, called `xf86-video-wsfb`. This can be configured to get a usable X.Org experience on unsupported GPUs.
+
+Technical details
+-----------------
 [wsfb(4)](https://man.netbsd.org/wsfb.4) is the Xorg graphics driver for the NetBSD [wsdisplay(4)](https://man.netbsd.org/wsdisplay.4) framebuffer device. `wsdisplay(4)`, similar to Linux's `/dev/fb` devices, provide access to _non-accelerated_ framebuffers, which are provided by _almost all_ modern cards. Most, if not all, _modern_ graphics cards provide what's called a _linear_ framebuffer: a chunk of memory where contiguous address locations map onto adjacent (X, Y) _pixels_. For example, assuming a 32 bits-per-pixel colour depth display, memory location `fbmem + 0` will hold the pixel at position (0,0); `fbmem + 4` corresponds to the pixel at (1, 0), and so on. (We'll skip the complication known as `stride` or `line_length` here.)
 
 `wsdisplay(4)` can run on top of: 
@@ -22,6 +28,8 @@
 EndSection
 ```
 
+In future NetBSD releases, an example will be available at `/usr/X11R7/share/examples/xorg/xorg.conf`.
+
 That is all that is needed. Xorg will autoconfigure everything else. Make sure you dump the `wsfb.conf` file into the correct Xorg config. directory. `/etc/X11/xorg.conf.d/` is the correct location for the Xorg in base. If you've installed the `modular-xorg` package, then the path will need change. Use this command to find your `config directory`:
 
 ```
@@ -101,13 +109,13 @@
 Limitations
 -----------
 1. No OpenGL hardware acceleration - on x86 and aarch64, llvmpipe (a parallel CPU-based just-in-time renderer) will be used instead
-2. No X Display Power Management Signaling
+2. No X Display Power Management Signaling (the display won't turn off when it's inactive).
 3. No X video extension (used for accelerated video playback)
-4. No DRI
+4. No mode setting with xrandr (the video mode is selected at boot and fixed until the next reboot).
 
 ## Extra: How to disable built-in DRM driver using kernel's `userconf` manager
 
-For testing, or if running `wsfb` on top of the DRM graphics driver does not work--it mostly should, actually).
+For testing, or if the DRM graphics driver is active but not usable.
 
 At the bootloader prompt, pass the `-c` flag to the kernel:
 

Index: wikisrc/projects/project/flite.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/flite.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/projects/project/flite.mdwn	17 Jul 2026 18:54:32 -0000	1.6
+++ wikisrc/projects/project/flite.mdwn	17 Jul 2026 18:59:31 -0000	1.7
@@ -33,7 +33,7 @@
 the user is still stuck until they get a chance to install
 Orca or similar. A more general solution that allows the text console
 to speak to the speech server would be strongly preferable.
-There is a Linux distribution that appears to support this,
+There is a niche Linux distribution that appears to support this,
 [ADRIANE](https://web.archive.org/web/20260303182807/https://www.knopper.net/knoppix-adriane/index-en.html).
 
 NetBSD's text console (with vt100 emulation) is implemented in the kernel.

Index: wikisrc/projects/project/flite.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/flite.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/projects/project/flite.mdwn	17 Jul 2026 18:48:34 -0000	1.5
+++ wikisrc/projects/project/flite.mdwn	17 Jul 2026 18:54:32 -0000	1.6
@@ -16,10 +16,10 @@
 duration="350h"
 
 description="""
-Installing NetBSD requires operating a program (sysinst(8)) that
-runs over a text console. Other operating systems (e.g. Debian
-GNU/Linux) provide an option to start a speech synthesizer so
-that vision-impaired users can install the OS. NetBSD currently
+Installing NetBSD requires operating an interactive curses program
+(sysinst(8)) that runs on the text console. Other operating systems
+(e.g. Debian GNU/Linux) provide an option to start a speech synthesizer
+so that vision-impaired users can install the OS. NetBSD currently
 doesn't.
 
 If the user is installing NetBSD over a serial console (or QEMU's 
@@ -30,18 +30,19 @@
 
 Modifying sysinst(8) to add speech synthesis would be an
 easy way to make it accessible. However, once the installation is complete,
-the user would still be stuck until they got a chance to install
-Orca or similar. A more general solution, that allows the text console
-to speak to the speech server, would be strongly preferable.
+the user is still stuck until they get a chance to install
+Orca or similar. A more general solution that allows the text console
+to speak to the speech server would be strongly preferable.
 There is a Linux distribution that appears to support this,
 [ADRIANE](https://web.archive.org/web/20260303182807/https://www.knopper.net/knoppix-adriane/index-en.html).
 
 NetBSD's text console (with vt100 emulation) is implemented in the kernel.
-Changing this so that it's in userspace would make this a lot easier,
-and have other advantages (such as making it easier and safer to add
-more complex functionality, e.g. utf-8 with bidirectional script and
-sixel graphics support). However, this is probably beyond the task of
-making installing NetBSD accessible.
+Writing a userspace vt100 emulator that outputs to the wsdisplay(4)
+framebuffer would make this project a lot easier, and has other advantages -
+it would be easier and safer to add support for more complex functionality
+e.g. bidirectional utf-8 scripts, and sixel graphics.
+However, this is probably beyond the initial goal of making installing
+NetBSD accessible.
 
 Luckily, we don't need to implement speech synthesis from scratch.
 There's a very nice BSD-licensed implementation already,
@@ -65,7 +66,7 @@
 * Modify sysinst(8) so that one of the first things it does is ask
   the user whether to start the speech server.
 
-This project requires basic experience with C programming.
+This project requires some experience with C programming.
 """
 ]]
 

Index: wikisrc/projects/project/flite.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/flite.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/projects/project/flite.mdwn	17 Jul 2026 18:44:07 -0000	1.4
+++ wikisrc/projects/project/flite.mdwn	17 Jul 2026 18:48:34 -0000	1.5
@@ -57,12 +57,15 @@
   should be relatively usable, e.g. it should only read out freshly
   updated screen regions from curses applications like sysinst. It
   should also echo user input. For security reasons, it should be
-  disabled by default and only enabled with sysctl(8).
+  disabled by default, and only enabled with sysctl(8). NB: maybe
+  this has some overlap with a device that is already available.
 * If the above turns out to be impractical (or otherwise inconvenient
   to use with interactive curses applications), investigate adding
   support for writing to the speech server from sysinst(8) directly.
 * Modify sysinst(8) so that one of the first things it does is ask
   the user whether to start the speech server.
+
+This project requires basic experience with C programming.
 """
 ]]
 

Index: wikisrc/projects/project/flite.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/flite.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/projects/project/flite.mdwn	17 Jul 2026 18:42:19 -0000	1.3
+++ wikisrc/projects/project/flite.mdwn	17 Jul 2026 18:44:07 -0000	1.4
@@ -7,7 +7,8 @@
 """
 
 mentors="""
-[nia](mailto:nia@NetBSD.org)
+[nia](mailto:nia@NetBSD.org),
+[martin](mailto:martin@NetBSD.org)
 """
 
 category="misc"

Index: wikisrc/projects/project/flite.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/flite.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/projects/project/flite.mdwn	17 Jul 2026 18:34:14 -0000	1.2
+++ wikisrc/projects/project/flite.mdwn	17 Jul 2026 18:42:19 -0000	1.3
@@ -21,11 +21,11 @@
 that vision-impaired users can install the OS. NetBSD currently
 doesn't.
 
-If the user is installing NetBSD over a serial console from
-an operating system that already has accessibility features enabled,
-this isn't a problem. However, it becomes problematic when directly
-sat in front of the installer - like on a laptop that lacks a
-serial console.
+If the user is installing NetBSD over a serial console (or QEMU's 
+"-display curses" option) from an operating system that already has
+accessibility features enabled, this isn't a problem. However,
+it becomes problematic when directly sat in front of the
+hardware, and that hardware is a laptop that lacks a console port.
 
 Modifying sysinst(8) to add speech synthesis would be an
 easy way to make it accessible. However, once the installation is complete,

Index: wikisrc/projects/project/flite.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/flite.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/projects/project/flite.mdwn	17 Jul 2026 18:29:18 -0000	1.1
+++ wikisrc/projects/project/flite.mdwn	17 Jul 2026 18:34:14 -0000	1.2
@@ -32,8 +32,8 @@
 the user would still be stuck until they got a chance to install
 Orca or similar. A more general solution, that allows the text console
 to speak to the speech server, would be strongly preferable.
-There is a Linux distribution that appears to support this, ADRIANE:
-https://web.archive.org/web/20260303182807/https://www.knopper.net/knoppix-adriane/index-en.html
+There is a Linux distribution that appears to support this,
+[ADRIANE](https://web.archive.org/web/20260303182807/https://www.knopper.net/knoppix-adriane/index-en.html).
 
 NetBSD's text console (with vt100 emulation) is implemented in the kernel.
 Changing this so that it's in userspace would make this a lot easier,
@@ -43,8 +43,8 @@
 making installing NetBSD accessible.
 
 Luckily, we don't need to implement speech synthesis from scratch.
-There's a very nice BSD-licensed implementation already, flite:
-http://festvox.org/flite/
+There's a very nice BSD-licensed implementation already,
+[flite](http://festvox.org/flite/).
 
 Tasks:
 

--- /dev/null	2026-07-17 18:30:11.126283559 +0000
+++ wikisrc/projects/project/flite.mdwn	2026-07-17 18:30:11.386875808 +0000
@@ -0,0 +1,69 @@
+[[!template id=project
+
+title="Integrate screen reading into the NetBSD base system (350h)"
+
+contact="""
+[nia](mailto:nia@NetBSD.org)
+"""
+
+mentors="""
+[nia](mailto:nia@NetBSD.org)
+"""
+
+category="misc"
+difficulty="medium"
+duration="350h"
+
+description="""
+Installing NetBSD requires operating a program (sysinst(8)) that
+runs over a text console. Other operating systems (e.g. Debian
+GNU/Linux) provide an option to start a speech synthesizer so
+that vision-impaired users can install the OS. NetBSD currently
+doesn't.
+
+If the user is installing NetBSD over a serial console from
+an operating system that already has accessibility features enabled,
+this isn't a problem. However, it becomes problematic when directly
+sat in front of the installer - like on a laptop that lacks a
+serial console.
+
+Modifying sysinst(8) to add speech synthesis would be an
+easy way to make it accessible. However, once the installation is complete,
+the user would still be stuck until they got a chance to install
+Orca or similar. A more general solution, that allows the text console
+to speak to the speech server, would be strongly preferable.
+There is a Linux distribution that appears to support this, ADRIANE:
+https://web.archive.org/web/20260303182807/https://www.knopper.net/knoppix-adriane/index-en.html
+
+NetBSD's text console (with vt100 emulation) is implemented in the kernel.
+Changing this so that it's in userspace would make this a lot easier,
+and have other advantages (such as making it easier and safer to add
+more complex functionality, e.g. utf-8 with bidirectional script and
+sixel graphics support). However, this is probably beyond the task of
+making installing NetBSD accessible.
+
+Luckily, we don't need to implement speech synthesis from scratch.
+There's a very nice BSD-licensed implementation already, flite:
+http://festvox.org/flite/
+
+Tasks:
+
+* Implement a speech server (ideally sandboxed) that takes text input
+  (perhaps over a Unix socket), uses the flite library to process it
+  into speech, and then outputs it to an audio(4) device.
+* Investigate implementing a /dev/conspeech (or similar) device in the
+  kernel that the speech server can read to get input. Ideally this
+  should be relatively usable, e.g. it should only read out freshly
+  updated screen regions from curses applications like sysinst. It
+  should also echo user input. For security reasons, it should be
+  disabled by default and only enabled with sysctl(8).
+* If the above turns out to be impractical (or otherwise inconvenient
+  to use with interactive curses applications), investigate adding
+  support for writing to the speech server from sysinst(8) directly.
+* Modify sysinst(8) so that one of the first things it does is ask
+  the user whether to start the speech server.
+"""
+]]
+
+[[!tag gsoc]]
+[[!tag gsoc350h]]

Index: wikisrc/tutorials/tuning_netbsd_for_performance.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/tuning_netbsd_for_performance.mdwn,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wikisrc/tutorials/tuning_netbsd_for_performance.mdwn	16 Jul 2026 22:04:54 -0000	1.15
+++ wikisrc/tutorials/tuning_netbsd_for_performance.mdwn	16 Jul 2026 22:06:23 -0000	1.16
@@ -247,7 +247,7 @@
     buffer size = RTT * bandwidth
     
 
-Fortunately, there is a control for those buffers in NetBSD. It can be checked and and enabled with sysctl: 
+Fortunately, there are controls for those buffers in NetBSD. They can be checked and enabled with sysctl: 
     
     net.inet.tcp.recvbuf_inc = 16384
     net.inet.tcp.recvbuf_max = 262144

Index: wikisrc/tutorials/tuning_netbsd_for_performance.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/tuning_netbsd_for_performance.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/tutorials/tuning_netbsd_for_performance.mdwn	9 Sep 2020 14:28:56 -0000	1.14
+++ wikisrc/tutorials/tuning_netbsd_for_performance.mdwn	16 Jul 2026 22:04:54 -0000	1.15
@@ -247,31 +247,27 @@
     buffer size = RTT * bandwidth
     
 
-Fortunately, there is an automatic control for those buffers in NetBSD. It can be checked and and enabled with sysctl: 
+Fortunately, there is a control for those buffers in NetBSD. It can be checked and and enabled with sysctl: 
     
-    net.inet.tcp.recvbuf_auto = 0
     net.inet.tcp.recvbuf_inc = 16384
     net.inet.tcp.recvbuf_max = 262144
-    net.inet.tcp.sendbuf_auto = 0
     net.inet.tcp.sendbuf_inc = 8192
     net.inet.tcp.sendbuf_max = 262144
     
 
 The default values for the maximal send and receive buffers are set to 256 KBytes, which is very tiny. 
 
-A reasonable value for newer systems would be 16 MBytes, so you may set it to that value after you turned it on with sysctl: 
+A reasonable value for newer systems would be 16 MBytes, so you may set it to that value with sysctl: 
     
-    net.inet.tcp.recvbuf_auto=1
-    net.inet.tcp.sendbuf_auto=1
     net.inet.tcp.sendbuf_max=16777216 
     net.inet.tcp.recvbuf_max=16777216
 
-Just remember that your application has to avoid using SO_RCVBUF or SO_SNDBUF if it wants to take advantage of using automatically sized buffers.
+Just remember that your application has to avoid using SO_RCVBUF or SO_SNDBUF if it wants to take advantage of using automatically-sized buffers.
 
 ### Increase the initial window size
 
 RFC 6928 permits the extension of the initial window size to 10 segments. By default NetBSD uses 4 segments as specified in the RFC 3390.
-You can increase it by using the following sysctl's:
+You can increase it by using the following sysctls:
 
     net.inet.tcp.init_win=10
     net.inet.tcp.init_win_local=10
@@ -285,7 +281,7 @@
 
 ### Other settings
 
-If you still are seeing low throughput, maybe it's time for desperate measures ! Try to change the congestion algorithm to cubic using:
+If you still are seeing low throughput, maybe it's time for desperate measures! Try to change the congestion algorithm to cubic using:
 
     net.inet.tcp.congctl.selected=cubic
 

Index: wikisrc/tutorials/how_to_use_snapshots.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_use_snapshots.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/tutorials/how_to_use_snapshots.mdwn	7 Jul 2026 03:01:01 -0000	1.8
+++ wikisrc/tutorials/how_to_use_snapshots.mdwn	7 Jul 2026 03:03:30 -0000	1.9
@@ -74,7 +74,7 @@
 use, e.g., rsync (pkgsrc [[!pkgsrc net/rsync desc="net/rsync"]]) to
 revert files back to what they were in the snapshot:
 
-    # rsync -aH /home/.snap/20260706/bofh/. /home/bofh/.
+    # rsync -aHc --delete /home/.snap/20260706/bofh/. /home/bofh/.
 
 It is better to use rsync rather than
 [[!template id=man name="tar" section="1"]] for this purpose, in order

Index: wikisrc/tutorials/how_to_use_snapshots.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_use_snapshots.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/tutorials/how_to_use_snapshots.mdwn	7 Jul 2026 03:00:05 -0000	1.7
+++ wikisrc/tutorials/how_to_use_snapshots.mdwn	7 Jul 2026 03:01:01 -0000	1.8
@@ -107,7 +107,7 @@
     # mkdir /var/.snapshot
     # mount /dev/fss3 /var/.snapshot
 
-Then you can take a backup of /var from the snapshot with your
+Then you can take a backup of `/var` from the snapshot with your
 favourite backup archiving tool:
 
     # tar -C /var/.snapshot -cf - . | ...

Index: wikisrc/tutorials/how_to_use_snapshots.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_use_snapshots.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/tutorials/how_to_use_snapshots.mdwn	7 Jul 2026 02:58:05 -0000	1.6
+++ wikisrc/tutorials/how_to_use_snapshots.mdwn	7 Jul 2026 03:00:05 -0000	1.7
@@ -97,12 +97,11 @@
 You can also take a “persistent” snapshot of a file system and
 immediately unlink it while it is still configured.  That way, any
 storage it uses will be released as soon as the
-[[!template id=man name="fss" section="4"]] device is unconfigured;
-this way (unlike for external
-[[!template id=man name="fss" section="4"]] snapshots) you don't need
-any backing store outside the file system.  For example, to take an
-anonymous persistent snapshot of the file system `/var` and mount it at
-`/var/.snapshot`:
+[[!template id=man name="fss" section="4"]] device is unconfigured, and
+(unlike for external [[!template id=man name="fss" section="4"]]
+snapshots) you don't need any backing store outside the file system.
+For example, to take an anonymous persistent snapshot of the file
+system `/var` and mount it at `/var/.snapshot`:
 
     # fssconfig fss3 /var /var/
     # mkdir /var/.snapshot

Index: wikisrc/tutorials/how_to_use_snapshots.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_use_snapshots.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/tutorials/how_to_use_snapshots.mdwn	7 Jul 2026 02:53:07 -0000	1.5
+++ wikisrc/tutorials/how_to_use_snapshots.mdwn	7 Jul 2026 02:58:05 -0000	1.6
@@ -101,8 +101,8 @@
 this way (unlike for external
 [[!template id=man name="fss" section="4"]] snapshots) you don't need
 any backing store outside the file system.  For example, to take an
-anonymous persistent snapshot of the file system `/usr` and mount it at
-`/usr/.snapshot`:
+anonymous persistent snapshot of the file system `/var` and mount it at
+`/var/.snapshot`:
 
     # fssconfig fss3 /var /var/
     # mkdir /var/.snapshot

Index: wikisrc/tutorials/how_to_use_snapshots.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_use_snapshots.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/tutorials/how_to_use_snapshots.mdwn	7 Jul 2026 02:51:33 -0000	1.4
+++ wikisrc/tutorials/how_to_use_snapshots.mdwn	7 Jul 2026 02:53:07 -0000	1.5
@@ -45,7 +45,7 @@
 
 ### Example: Taking a snapshot
 
-To create and mount a persistent snapshot of the `/home' file system,
+To create and mount a persistent snapshot of the `/home` file system,
 via `/dev/fss0`:
 
     # fssconfig fss0 /home /home/.snap/20260706.store

Members: 
	tutorials/how_to_use_snapshots.mdwn:1.3->1.4 

Index: wikisrc/tutorials/how_to_use_snapshots.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_use_snapshots.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/tutorials/how_to_use_snapshots.mdwn	7 Jul 2026 02:30:06 -0000	1.3
+++ wikisrc/tutorials/how_to_use_snapshots.mdwn	7 Jul 2026 02:51:33 -0000	1.4
@@ -1,6 +1,6 @@
 # How to use file system snapshots in NetBSD
 
-[[!toc startlevel=2 levels=1]]
+[[!toc startlevel=2 levels=2]]
 
 ## Overview
 

Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- wikisrc/sandbox.mdwn	7 Jul 2026 02:45:17 -0000	1.51
+++ wikisrc/sandbox.mdwn	7 Jul 2026 02:47:43 -0000	1.52
@@ -44,4 +44,4 @@
 
 fnord again
 
-We tests our ikiwiki commitses, my precioussssssssssssss!
+We tests our ikiwiki commitses, my preciousssssss!

Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- wikisrc/sandbox.mdwn	16 Jun 2026 15:48:50 -0000	1.50
+++ wikisrc/sandbox.mdwn	7 Jul 2026 02:45:17 -0000	1.51
@@ -44,4 +44,4 @@
 
 fnord again
 
-We tests our ikiwiki commitses, my preciousssssssssss!
+We tests our ikiwiki commitses, my precioussssssssssssss!

Members: 
	tutorials/how_to_use_snapshots.mdwn:1.2->1.3 

Index: wikisrc/tutorials/how_to_use_snapshots.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_use_snapshots.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/tutorials/how_to_use_snapshots.mdwn	6 Apr 2019 01:06:15 -0000	1.2
+++ wikisrc/tutorials/how_to_use_snapshots.mdwn	7 Jul 2026 02:30:06 -0000	1.3
@@ -1,79 +1,211 @@
-# How to use snapshots with NetBSD
+# How to use file system snapshots in NetBSD
 
-Snapshots using [[!template id=man name="fss" section="4"]] aren't a new thing in NetBSD, they have been supported 
-since NetBSD 2.0. But their concept and usage is rather unintuitive from what 
-you might know from other snapshotting mechanisms such as zfs', so here is a 
-tutorial on how to use them.
+[[!toc startlevel=2 levels=1]]
 
-## What is a snapshot?
+## Overview
 
-A snapshot is a consistent view on a filesystem at a certain point in time.
-This means, you take a snapshot of a filesystem, then create a new file or 
-change an existing one, and if you look at the snapshot, it will show you the 
-old version of the file or the directory without this file.
+A **snapshot** is a consistent view of a file system at a certain point
+in time.  If you take a snapshot of a file system, and then create a
+new file or modify an existing one or make any other changes to the
+file system, and the snapshot will still have the old version of the
+file system without the changes.  Unlike copies, snapshots don't take
+much extra space.
+
+Snapshots are often used to take backups.  For example, the
+[[!template id=man name="dump" section="8"]] tool for dumping a file
+system backup can take a snapshot with the `-x` or `-X` options (q.v.)
+to ensure that files such as sqlite3 databases aren't concurrently
+modified while it is trying to read them.  Snapshots can also be
+mounted like regular file systems to give read-only views of past
+states of file systems.
+
+On some file systems—ffs and zfs—snapshots can be
+**persistent**: you can take a snapshot, and it will persist until it
+is explicitly deleted, even if the system is rebooted.  Most other file
+systems only support external snapshots which don't persist past
+reboot.
+
+## Persistent snapshots with [[!template id=man name="fss" section="4"]]
+
+*Persistent snapshots are currently supported for ffs file systems
+only—not to be confused with the fss file system snapshot
+device.*
+
+A persistent snapshot of a file system is represented by a regular file
+*inside* the file system, with a special flag (so it can't be read or
+written normally), and persists until the file is unlinked.  This file
+is used as a backing store for the snapshot, to save any data
+overwritten later in the file system.  Snapshots can be created with or
+loaded back into [[!template id=man name="fss" section="4"]] devices in
+order to mount them.  Active snapshots are managed with the
+[[!template id=man name="fssconfig" section="8"]] command.
+
+File systems may impose a limit on the number of snapshots that can be
+stored at any time.  For ffs, this limit is 20.
+
+### Example: Taking a snapshot
+
+To create and mount a persistent snapshot of the `/home' file system,
+via `/dev/fss0`:
+
+    # fssconfig fss0 /home /home/.snap/20260706.store
+    # mkdir /home/.snap/20260706
+    # mount /dev/fss0 /home/.snap/20260706
+
+Users can then browse their home directories in /home/.snap as they
+existed at the time the snapshot was taken.  There's nothing special
+about the directory name `.snap`; you can store snapshots anywhere in
+the file system.
 
-## What is a snapshot not?
+The snapshot can be unmounted and unconfigured:
 
-A snapshot is no filesystem versioning! Snapshots by fss are read-only 
-*views*, and you cannot revert the filesystem back to a snapshot without 
-copying all the files on filesystem layer. You can only mount the 
-snapshot to see what the filesystem looked like back then, but not more.
+    # umount /home/.snap/20260706
+    # fssconfig -u fss0
+
+But the snapshot will persist at `/home/.snap/20260706.store`, even
+after a reboot, and can be configured and mounted again:
 
-## How to create snapshots?
+    # fssconfig fss0 /home /home/.snap/20260706.store
+    # mount /dev/fss0 /home/.snap/20260706
 
-Snapshots are configured using the tool fssconfig(8). To create a 
-snapshot, you have to enter the snapshot device you want to use 
-(`/dev/fssX`), the filesystem you want to snapshot and the place of the 
-snapshot file (which can even lie on the filesystem it is snapshotting). 
-So, if you want to create a snapshot of filesystem `/`, you would e.g. 
-enter:
+### Example: Recovering from a snapshot
 
-    # fssconfig -c fss0 / /root/backup
+If you made a mistake and need to recover from the snapshot, you can
+use, e.g., rsync (pkgsrc [[!pkgsrc net/rsync desc="net/rsync"]]) to
+revert files back to what they were in the snapshot:
 
-Then you get a snapshot in `/root/backup`. You can then mount that 
-snapshot somewhere, and in that mount, you have a view of the filesystem 
-at the point of creating the snapshot:
+    # rsync -aH /home/.snap/20260706/bofh/. /home/bofh/.
 
-    # mount /dev/fss0 /mnt
+It is better to use rsync rather than
+[[!template id=man name="tar" section="1"]] for this purpose, in order
+to avoid writing unchanged content back to the file system, since that
+would take up space in the snapshot backing store.
 
-When you are done with the snapshot, you unmount it and unconfigure the snapshot:
+### Example: Discarding a persistent snapshot
 
-    # umount /dev/fss0
+When done with a snapshot, after unmounting and unconfiguring the
+[[!template id=man name="fss" section="4"]], you can unlink the
+snapshot's backing store file to irrevocably discard it and free up any
+space it was using in the file system:
+
+    # umount /home/.snap/20260706
     # fssconfig -u fss0
+    # rm /home/.snap/20260706
+
+### Example: Single-use snapshot to take a backup
+
+You can also take a “persistent” snapshot of a file system and
+immediately unlink it while it is still configured.  That way, any
+storage it uses will be released as soon as the
+[[!template id=man name="fss" section="4"]] device is unconfigured;
+this way (unlike for external
+[[!template id=man name="fss" section="4"]] snapshots) you don't need
+any backing store outside the file system.  For example, to take an
+anonymous persistent snapshot of the file system `/usr` and mount it at
+`/usr/.snapshot`:
+
+    # fssconfig fss3 /var /var/
+    # mkdir /var/.snapshot
+    # mount /dev/fss3 /var/.snapshot
+
+Then you can take a backup of /var from the snapshot with your
+favourite backup archiving tool:
+
+    # tar -C /var/.snapshot -cf - . | ...
+    # tarsnap -C /var/.snapshot -cf var-20260706 .
+    # (cd /var/.snapshot && \
+          borg create borghost:/path/to/repo::var-20260706 .)
+    # ssh rsynchost mkdir /backups/$(hostname)/var/20260706 &&
+      rsync -aHc --link-dest=/backups/$(hostname)/var/latest/. \
+          /var/.snapshot/. rsynchost:/backups/$(hostname)/var/. &&
+      ssh rsynchost ln -sfn 20260706 /backups/$(hostname)/var/latest
+
+(Note that if you use [[!template id=man name="dump" section="8"]] and
+[[!template id=man name="restore" section="8"]] for backups,
+[[!template id=man name="dump" section="8"]] can automatically take a
+snapshot itself with the `-x` or `-X` option; you don't need to use
+[[!template id=man name="fssconfig" section="8"]] at all.)
+
+When the snapshot is unmounted and unconfigured, the backing store will
+automatically be discarded:
+
+    # umount /var/.snapshot
+    # fssconfig -u fss3
+
+## External snapshots with [[!template id=man name="fss" section="4"]]
+
+Any file system mounted from a disk device, such as ext2fs and msdosfs
+(but not tmpfs, not virtual file systems such as procfs or ptyfs, and
+not zfs), can have can have snapshots taken with
+[[!template id=man name="fss" section="4"]].
+
+A (non-persistent) [[!template id=man name="fss" section="4"]] snapshot
+of a file system requires a backing store *outside* the file system,
+where any existing data in the file system will be saved if later
+overwritten while the snapshot is active.  The backing store can be
+either a raw character disk device or a regular file in another file
+system.
+
+### Example: Taking a snapshot
+
+To create a snapshot of the `/boot` directory, using a temporary file
+in `/var/tmp` for saving any data overwritten while the snapshot is
+active, and then mount it at `/mnt`:
+
+    # fssconfig fss1 /boot /var/tmp/
+    # mount /dev/fss1 /mnt
+
+[[!template id=man name="fssconfig" section="8"]] will create a
+temporary file with an unpredictable name in `/var/tmp/` as the backing

(Diff truncated)

Index: wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn	30 Jun 2026 08:18:30 -0000	1.4
+++ wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn	30 Jun 2026 10:17:40 -0000	1.5
@@ -7,7 +7,7 @@
 
 Additional details about the conference can be found at the official website: <https://2026.eurobsdcon.org/>
 
-Date and location are yet to be announced.
+The devsummit will take place on September 11 (the day before the main conference).  The exact room at the conference venue will be announced in time.
 
 ### NetBSD Dinner
 

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- wikisrc/users/jun.mdwn	29 Jun 2026 04:03:03 -0000	1.153
+++ wikisrc/users/jun.mdwn	30 Jun 2026 10:03:51 -0000	1.154
@@ -25,7 +25,8 @@
 
 ## Open Source Conference 2026 Kyoto NetBSD Booth & NetBSD BoF
 - 2025 Aug.1 Sat 10:00-16:00 JST (UTC+9) 
-- 2025 Aug.1 Sat XX:00-XX:45 JST (UTC+9) NetBSD BoF
+- 2025 Aug.1 Sat 16:00-16:45 JST (UTC+9) NetBSD BoF [[https://event.ospn.jp/osc2026-kyoto/session/2329485]]
+
 - Kyoto Research Park [[https://www.krp.co.jp/access/map.html]]
 - [[https://event.ospn.jp/osc2026-kyoto/]]
 - Tour Guide [[]]

Index: wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn	30 Jun 2026 07:36:06 -0000	1.3
+++ wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn	30 Jun 2026 08:18:30 -0000	1.4
@@ -22,7 +22,7 @@
 [[!table data="""
 First Last | `login@` | join dinner? | comment(s)
 Harold | `hgutch@` | yes | n/a
-Stephen | `sborrill@` | yes | Fri 10th please
+Stephen | `sborrill@` | yes | 10th or 11th, please
 """]]
 
 ## Planning to present something?

Index: wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn	29 Jun 2026 21:34:16 -0000	1.2
+++ wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn	30 Jun 2026 07:36:06 -0000	1.3
@@ -22,6 +22,7 @@
 [[!table data="""
 First Last | `login@` | join dinner? | comment(s)
 Harold | `hgutch@` | yes | n/a
+Stephen | `sborrill@` | yes | Fri 10th please
 """]]
 
 ## Planning to present something?

Index: wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn	29 Jun 2026 21:16:05 -0000	1.1
+++ wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn	29 Jun 2026 21:34:16 -0000	1.2
@@ -3,7 +3,7 @@
 
 ## Details
 
-We are organising a NetBSD/pkgsrc summit at EuroBSDCon 2026 taking place September 9-18, 2026 in Brussels, Belgium.
+We are organising a NetBSD/pkgsrc summit at EuroBSDCon 2026 taking place September 9-13, 2026 in Brussels, Belgium.
 
 Additional details about the conference can be found at the official website: <https://2026.eurobsdcon.org/>
 

--- /dev/null	2026-06-29 21:31:05.508937806 +0000
+++ wikisrc/summits/eurobsdcon_2026_netbsd_summit.mdwn	2026-06-29 21:31:17.264169047 +0000
@@ -0,0 +1,43 @@
+<!-- we are supposed to use all lowercase letters in the link, so set a proper title for the page: -->
+[[!meta title="EuroBSDCon 2026 NetBSD Summit"]]
+
+## Details
+
+We are organising a NetBSD/pkgsrc summit at EuroBSDCon 2026 taking place September 9-18, 2026 in Brussels, Belgium.
+
+Additional details about the conference can be found at the official website: <https://2026.eurobsdcon.org/>
+
+Date and location are yet to be announced.
+
+### NetBSD Dinner
+
+TODO
+
+## Planning to attend?
+
+The summit is for TNF members (NetBSD / pkgsrc developers) and not open to the general public.  Non-members can be invited to join as a guest - if you would like to join the summit, please reach out to us somehow (mailing lists, social media, IRC, ...).  TNF is also financially sponsoring a limited number of devsummit tickets, so please indicate if you would like TNF to cover your ticket.
+
+Please add yourself to the table so it helps everybody for planing the event.
+
+[[!table data="""
+First Last | `login@` | join dinner? | comment(s)
+Harold | `hgutch@` | yes | n/a
+"""]]
+
+## Planning to present something?
+
+[[!table data="""
+Speaker | Title
+... | ...
+"""]]
+
+## Discussions
+
+### NetBSD 11
+
+* ...
+
+### Other
+
+* PGP key signing?
+* ...

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- wikisrc/users/jun.mdwn	19 Jun 2026 00:34:26 -0000	1.152
+++ wikisrc/users/jun.mdwn	29 Jun 2026 04:03:03 -0000	1.153
@@ -9,16 +9,6 @@
 ## Event Updates [[https://www.facebook.com/NetBSD.jp]]
 
 #2026
-
-## Open Source Conference 2026 Hokkaido NetBSD Booth and NetBSD BoF
-- 2026 Jun.27 Sat 10:00-18:00 JST (UTC+9)
-- NetBSD BoF 14:00-14:45 [[https://event.ospn.jp/osc2026-do/session/2310301]] 
-- Sapporo Business Innovation Center [[https://www.sapporosansin.jp/access/]]
-- with [[https://www.no.bug.gr.jp/]]
-- [[https://event.ospn.jp/osc2026-do/]]
-- Tour Guide [[]]
-- togetter [[]]
-
 ## Japan NetBSD Users' Group 23th annual meeting and NetBSD BoF 2026
 - 2026 Jul.5 13:00-18:00 Nezu,Tokyo Univ.,VDEC
 - [[http://www.jp.netbsd.org/ja/JP/JNUG/announce/meeting23.html]]
@@ -59,6 +49,15 @@
 
 # Past in 2026
 
+## Open Source Conference 2026 Hokkaido NetBSD Booth and NetBSD BoF
+- 2026 Jun.27 Sat 10:00-18:00 JST (UTC+9)
+- NetBSD BoF 14:00-14:45 [[https://event.ospn.jp/osc2026-do/session/2310301]] 
+- Sapporo Business Innovation Center [[https://www.sapporosansin.jp/access/]]
+- with [[https://www.no.bug.gr.jp/]]
+- [[https://event.ospn.jp/osc2026-do/]]
+- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2026hokkaido.pdf]]
+- togetter [[https://posfie.com/@ebijun/p/3QUhHvw]]
+
 ## Open Source Conference 2026 Sendai NetBSD Booth & BoF
 - Booth: 2026 Jun.6 Sat 10:00-18:00 JST (UTC+9)
 - BoF: 2026 Jun.6 16:00-16:45 JST (UTC+9) [[https://event.ospn.jp/osc2026-sendai/session/2302526]]

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- wikisrc/users/jun.mdwn	16 Jun 2026 14:09:58 -0000	1.151
+++ wikisrc/users/jun.mdwn	19 Jun 2026 00:34:26 -0000	1.152
@@ -10,23 +10,21 @@
 
 #2026
 
-## Open Source Conference 2026 Sendai NetBSD Booth & BoF
-- Booth: 2026 Jun.6 Sat 10:00-18:00 JST (UTC+9)
-- BoF: 2026 Jun.6 16:00-16:45 JST (UTC+9) [[https://event.ospn.jp/osc2026-sendai/session/2302526]]
-- Tohoku Computer College [[https://tcc.ac.jp/outline/access/]]
-- [[https://event.ospn.jp/osc2026-sendai/]]
-- Tour Guide [[]]
-- togetter [[]]
-
 ## Open Source Conference 2026 Hokkaido NetBSD Booth and NetBSD BoF
 - 2026 Jun.27 Sat 10:00-18:00 JST (UTC+9)
-- NetBSD BoF  [[]] 
+- NetBSD BoF 14:00-14:45 [[https://event.ospn.jp/osc2026-do/session/2310301]] 
 - Sapporo Business Innovation Center [[https://www.sapporosansin.jp/access/]]
 - with [[https://www.no.bug.gr.jp/]]
 - [[https://event.ospn.jp/osc2026-do/]]
 - Tour Guide [[]]
 - togetter [[]]
 
+## Japan NetBSD Users' Group 23th annual meeting and NetBSD BoF 2026
+- 2026 Jul.5 13:00-18:00 Nezu,Tokyo Univ.,VDEC
+- [[http://www.jp.netbsd.org/ja/JP/JNUG/announce/meeting23.html]]
+- [[https://www.facebook.com/events/1547607546993967]]
+- [[http://www.vdec.u-tokyo.ac.jp/Guide/access.html]]
+
 ## Open Source Conference 2026 Shimane NetBSD Booth
 - Booth: 2026 Jul.11 Sat 10:00-17:00 JST (UTC+9)
 - Matsue Terusa,near by JR Matsue station
@@ -43,6 +41,12 @@
 - Tour Guide [[]]
 - togetter [[]]
 
+## Open Developers Conference 2026 NetBSD BoF
+- 2026 Aug.27 Sat 12:00-12:45 JST (UTC+9)
+- [[https://event.ospn.jp/odc2026/]]
+- Nihon Kogakuin Kamata Campus [[https://www.neec.ac.jp/portal/access/kamata/]]
+- Tour Guide [[]]
+- togetter [[]]
 
 ## Kansai Open Forum 2026
 - 2026 Nov.13 Fri-14 Sat 10:50-18:00 JST (UTC+9) 
@@ -55,14 +59,25 @@
 
 # Past in 2026
 
+## Open Source Conference 2026 Sendai NetBSD Booth & BoF
+- Booth: 2026 Jun.6 Sat 10:00-18:00 JST (UTC+9)
+- BoF: 2026 Jun.6 16:00-16:45 JST (UTC+9) [[https://event.ospn.jp/osc2026-sendai/session/2302526]]
+- Tohoku Computer College [[https://tcc.ac.jp/outline/access/]]
+- [[https://event.ospn.jp/osc2026-sendai/]]
+- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2026sendai.pdf]]
+- togetter [[https://posfie.com/@ebijun/p/NqQAv0o]]
+- Youtube [[https://www.youtube.com/watch?v=4rscUOfx0Tw]]
+
 ## Open Source Conference 2026 Nagoya NetBSD Booth & NBUG BoF
 - 2026 May.23 Sat 10:00-18:00 JST (UTC+9)
-- BoF 2026 May.23 Sat XX:00-XX:45 JST [[]]
+- BoF 2026 May.23 Sat XX:00-XX:45 JST [[https://event.ospn.jp/osc2026-nagoya/session/2296979]]
 - Nagoya Trade & Industry Center [[https://www.nipc.or.jp/fukiage/sub/visitor-access.html#around]]
 - with [[http://nagoya.bug.gr.jp/]]
 - [[https://event.ospn.jp/osc2026-nagoya/]]
 - Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2026nagoya.pdf]]
 - togetter [[https://posfie.com/@ebijun/p/lpOl8KO]]
+- [[https://www.facebook.com/NetBSD.jp/videos/2440408836782072]]
+- [[https://www.slideshare.net/ao_kenji]]
 
 ## Open Source Conference 2026 Kagawa
 - 2026 Apr.18 Sat 10:00-18:00 JST (UTC+9)

Index: wikisrc/summits/bsdcan_2026.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/bsdcan_2026.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/summits/bsdcan_2026.mdwn	16 Jun 2026 15:30:23 -0000	1.11
+++ wikisrc/summits/bsdcan_2026.mdwn	18 Jun 2026 06:54:24 -0000	1.12
@@ -16,7 +16,7 @@
 
 [Day 1 Stream (Scheduled start around 10 a.m.)](https://youtube.com/live/GLBcjfTXpJA?feature=share)
 
-[Day 2 Stream](https://youtube.com/live/RHkrQnoBJgs?feature=share)
+[Day 2 Stream](https://youtube.com/live/ZZytEtdlTFc?feature=share)
 
 Please note: this devsummit may not be streaming the entire time.
 

Index: wikisrc/users/rkujawa/sam4x0.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/rkujawa/sam4x0.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/users/rkujawa/sam4x0.mdwn	11 Aug 2012 16:39:09 -0000	1.3
+++ wikisrc/users/rkujawa/sam4x0.mdwn	16 Jun 2026 22:57:40 -0000	1.4
@@ -1,42 +1,37 @@
 # Notes on porting the NetBSD to ACube Sam4x0 boards
 
-The NetBSD does not work on [[Sam4x0|http://www.sam4x0.com/]] boards yet.
-The work on this port has not started yet. This documment tries to summarize
-what should be done.
+There is an ongoing project to port NetBSD to ACube Systems Sam460ex board.
 
-## Missing support for PPC 440 cores
+## Support for PPC 440 cores
 
-Main problem is that PowerPC 440 core are not supported yet. Both Sam440ep
-and Sam460ex are based on SoC chips with 440 core.
+Support for PowerPC 440 CPU and AMCC 460EX SoC was added to NetBSD in June 2026. 
+Stress tests conducted so far have shown that the system is stable and performs
+acceptably. 
 
-See [[Matt's mail|http://mail-index.netbsd.org/port-powerpc/2012/08/09/msg003224.html]].
+## Sam460ex support
 
-Missing 440 support should fit into exisiting
-[[Book E support|http://nxr.netbsd.org/xref/src/sys/arch/powerpc/booke/]].
+The porting effort now focuses on adding support for the specific hardware features
+of the Sam460ex board.
 
-## Firmware
-
-Sam4x0 boards use U-Boot firmware, it is stored in a Flash chip. ACube provides
-[[source|http://www.acube-systems.biz/download/ub2lb-0.93.zip]] to Parthenope
-boot loader that can be used to boot AmigaOS 4, AROS and Linux. We should
-extend the Parthenope to support the NetBSD disk labels and filesystems (on
-RDB too). Alternatively, we could port altboot loader used with NetBSD/sandpoint.
-
-For development work it should be possible to boot the NetBSD kernel directly
-with U-Boot TFTP.
-
-## Early console support
+Board already boots NetBSD to multi-user mode, but not all hardware features and 
+configurations are fully supported yet.
 
-* PPC440EP has 16550 compatible UARTs built in. UART0 is at 0 EF60 0300 (8 bytes).
-* PPC460EX has 16750 compatible UARTs built in. UART0 is at 4 EF60 0300 (8 bytes).
-
-## Docs
-
-[[PPC440G5 Processor User's Manual|http://c0ff33.net/drop/PPC440_UM2013.pdf]]
-
-[[Sam460ex U-Boot boot log|http://c0ff33.net/drop/ppc460ex.txt]]
+## Firmware
 
-[[IBM PowerPC 440 Microprocessor Core Programming Model Overview|http://alacron.com/clientuploads/PDFs/forweb/440_Programming_Model.pdf]]
+Sam4x0 boards use U-Boot firmware, which is stored in a Flash chip.
 
-[[Differences between Book E and PPC440|http://elinux.org/Book_E_and_PPC_440]]
+For development work it is possible to boot the NetBSD kernel directly
+from U-Boot via TFTP and automatically mount root file system from 
+NFS server:
+
+[[!template  id=programlisting text="""
+setenv serverip 192.168.100.1
+setenv ipaddr 192.168.100.2
+
+setenv bootargs root=emac0
+
+tftp 0x4000000 netbsd.gz.ub
+tftp 0x5000000 canyonlands.dtb
+bootm 0x4000000 - 0x5000000
+"""]]
 

Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- wikisrc/sandbox.mdwn	16 Jun 2026 15:43:06 -0000	1.49
+++ wikisrc/sandbox.mdwn	16 Jun 2026 15:48:50 -0000	1.50
@@ -44,4 +44,4 @@
 
 fnord again
 
-We tests our ikiwiki commitses, my preciousssssssssses!
+We tests our ikiwiki commitses, my preciousssssssssss!

Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- wikisrc/sandbox.mdwn	1 Apr 2026 23:02:41 -0000	1.48
+++ wikisrc/sandbox.mdwn	16 Jun 2026 15:43:06 -0000	1.49
@@ -44,4 +44,4 @@
 
 fnord again
 
-We tests our ikiwiki commitses, my precioussssssssss!
+We tests our ikiwiki commitses, my preciousssssssssses!

Index: wikisrc/summits/bsdcan_2026.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/bsdcan_2026.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/summits/bsdcan_2026.mdwn	16 Jun 2026 14:09:57 -0000	1.10
+++ wikisrc/summits/bsdcan_2026.mdwn	16 Jun 2026 15:30:23 -0000	1.11
@@ -12,6 +12,14 @@
 conference, the tutorial days).
 We are in room DMS 1110 and we start at 9:00 a.m.
 
+### Streams
+
+[Day 1 Stream (Scheduled start around 10 a.m.)](https://youtube.com/live/GLBcjfTXpJA?feature=share)
+
+[Day 2 Stream](https://youtube.com/live/RHkrQnoBJgs?feature=share)
+
+Please note: this devsummit may not be streaming the entire time.
+
 ### NetBSD Dinner
 
 Status: In Planning (billc@)
@@ -59,15 +67,3 @@
 
 * PGP key signing - see billc@ with Gov ID.
 * ...
-
-
-NetBSD/pkgsrc summit at BSDCan 2026 taking place June 16-20, 2026 in Ottawa, Canada. Additional details about the conference can be found at the official website: https://www.bsdcan.org/2026/ The summit will take place on June 17-18 (the days before the main conference, the tutorial days). We are in room DMS 1110 and we start at 9:00 a.m. For up to date NetBSD Dev Summit details, please check: https://wiki.netbsd.org/summits/bsdcan_2026/ * Please note * - this dev summit may not be streaming the entire time.
-
-
-Day1 Stream (Scheduled start around 10am)
-https://youtube.com/live/GLBcjfTXpJA?feature=share
-
-Day2:
-https://youtube.com/live/RHkrQnoBJgs?feature=share
-
-<!-- testing 1-2-3 -->

Index: wikisrc/ports/evbppc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbppc.mdwn,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- wikisrc/ports/evbppc.mdwn	18 Dec 2024 19:51:02 -0000	1.31
+++ wikisrc/ports/evbppc.mdwn	16 Jun 2026 14:09:57 -0000	1.32
@@ -15,6 +15,8 @@
 
 ### Nintendo Wii
 
+### Nintendo Wii U
+
 ### Artesyn's PM/PPC board
 
 The following devices are supported:
Index: wikisrc/projects/project/audioviz.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/audioviz.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/projects/project/audioviz.mdwn	11 May 2022 08:24:05 -0000	1.3
+++ wikisrc/projects/project/audioviz.mdwn	16 Jun 2026 14:09:57 -0000	1.4
@@ -10,12 +10,16 @@
 [nia](mailto:nia@NetBSD.org)
 """
 
+done_by="gummybuns"
+
 category="userland"
 difficulty="medium"
 duration="350h"
 
 description="""
 
+Work in progress, still needs work: https://github.com/gummybuns/aiomic
+
 NetBSD includes various simple, command-line audio tools by default,
 such as audioplay(1), audiorecord(1), mixerctl(1),
 aiomixer(1), audiocfg(1)...
Index: wikisrc/releng/netbsd-11.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-11.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/releng/netbsd-11.mdwn	27 Dec 2025 10:44:54 -0000	1.3
+++ wikisrc/releng/netbsd-11.mdwn	16 Jun 2026 14:09:57 -0000	1.4
@@ -1,15 +1,14 @@
 [[!meta title="NetBSD 11.0 pre release tasklist"]]
 
 ## Timeline
-Timeout for showstoppers (before they will be downgraded) december 28, trying to move on
-to RC1 before the end of december.
+A first release candidate should be available later this week (before february 8)
 
 ## Showstopper bugs and PRs
 
 * ~~**netbsd-11 is not buildable with gcc 14 or newer**~~
-* **OpenSSH fixes pending**, and fixing ~~[PR 59685](//gnats.netbsd.org/59685)~~ might cause an ABI break, which we might allow due to this branch being pre the dot-zero release 11.0. Updating to a newer OpenSSH then would be a valid option.
-* [PR 58648](//gnats.netbsd.org/58648) "shared libraries should go in /usr/lib/private, not /usr/lib"
-  is prerequisite for being able to later update OpenSSH (and some others) on the branch
+* ~~**OpenSSH fixes pending**, and fixing [PR 59685](//gnats.netbsd.org/59685) might cause an ABI break, which we might allow due to this branch being pre the dot-zero release 11.0. Updating to a newer OpenSSH then would be a valid option.~~
+* ~~[PR 58648](//gnats.netbsd.org/58648) "shared libraries should go in /usr/lib/private, not /usr/lib"
+  is prerequisite for being able to later update OpenSSH (and some others) on the branch~~
 * **Any issues found by [syzbot](https://syzkaller.appspot.com/netbsd) may potentially crash
   the kernel and should be investigated and fixed.**
 * ~~[[!template id=pr number=59185]]: panic over KASSERTMSG(dev->ud_ifaces == NULL) on Dell Latitude 7490~~
Index: wikisrc/summits/bsdcan_2026.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/bsdcan_2026.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/summits/bsdcan_2026.mdwn	11 Jun 2026 13:39:38 -0000	1.9
+++ wikisrc/summits/bsdcan_2026.mdwn	16 Jun 2026 14:09:57 -0000	1.10
@@ -59,3 +59,15 @@
 
 * PGP key signing - see billc@ with Gov ID.
 * ...
+
+
+NetBSD/pkgsrc summit at BSDCan 2026 taking place June 16-20, 2026 in Ottawa, Canada. Additional details about the conference can be found at the official website: https://www.bsdcan.org/2026/ The summit will take place on June 17-18 (the days before the main conference, the tutorial days). We are in room DMS 1110 and we start at 9:00 a.m. For up to date NetBSD Dev Summit details, please check: https://wiki.netbsd.org/summits/bsdcan_2026/ * Please note * - this dev summit may not be streaming the entire time.
+
+
+Day1 Stream (Scheduled start around 10am)
+https://youtube.com/live/GLBcjfTXpJA?feature=share
+
+Day2:
+https://youtube.com/live/RHkrQnoBJgs?feature=share
+
+<!-- testing 1-2-3 -->
Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- wikisrc/users/jun.mdwn	27 Dec 2025 11:00:32 -0000	1.150
+++ wikisrc/users/jun.mdwn	16 Jun 2026 14:09:58 -0000	1.151
@@ -6,24 +6,44 @@
 
 2001-2002-2003-2004-2005-2006-2007-2008-2009
 
+## Event Updates [[https://www.facebook.com/NetBSD.jp]]
+
 #2026
 
-## Open Source Conference 2026 Osaka NetBSD Booth & BoF
-- 2026 Jan.31 Sat 10:00-17:00 JST (UTC+9)
-- (NetBSD Bof:12:00-12:45)
-- Osaka Sangyo Sozoukan  [[https://www.sansokan.jp/map/]]
-- [[https://event.ospn.jp/osc2026-osaka/]]
-- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/]]
+## Open Source Conference 2026 Sendai NetBSD Booth & BoF
+- Booth: 2026 Jun.6 Sat 10:00-18:00 JST (UTC+9)
+- BoF: 2026 Jun.6 16:00-16:45 JST (UTC+9) [[https://event.ospn.jp/osc2026-sendai/session/2302526]]
+- Tohoku Computer College [[https://tcc.ac.jp/outline/access/]]
+- [[https://event.ospn.jp/osc2026-sendai/]]
+- Tour Guide [[]]
 - togetter [[]]
 
-## Open Source Conference 2026 Tokyo/Spring NetBSD Booth & BoF
-- Booth: 2026 Feb.27-28 Fri-Sat 10:00-16:00 JST (UTC+9)
-- BoF: 2026 Feb.2X XX:XX-XX:00 JST (UTC+9) [[]]
-- KOMAZAWA UNIVERSITY SHUGETSUKAN [[https://www.komazawa-u.ac.jp/english/access/]]
-- [[https://event.ospn.jp/osc2026-spring/]]
+## Open Source Conference 2026 Hokkaido NetBSD Booth and NetBSD BoF
+- 2026 Jun.27 Sat 10:00-18:00 JST (UTC+9)
+- NetBSD BoF  [[]] 
+- Sapporo Business Innovation Center [[https://www.sapporosansin.jp/access/]]
+- with [[https://www.no.bug.gr.jp/]]
+- [[https://event.ospn.jp/osc2026-do/]]
+- Tour Guide [[]]
+- togetter [[]]
+
+## Open Source Conference 2026 Shimane NetBSD Booth
+- Booth: 2026 Jul.11 Sat 10:00-17:00 JST (UTC+9)
+- Matsue Terusa,near by JR Matsue station
+- Session: 
+- [[https://event.ospn.jp/osc2026-shimane/]]
+- Tour Guide [[]]
+- togetter [[]]
+
+## Open Source Conference 2026 Kyoto NetBSD Booth & NetBSD BoF
+- 2025 Aug.1 Sat 10:00-16:00 JST (UTC+9) 
+- 2025 Aug.1 Sat XX:00-XX:45 JST (UTC+9) NetBSD BoF
+- Kyoto Research Park [[https://www.krp.co.jp/access/map.html]]
+- [[https://event.ospn.jp/osc2026-kyoto/]]
 - Tour Guide [[]]
 - togetter [[]]
 
+
 ## Kansai Open Forum 2026
 - 2026 Nov.13 Fri-14 Sat 10:50-18:00 JST (UTC+9) 
 - [[https://www.k-of.jp/]]
@@ -35,6 +55,42 @@
 
 # Past in 2026
 
+## Open Source Conference 2026 Nagoya NetBSD Booth & NBUG BoF
+- 2026 May.23 Sat 10:00-18:00 JST (UTC+9)
+- BoF 2026 May.23 Sat XX:00-XX:45 JST [[]]
+- Nagoya Trade & Industry Center [[https://www.nipc.or.jp/fukiage/sub/visitor-access.html#around]]
+- with [[http://nagoya.bug.gr.jp/]]
+- [[https://event.ospn.jp/osc2026-nagoya/]]
+- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2026nagoya.pdf]]
+- togetter [[https://posfie.com/@ebijun/p/lpOl8KO]]
+
+## Open Source Conference 2026 Kagawa
+- 2026 Apr.18 Sat 10:00-18:00 JST (UTC+9)
+- BoF 2026 Apr.18 Sat XX:00-XX:45 JST [[]]
+- e-topia kagawa [[https://www.e-topia-kagawa.jp/]]
+- [[https://event.ospn.jp/osc2026-kagawa/]]
+- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2026kagawa.pdf]]
+- togetter [[https://posfie.com/@ebijun/p/TARTFTx]]
+- [[https://speakerdeck.com/tsutsui/osc2026kagawa]] NetBSD+UIAPduino+PSG
+
+## Open Source Conference 2026 Tokyo/Spring NetBSD Booth & BoF
+- Booth: 2026 Feb.27-28 Fri-Sat 10:00-16:00 JST (UTC+9)
+- BoF: 2026 Feb.27 Fri 15:15-16:00 JST (UTC+9) [[]]
+- KOMAZAWA UNIVERSITY SHUGETSUKAN [[https://www.komazawa-u.ac.jp/english/access/]]
+- [[https://event.ospn.jp/osc2026-spring/]]
+- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2026tokyospring.pdf]]
+- togetter [[https://posfie.com/@ebijun/p/QvR9Tx9]]
+- [[https://speakerdeck.com/tsutsui/osc2026tokyo-spring]] NetBSD+RPI+PSG
+
+## Open Source Conference 2026 Osaka NetBSD Booth & BoF
+- 2026 Jan.31 Sat 10:00-17:00 JST (UTC+9)
+- NetBSD Bof:12:00-12:45
+- Osaka Sangyo Sozoukan  [[https://www.sansokan.jp/map/]]
+- [[https://event.ospn.jp/osc2026-osaka/]]
+- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/]]
+- togetter [[https://posfie.com/@ebijun/p/Vfaj1UC]]
+- [[https://speakerdeck.com/tsutsui/osc2026osaka]] NetBSD+RPI+PSG
+
 # Monthly
 

(Diff truncated)

Index: wikisrc/summits/bsdcan_2026.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/bsdcan_2026.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/summits/bsdcan_2026.mdwn	2 Jun 2026 19:38:56 -0000	1.8
+++ wikisrc/summits/bsdcan_2026.mdwn	11 Jun 2026 13:39:38 -0000	1.9
@@ -41,7 +41,7 @@
 
 [[!table data="""
 First Last | Sponsor | Join dinner? | Comment(s)
-Andrew Cagney | `hgutch@` | yes | discuss <https://mail-index.netbsd.org/tech-net/2026/05/13/msg009413.html>
+Andrew Cagney | `hgutch@` | yes | discuss <https://mail-index.netbsd.org/tech-net/2026/05/13/msg009413.html> and <https://github.com/libreswan/libreswan/wiki/FAQ:-Kernel-Support>
 Jennylee Bellatrix | `billc@` | yes |
 ... | `...` | ... | ...
 """]]

Members: 
	tutorials/kerberos_services.mdwn:1.5->1.6 

Index: wikisrc/tutorials/kerberos_services.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_services.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/tutorials/kerberos_services.mdwn	8 Jun 2026 23:23:28 -0000	1.5
+++ wikisrc/tutorials/kerberos_services.mdwn	9 Jun 2026 22:12:16 -0000	1.6
@@ -155,7 +155,7 @@
           -o local_header_rewrite_clients=permit_sasl_authenticated
 
    You may also want to set options `smtpd_sender_login_maps` and
-   `smtpd_recipient_restrictions` to restrict senders to submit
+   `smtpd_sender_restrictions` to restrict senders to submit
    `MAIL FROM` envelope addresses that match their login names.
 
 ## apache2 (HTTPS)

Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	2 Jan 2026 21:08:26 -0000	1.160
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	9 Jun 2026 05:30:02 -0000	1.161
@@ -121,7 +121,7 @@
 
 ## SD card structure and booting process
 
-Note: The RPI5 UEFI presentation of the SD card does NOT currently work with the NetBSD kernel. That is, other storage is required for the NetBSD installation.
+Note: The RPI5 UEFI presentation of the SD card does NOT currently work with the NetBSD kernel. That is, other storage is required for the NetBSD installation. This is fixed in -current and will be fixed in NetBSD 11 release.
 
 The RPI1 looks for firmware and kernel.img on the first FAT32 MBR partition of the uSD card.  A separate kernel (kernel7.img) is used on RPI2 and RPI3.
 The NetBSD kernel will then find a NetBSD MBR partition and within that the root disklabel partition, and use that FFS partition as the root filesystem.

Members: 
	tutorials/kerberos_services.mdwn:1.4->1.5 

Index: wikisrc/tutorials/kerberos_services.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/kerberos_services.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/tutorials/kerberos_services.mdwn	2 Jan 2026 03:31:39 -0000	1.4
+++ wikisrc/tutorials/kerberos_services.mdwn	8 Jun 2026 23:23:28 -0000	1.5
@@ -77,13 +77,13 @@
    (for Postfix or other MTAs)—and export their keys into a
    keytab:
 
-       # kadmin add --random-key --max-ticket-lifetime=unlimited \
+       # kadmin add --random-key --max-ticket-life=unlimited \
            --max-renewable-life=unlimited --use-defaults \
            imap/imap.example.com
-       # kadmin add --random-key --max-ticket-lifetime=unlimited \
+       # kadmin add --random-key --max-ticket-life=unlimited \
            --max-renewable-life=unlimited --use-defaults \
            pop/pop.example.com
-       # kadmin add --random-key --max-ticket-lifetime=unlimited \
+       # kadmin add --random-key --max-ticket-life=unlimited \
            --max-renewable-life=unlimited --use-defaults \
            smtp/mail.example.com
        # mkdir -m 0700 /usr/pkg/etc/dovecot/private

Index: wikisrc/ports/evbarm/rockchip.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/rockchip.mdwn,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wikisrc/ports/evbarm/rockchip.mdwn	30 May 2026 13:48:23 -0000	1.15
+++ wikisrc/ports/evbarm/rockchip.mdwn	8 Jun 2026 16:55:44 -0000	1.16
@@ -43,7 +43,7 @@
   </thead>
   <tbody>
     <tr><td>Audio codec</td><td>Yes</td><td></td></tr>
-    <tr><td>CSRNG (RK3399)</td><td>Yes</td><td></td></tr>
+    <tr><td>CSRNG (RK3328 & RK3399)</td><td>Yes</td><td></td></tr>
     <tr><td>DisplayPort (RK3399)</td><td>Yes</td><td></td></tr>
     <tr><td>Framebuffer</td><td>Yes</td><td>Uses simplefb configured by bootloader</td></tr>
     <tr><td>Gigabit Ethernet</td><td>Yes</td><td></td></tr>

Index: wikisrc/summits/bsdcan_2026.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/bsdcan_2026.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/summits/bsdcan_2026.mdwn	2 Jun 2026 19:21:17 -0000	1.7
+++ wikisrc/summits/bsdcan_2026.mdwn	2 Jun 2026 19:38:56 -0000	1.8
@@ -14,7 +14,7 @@
 
 ### NetBSD Dinner
 
-TODO
+Status: In Planning (billc@)
 
 ## Planning to attend?
 
@@ -32,6 +32,7 @@
 
 [[!table data="""
 First Last | `login@` | Join dinner? | Comment(s)
+William Coldwell | `billc@` | yes | /* This is a comment */
 Stephen Borrill | `sborrill@` | yes | 2 days may be overkill???
 ... | `...` | ... | ...
 """]]
@@ -41,6 +42,7 @@
 [[!table data="""
 First Last | Sponsor | Join dinner? | Comment(s)
 Andrew Cagney | `hgutch@` | yes | discuss <https://mail-index.netbsd.org/tech-net/2026/05/13/msg009413.html>
+Jennylee Bellatrix | `billc@` | yes |
 ... | `...` | ... | ...
 """]]
 
@@ -55,5 +57,5 @@
 
 ### Other
 
-* PGP key signing?
+* PGP key signing - see billc@ with Gov ID.
 * ...

Index: wikisrc/summits/bsdcan_2026.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/bsdcan_2026.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/summits/bsdcan_2026.mdwn	29 Apr 2026 20:33:44 -0000	1.6
+++ wikisrc/summits/bsdcan_2026.mdwn	2 Jun 2026 19:21:17 -0000	1.7
@@ -40,7 +40,7 @@
 
 [[!table data="""
 First Last | Sponsor | Join dinner? | Comment(s)
-Andrew Cagney | `hgutch@` | yes |
+Andrew Cagney | `hgutch@` | yes | discuss <https://mail-index.netbsd.org/tech-net/2026/05/13/msg009413.html>
 ... | `...` | ... | ...
 """]]
 

Index: wikisrc/ports/evbarm/rockchip.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/rockchip.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/ports/evbarm/rockchip.mdwn	30 May 2026 10:32:43 -0000	1.14
+++ wikisrc/ports/evbarm/rockchip.mdwn	30 May 2026 13:48:23 -0000	1.15
@@ -18,11 +18,12 @@
     </tr>
   </thead>
   <tbody>
-    <tr><td>RK3328</td><td>9.0</td><td><a href="https://www.pine64.org/devices/single-board-computers/rock64/">PINE64 Rock64</a></tr>
-    <tr><td>RK3399</td><td>9.0</td><td><a href="https://www.pine64.org/rockpro64/">PINE64 RockPro64</a>, <a href="https://www.pine64.org/pinebook-pro/">PINE64 Pinebook Pro</a></tr>
-    <tr><td>RK3288<td>9.99.93</td><td><a href="https://tinker-board.asus.com/product/tinker-board.html">Asus Tinker Board</a></td></tr>
-    <tr><td>RK356X<td>9.99.94</td><td><a href="https://www.pine64.org/quartz64b/">PINE64 Quartz64</a></td></tr>
-    <tr><td>RK3588<td>9.99.100</td><td></td></tr>
+    <tr><td>RK3328</td><td>9.0</td><td><a href="https://www.pine64.org/devices/single-board-computers/rock64/">PINE64 Rock64</a><td>Boot from U-Boot (see below)</td></tr>
+    <tr><td>RK3399</td><td>9.0</td><td><a href="https://www.pine64.org/rockpro64/">PINE64 RockPro64</a>, <a href="https://www.pine64.org/pinebook-pro/">PINE64 Pinebook Pro</a><td>Boot from U-Boot (see below)</td></tr>
+    <tr><td>RK3288<td>9.99.93</td><td><a href="https://tinker-board.asus.com/product/tinker-board.html">Asus Tinker Board</a></td><td>Boot from U-Boot (see below)</td></tr>
+    <tr><td>RK356X<td>9.99.94</td><td><a href="https://www.pine64.org/quartz64b/">PINE64 Quartz64</a></td><td>Boot from UEFI (see below)</td></tr>
+    <tr><td>RK3588<td>9.99.100</td><td><a href="https://
+www.friendlyelec.com/index.php?route=product/product&product_id=289">FriendlyELEC NanoPi R6S</a>, <a href="https://radxa.com/products/rock5/5b/">Radxa Rock 5B+</a></td><td>Boot from UEFI (see below)</td></tr>
   </tbody>
 </table>
 
@@ -85,6 +86,8 @@
 Flash NetBSD and the UEFI firmware to separate storage devices, or replace the
 contents of the boot partition on arm64.img.
 
+Rockchip RK3588 based boards also need to [boot from UEFI](https://github.com/edk2-porting/edk2-rk3588).
+
 # Tips and tricks
 
 # Links

Index: wikisrc/ports/evbarm/rockchip.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/rockchip.mdwn,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wikisrc/ports/evbarm/rockchip.mdwn	27 May 2026 09:23:10 -0000	1.13
+++ wikisrc/ports/evbarm/rockchip.mdwn	30 May 2026 10:32:43 -0000	1.14
@@ -81,7 +81,7 @@
 to
 [[NetBSD/evbarm install via sysinst(8) on a SATA hard disk, USB stick or (u)SD card|ports/evbarm/install_using_sysinst]].
 
-The [PINE64 Quartz64 boots from UEFI](https://github.com/jaredmcneill/quartz64_uefi).
+Rockchip RK356x based boards (such as the PINE64 Quartz64 and ODROID-M1S) [boot from UEFI](https://github.com/jaredmcneill/quartz64_uefi).
 Flash NetBSD and the UEFI firmware to separate storage devices, or replace the
 contents of the boot partition on arm64.img.
 

Index: wikisrc/ports/evbarm/allwinner.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/allwinner.mdwn,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- wikisrc/ports/evbarm/allwinner.mdwn	27 May 2026 08:48:51 -0000	1.107
+++ wikisrc/ports/evbarm/allwinner.mdwn	27 May 2026 09:23:10 -0000	1.108
@@ -2,8 +2,8 @@
 
 NetBSD supports many boards based on Allwinner SoCs. Starting with NetBSD 8.0, FDT is used to configure devices. As a result, a large number of boards and configurations can be supported with a single kernel.
 
-[[images/pocketchip.jpg]]
-[[images/pinebook.jpg]]
+<img src="../images/pocketchip.jpg" alt="PocketCHIP" width="300">
+<img src="../images/pinebook.jpg" alt="Pinebook" width="300">
 
 [[!toc levels=2]]
 
Index: wikisrc/ports/evbarm/rockchip.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/rockchip.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/ports/evbarm/rockchip.mdwn	27 May 2026 08:48:51 -0000	1.12
+++ wikisrc/ports/evbarm/rockchip.mdwn	27 May 2026 09:23:10 -0000	1.13
@@ -2,7 +2,7 @@
 
 NetBSD supports several boards based on RockChip SoCs. Starting with NetBSD 9.0, FDT is used to configure devices. As a result, a large number of boards and configurations can be supported with a single kernel.
 
-[[images/pinebook-pro.jpg]]
+<img src="../images/pinebook-pro.jpg" alt="Pinebook Pro" width="300">
 
 [[!toc levels=2]]
 

Index: wikisrc/ports/evbarm/allwinner.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/allwinner.mdwn,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- wikisrc/ports/evbarm/allwinner.mdwn	27 May 2026 08:44:40 -0000	1.106
+++ wikisrc/ports/evbarm/allwinner.mdwn	27 May 2026 08:48:51 -0000	1.107
@@ -2,8 +2,8 @@
 
 NetBSD supports many boards based on Allwinner SoCs. Starting with NetBSD 8.0, FDT is used to configure devices. As a result, a large number of boards and configurations can be supported with a single kernel.
 
-<img src="https://pbs.twimg.com/media/DIRGmsOXcAEJu-j.jpg" width="300">
-<img src="https://pbs.twimg.com/media/DJYA7SCXUAEvEQk.jpg" width="300">
+[[images/pocketchip.jpg]]
+[[images/pinebook.jpg]]
 
 [[!toc levels=2]]
 
Index: wikisrc/ports/evbarm/rockchip.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/rockchip.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/ports/evbarm/rockchip.mdwn	27 May 2026 08:41:07 -0000	1.11
+++ wikisrc/ports/evbarm/rockchip.mdwn	27 May 2026 08:48:51 -0000	1.12
@@ -2,7 +2,7 @@
 
 NetBSD supports several boards based on RockChip SoCs. Starting with NetBSD 9.0, FDT is used to configure devices. As a result, a large number of boards and configurations can be supported with a single kernel.
 
-<img src="https://pbs.twimg.com/media/ENlmzo7UUAIfSM6.jpg" width="300">
+[[images/pinebook-pro.jpg]]
 
 [[!toc levels=2]]
 
--- /dev/null	2026-05-27 09:00:49.821748861 +0000
+++ wikisrc/ports/evbarm/images/pinebook-pro.jpg	2026-05-27 09:01:02.458787213 +0000
@@ -0,0 +1,1340 @@
+ÿØÿà
+
+
+
+
+
+	
+
+
+ÿÛ
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ÿÂ
+’.6:8OIÀæLuL6ÇkÀâ;í¸>ßÙGFôH
çÁûÜ2|Xn««ž
l‚ef6Ɉ†Ê
Ê08ñËî¼M¹4´QzW¥zˆxe¿jxÕoŒ.:ÕÓÓzðxÅ>Îh#Úú'ÄÈö„u9ØCôzV“Ý&Éóx~†Š¨áoôj.wTµQl°C`Â]m@ÈyVóÍ£HÒ—”Óy·’eÌ M«l–îit•´”
3͵U¹Tªz‡Oâ]¦:;×OåvÉß·HEI–i ›Y¹X¸UpÚr^¿`Ó›y™xæff`ffxÿ
+=b0°É/GXÓ¨»4£30Y`;‰Øo3303330333033304Þ€E*"m¸b"¦ÆŒ"1¡
z$~=ŒF’
+mE†A$ZáîY²V»^À²³›á\dÁùþƒvhK)è2ºßO™˜™™˜™ å¾véôc³ÔfÈ
§$TŠ…©Ç¼Éݸ ô{=mæ./D2 x¦“%uÆÊÍëzسl¸Ûʉ¡¶•µ¼uM6·tÆ%£ßT¦”“+“ÐôŒïÞuï·fèüK­­½'	.k dyU3U{,m6z}ÁNó3^lÌÀÌÌÌÀäþ*öÿ
+ñÄ{eð«3
EuÕ²F­*‰µÇ”KØ…ó03330331(n<oĵ4«qʍà.0¸àl%
+±šHË’Ç®.Þõòw³b³Ãþàð®=á˜Üžïtïžoô‡WÎï34åÌÌÌÀÍelyÉË)Ýzím¼q4)\Âù—³ùê߈“1ŽK̃)Ö!	uÚsZ•SN‰ÎÁ#µ­>°aÅì#N¶#­¾!žt¢‡!*$qÌÆÆÇñªö•:Ï°q®½ŸW_ê^}ïOYS#Ž¥$t\Ñ•2É^“çë³f·Ñçæff`fff`fff`c/ !Øðaü
+<¾Båê^¸×R‹ÛÍ*{uòhœþéÎ)Î
+EØ±9_pVAlV!áPªlHÖ…"Äp¨4Çà52AhA F‚
‘¬X)Z
@‹B¸$¡Ü¡•¡šÆæ¬öOo«Zqzñ‡´<ÛœxÖáú©¼¹z×ÍïÙ9Õâï43E7Ϲ!µ÷…¼l÷µê­¯ƒ5½<YŽ’ŒÐàÜ'¥ð&ë‹%aâÞ‰JB¶RæÁHdšdå…ÆW¥ZqBÛ[å¡ÜÁ-§ðb8´Tºà
́)[e½”.©8JŸCtŽI{Ë£²wÏ<÷§¤é±FÑ-9[ž¬ëO(.~«Ê›s^ÌÆfff`fff`ff
+PàD4Îf`j¿a\DªNkÌþŒáÓz)NWÒ¹S®Â’ª}è"Q6DÁ4ä#¨ÔF]hD³1 æÀf†8¢|qÁ4,ˆÅ€‰Ø+J¡ÚÁ–Ò+ƒ\©
¦ö^3ëg>š+3žò›rÒ~%3²r~¥–“Üè“"‡é䙇q:är³¡wi—ëƒ31åšÞ
+Ԉኙ#ˆ8ˆØðŒ
+%Š‘àmŒ%Š‘ÚXÉh4ÒFö„T•ôGÃF!ËffU™˜ ÝàfùtoOÏº…¾‰l¥Éí9WÉ!˜òÌÌÌÀÌÌó÷ <½k‰ó[n湌%¡å#iAM%M)ÛiÅ4b{=u§±¤è–PèÛP6oO1¤œq.6‚¦ßkx›ÏÇ;RºÝŠ)©^·Ã»DëÖz× ¼Î½ÚB$÷R…F˜ËhI<ôûÏ’ÓêYVb333033300R˜ó02
+viÌ|ÿ
+iŽÄT‚Óa’Í×CqE²—%óž‘Κëê†6êsÕ®áŸWšû-ôíq™*.DƒŒ¨?¦w©Å%y:#Jî]2@›NáI‚G
+àO ÷NŽw+“Ã<ü±[;RÂqüTÎSPÄ%Å,	!ÕQ¢ó+
+YŽ0jÓ/”÷S6ÞwЕß}æO@ç½ÄÈ’çYC¡ˆ¬ìYGX*ƒ#¦7“(e\_Š¢MÉÊ䋉XòE‘òye’ná•3ªe	Bñך¥k]Ü廵r•÷Õtš°äÉ"Cm©RöžÐËC;Ú
+ØXÂi¤:Ëô3c1!¡£’#`n„@ŒÐ°ýG¥3”Ú#c¼Pë¤õ¶¡è1{ÚÀÓ¼{y+û—Å|ŸH«%jÏçzÓò+o=Õ°ÖØ6*A¹,–ûÆüšéºÞÞSLìm#M6Æ¢bŽ„£Î\zíÊ¥	$lÛ*ÍÀÏ6€Þ^
 e	@G
+rI¢ÈF•Š¦öém´ã—‰C¾2-L”œ ®4¬†M…s&Èëo$÷Ãöc*\Tº—"ë»ôŽaoϧ¶“V]oƽQj®ÉC9š˜ªÎK—* p›6Ú‹jBæÔ¨Y'ÿ
+¼…Ó +£.¨¢&1M<Òœnf-¦‰xövÑG–C¸(XISuæHÓ Þœ@cˆ@±T‡ñ½Ýi
+N-âq5ºËoÐÔŸ´(^M©8\M¢Þ!é=û”w¯8ÉáÔcj
yûŠY*xí¾¥ÏzZìBrFõ¥ªiH„h—F4R‡S$§½ŠsCŒc„Ð	Ò2ÔG‹hô'ä#äË$qcÒ™Ž@~…0¤<9ÍG¦L&„`Ö€„6éAêy€DœrP?<¿Óœ‡qLÇò„-Ô,†œ¤JÚX<ãN‰õ³°lÖÐÁˆ{F
+ê]Ö
+[âƒyåŽ2EF"¼}·†1
ˆdˆâÍtTæàÃ4"‹!t†qc1b$¶¹Ä€ÅûCÏT« Ïêd-aH6'¯Æ“¶Kõ3Û
+“1Pè/Ëk+}ØÝã¼–†+-ÒÛ¬¦–Öš[C˜äVEä&‰fñNfê^0)f¬¸ÆzKv.qÐs³pUi[`4æñShhRÈÆZôζî4Ö0§}lIæØM¥“Hæ#•!AÇD|ph—P9
+xÁo£:ÓOht´+Ì1qšL¾
+õJã"—*ã!—,ûP™:ëUüžtUܲàW7eP«*³)•”Ú¶5Z¶Mڐ*Ö¬É
+úlzn»–u6$
+½jûŸ"/Øå‹Æ
+ö“ÃñRý®@¼J¯k</9í}‹—ìGäMúÁyk=4Èy­~‰8{¸ƒâ‹ë€³š£ €*jm Žº™@„Â0 [AéŽARmÆ ‰L‹m9&‚AG"=!#¨ìP.†JÀq	Ð+XÈœCè
ÒrEÁœà*NC°rNꬥ:Òp±¶¥TÒá:‹PÏ–m¬ž|tdSo¦±ä†C*%¢¢Äóh}gÊÆ9اf”Šq‰TT)Ãh2T˜2ûm.ê#	“‚´BL£d­Y DgØXúuÑGãË•D¯Zùh!¥¹R›³Ž·
+)ª‚.O2—»³Œ¡*þ±óåtWœs5ô‡[¦ÌÙñgA·U]ðÉÂçÆ\p¨ÃØÓ’
+»¨<m"êŒó%‡F•‰ÚA…ÐäEd †¶(Á¦Ü*²Í½¹ª{7D…)›º¢µ|bJF®¨7v†$¯99 Ê’ìÕ’q*ØØ4LkÓh€´N£îDAï4ºÞm$¡Sz¯a}Ï9¼Peî-ï0Îv·¡½¸G9ŽŒî}¤ž´ŽÍLNì·;
+°<y-Jº*µôz®™Jó«,<» ¢È[¬qòj(7j5Ž.É
9?K­y¶ð×=
+JÛ5}¤L‘¦\ýÍ®ùïÑÌ…d¾'Ýx])ŽëçyœµˆìÛÖØòzuÆ£î/!¦Þ×<Ѽlù·«¼³cæÞÌÁý¯›€Öº×'æéôEëÎv¸\í=€.¬¸osá·>>ŽÁÂmöMgÅúTݺ6³á­*»Ýº¯w'‹]²W¸úYS¾òšðºï#A‘„³-”íSHÒôç£õ?÷ÃB’“
+[L¤¦Þ:cO­ªD»ž\v55™Û½3š'‰¾ñÙÑr1ZZM$u°¡Ê´¸	ír…™¬>)GÚ³eµ$N¶ÊUÅÌ׊QšC:Ó¶›Kƒ‹[w0õòÆŹšÒItè&Ç9LkXx½t´ù7Qæ7"j;Z,xwÙ’ýZ°ÁцŒù5ßZù>ù/b¸Õ­Ó.ôzk“¹ô)l wþ
Ò$–¤ÌE\
k¯ Â”ÒqëÅҁ³ÖúÎu"o5¥Ó¹¬ý
ı–Ëä¾e‚ìZÇ!Ž‡ê9ëÎ¶Å£Côîs)\è·됗/j¨¤µlÝjÅy¨#jåÏåûr8‹F¶QWšq³[Z•
‘ÊÃ)L„Èå­wDm@‰|t9è9v‚ú*Y£
”°N²#;‰!ý08žUÑ(÷YFn,DïLÄ¡O‘ˆVeš=:VÝ)Ž§vZ—ëQö;BÏDƒžL<œQr.+<ê¬À¬5òT[Úeb7¤›K–Çudâþ-K{q	¦nÇj7xãsL3qnœç‰îƒÌ0dëkmŸ§üèËuD€ãõ‡¬SRzÇ"V­1úsˆNŽË5«šË#’÷ŽÞZäë³¹sVé<ÍWfç>*7QªyµÒ™×¦ªðxZ˜šíÒ¢"®Öøi¿sPžŽ³gIG}à͵V¹WXäÜ?°3~PQZµV
+f12-–ƒ
+Ëͱ{K¤ñ#[jŸXšåšW
“-¼îÇJ$‡—,¸¤l$$;"m¹0Ç@†‹dáJã·>TŠ
äæ!¶µµm+ð4ç:o{Yï3>hC†–á*0ø”GVîG›jDU¡ËB©§[U:ÂQV½To$„•1K+šô9ÖÞDÁ­Ê̼=†ÑO³¦o°k`]kE29ü)ÃóQ}Ö—Z¤”+ÔT»ŸµCiMÅ“žÚ«*»wAó„„Uˆº“´U͏&gØžQÆ
+rb<{çž:éÛyH(;5až£âqðFÖ®” ²tžsÛžCzú?)ÀõÞlÆáä5´¥:F%bô/”zWc´
ÛÉÈý	M»K*õ7ZU-É"hmãâ`w€T\t–28Ö1gÇ=2"´\EÚK=y—L³ð†Gè…‰Àå°L¹¥M»/hä–Û
+¤ å"5›
+Çc¯K”ÖEÌÝcoo7FäŸ*ZnÂôuròãèFGäËéÀ7aU	¸®ŽT_Vy…±#ç"Å&á^«#qC\òNb”îUĹÝýƒ®[îaH6Ë\k—[î|áÕõŽø—>ç8!R/4èvú	RN) Õ/q¬]"Ô
Œh4ª7!Yá£Î¡U{:,&C´±d3¬v¢Îć)‘¬²ÓgµCØhwE•¹èe=hîväYYúË,V‹eR¹È2k¤ÓcnN&}*k.1±fZ:ï$µ¼ŠêMYqä!-,rTîôZvèèÒ5¶¶9Cm¡²<áÒøÏ@Ó.©ô™ÓÊæµWªì+9Ô)nØÍ!rɝ®Hf¼ÚÐ3
+nÃê[Ÿ ëY4y
];˜·Lè¼ÎææV(WêŠáLêÞˆàþ˜›s•IÆRruç²LzowÒxèkMiEètE=´ë-)*ÁQÍR¬Ï#5Ô+¾€ó3FBš(¹÷s㾪UÏaz·%Š]ΡH»­[Õéy}]g”:Žª](an«tt¼Ì/A¸Tðë¥@ƒê¾FÝÚe û¾/1تIbý^* )Ã+Î6yöš­³uæÖJÆË¡•‡ÅDŘÚmZêx-6:N!b»Õ,--hèÆ¡ lm%z;Îœ}sµ
+Ò[FFïÅÈG:–gåH$¡éŒ|<Âd¼‚€1&RÓflA¹N¹ráA¯m<ÞtBÝ=9t¢ÇA»sà–8
Z6$à”a©%\ÿ
+‡šRÞžžÝmä]qjpH(Óx>Ô¸„
+ÞÖ:ÉÒq"CÍOmuN—D¬Lìô#	¦J=M)QÅ™›!¥ªG`éË+ÒȏJƒ
+¨eca 2ÜHp!²Á’6§Œ[é——R(8µ0ÂÚ]eÚø¨Lœâuº"‚‡IíœDmý6Íe	F(—÷ôÏœë>A/“¢ýCCJeé:H‰¶Òl‹K¿$í¼”PÚw	I@”¿èÏ4úrO:Ìê.ÜKh¦—¦ÅV`•Pdp+¬yy‡Á¬¸í´IrB¥½ÏÖŠTéM	H‰8c
+çýOžuõ1€ÚãQóûtǺ˜ëázöóĺD‚8¤•±ÏL$:¨Å”à©&Rƒ8ÂÇÞG¹×¥è°ô^ÓɍX—„rGØ9e
Ù+Ä]¸^Ró· í®Ýe³©ÐZ½ š3Vø4ì†D§Hôkš»¶qô^‡CçÔ&vD1G=”‘'
&αE¶Ž´åúu‚]ÖIê<Òj_vXÏš¤¶›x©a éÎ)8Ó1ôÀK
+´Ii]%cÇ*`´ÇRœŠ6<fâk¨]SGF˜Ð.4E©öœ=Š!ÖY!jíF™OG&‰Äh,‘‘QuÝ9iZI¤¾µéPõ%
+î_?~‹ó¼÷Òci¤©'œMõ\ùöºi¼“hµtn(ê®ÞOt;.ù®{Kü9´ûãžyZD=ç·GèøYííñå•ÖÉÜMÎs„ôæù»èè®ó·]t
éD
+ÔE`VuMÍɤ!Š&¡•P³V’‚»Ð/Š’´Q!A½Ö‡±Uí¡)Õ¹¥·\¹¥6éWbl›4³ûŸëšeÃj7ú¤k	;S¹¡}ہukžZ¦	ŒÚi+à,MÂĺ.ÙCƒ-²}
+Õfâ·A£´5¼Â’mI,=ÛËdr9Y„³
lšüëì<Ê-B:‘§¨‹LˆicñÅU$°JrC%lº|a‚L™¶"ÞÆηÕ}/EÓ^¤ÉÏË™ê]‡•|éôÃæ›t|–ÝÜçÞ&²å•aTÕÕÀ£åå×4Tôç»é2OV!¾;¾Ðò8‹}áaÀXôv5ç—ýàyÇ=‚¼ë¿C6.
+]˜@,¤¸ûL•ý9Ça¶7	Ç@"ðÊQXÉV	¥¾#8ërœ¢ÏôG¤î}Žß6ÃsÇ(gª¼Åû­-ÂÙ·¶ã¼§&þ9Y©Xã§A	¸Ce1¥ùJukbŠÇǧÓs—W]Ñ„êYkÓUœ·lUeØÛNR­Éé¸Üb¦–âRÈDK
+;°bb"PâÀ&¥XN0iTµ†=Tc,¸ˆfPp†u¡@±aC+#Z™
+¢-c§TU•	ÔX¹Žâ ÕÁ‚鈹¤)
ÜÐgPäÔÕ9Ô7X\îÔ³Lx!§YBQ˜÷NÔG}S¢N›ià™*ñ4
‹röKŽVx“9 ‰ %z‘j9Õ€’)iá›(Ñ.–]M´Ô1T¿rE(u̹*	”øÆ: ¨×î%0g•):S­+é”⤷Ù(Xþžs!ÐKÊuÖˆÛ¢Å<à”Z\+oºð±Õ¾’žqÆÓÒhWìéO8ôVfž®k@Ã.‹5µ¡ôó(¡í±¤:„é
©{©ÞöBKº¤Â]PÃ
+Y.«ÌÙE7–úƒZ“QÔ€‚
²št;o¢Xéq—2KjŤ;O)è ä¥6CnDÓ¬Lšh”¥§›*<iÙÌt8™MŽK,fÝST×¥·ZÕL-à	Lm±P¬©ÓŒ%O4™‰—Ì~6A’’–ÌcxÒ.œ”Š’I£¢‰B°¢YBY§¾ia…!e7’þœVC£¹L‡‡u„•´¸=¸—[$ákA)mô¾ïN¸ëµ:NŽÒqç6©dè¶Û!'	¤¤$Å-^(Ý)
+r"]c[ÚÓaå$JÍí6ÒC ö’”cãé„(wšu¤º$iÆ©i+Æ1µâlqnÑËjkM5DkRQÁÀ̔ÈÓèHv_CA
Km‚‡t;O Í±LÛC–:aý’
+JZJE M(4’Ô±Úu‡"ã‰qÙnü¨›9Œµ4DY
+3 Ñ¯8èÐå4¦œÛq·ZU´0½mΔ¦¥©+P3µ%½´­&Ö8‘(Ö7T:ÚqñiÍ1¾aÔyëšk2,iãž0ã› bFhÑ€qÍ&[!¦Ù–R³lD¸…l2CNmñ€qÊe Á62E}µ8”äÐ퐛ښC8îªd{·œ;‰¬øk
Râ¥a9´ûâ'Ï¥s"v6c¤7™pÁ¹’äÛÌ4fŘ4ë1HµÌËU‡³%%Yˆ–ÌÇnHæ1Ò³•æ	Læ
Åf³w072¡ƒó!ÌÁî`öe‹‘̆Y9‰É?˜åÅfM›25`œÉb;˜&u˜Û¯f	f	·³Žf&@9ŒiY€’óÞ`2æ`:F`8ŒÇLÔ3¤«2 p3Øy‚LÁh\ÁmŒÁè|Äšo1¶ØÌI†³*Go0¡ÙÌLx¼Å,£165˜1H{Ìcæ:F`환^Cæ(-9”ˆVbÿÄ
+Tm·Þ¢;Wز{VOå>¥—uÈ{6,EƝ“·‹“ãdµö¹û3É#A²Æ*8ö«õÊÛ¨œG×q|€…ibQ\¶°ÿ
+s½Í\9×
ë…µlM
+zqGÐ&´}Éê=-mÕŽ¯+j–Èä8³S¾.k%†ÄZ`ñßèùJuüT¨ é»6Åé•(|@[ë°˜›™7“#!K>UñݸÉN

+ŸÚ£èñV]¸¶ü(†¢»)7ò6T.ÊÅ”"lAOC—*Cæ¼¼gÜÑ$”ã‹i9ú®„>-™&¶ñD̸„¨ÅFjàr†QXGú£¯r£¥ec,›zÒï cÒ¾»"jµGÇß]Xµ¾JÏTáí/ïq—˜-}9¸½Ô÷FžRîîã5PXá.åŸë$ÑEBhÈä?ý'•RžD/q)g–rµ5À54åÒWØ9Þ¥o¬Í±šJ”‚g>Ý·©M0Þœ¡©`ï_ÁÙ·ñ%‡eå´+moªói§ð“;M2©Z·RO‹´êã±éyC%òszO&gP°Þ›ÕIµk;ñÃk{ŽÓ,Fù–lAþyQþNâ¹2ž+^>¶öa¸%nœ–6ftX†Ï¿ý3n6⪟HÏë­‰—nä‘7ôðm6^»ˆ˜pñ…É‹5¢ßàê˜á*7¤Þ—ïËaϏô|Ï¿öO*ZìŽÆ£­¥Í“û\h©£ºº×6-a¨t~9o³n™‰lâŠÏbä´­#•7CõËH©_!K%Ù,’îAÿ
+b¢¥cR»TŒw”ñivôì
+#]›Žéw)Ä´/J%Jdbß~´€­5 ãJ7>'ù®CgBµ}	ôÌæ+ÈHÇ-Í·†¦tÓð6á*#IRpJØ'úõ€k KÓ-dwG*l.ŒÕ«q¢ÿ
+­,lŽr“Æ"GÞrxäÅb߅ͼÑøöäCœÐŒ–²Ý¶TzF­Ï8n0ÏÆð®’“yX\T˜ˆ?[ÜSÅG$wÂóâÙÈ,ïìo ¿¶ò1â½ë¸5	)d&£›Ð¸Þ„¤2͹Whb]yw>æR´'Ü4”fÞ»À2Iµ4Û“8,Òr.ûÓIÄ<ÞÞRYååSIõ’@ÍJþ¤a[ûb Hä‡'nM±m†äŸbšëPÙAñmMm€9ü4–îÚ½´‚FÄ
¿-’…5–¢y³t3VK_æî0w§m¿ð’³t[bîºðR¿7ÈIÕi
+tÛJºþÿ
+iÃSÉõíônv-05$¤SNJ¼›—èó
FVjv¦ššOM&ôòì]¦’‰_rÍJN˱	»ŸáFÿ
+LmZ’G½ñÖén-ª6¨Ú¬dã6d~ÓGÙV÷—‘Ò_\мzY÷ àÿ
+¡Q•ž–ÞE<xÉåw¹CÈóûJ£|¬MúR~3©ZÁÅùMã[ñ}¤cmé
)Ù®]Z¦0Ò㈥²aBÜŠì@ÿ
+j ÄÙ†LE¤5õ@gW©JÀf®ðW¶WpßÚÿ
+-[Ô’}ÃVæ­ã’y<ŠLf*yⶇ]këC+H]ã
V•l$’]ëŽÔx‘35²BÔ9㼜þÓoWñ¯-_¥æC_^¿$nv¹¾úÐþZ8ã§4ÌÜXÈåµ+¦Xëhé÷$û(¨ÌÎͶÿ
+Ã{­|ï°Ë»í]¾”Ò¾äK²ó5Ëcò>½Ÿ^é\w€L›“zí4[qÛ\÷§˜l^¹®Ï&ÕÙ½r$¼¼«— _z'Ü„îZ»6®{Sm[×ñD“_Íxð°¾LÍI”ÔR±¦;˜P0‚5hçˆ9®NÊÛ˜(75éa@ô”oq¨VÚŸù›øòÖhbô–§ÿ
+u·ÇCRÚôæË3M9Úa$áx­É4$åo<|¦Ú×ÈV¼/Km^È|­5íQɵ$›Ò½$”¸ý£oHh£m2Ïé?üs÷‰ÿ
+ßaÌoêÜ/û¿§;Ê-|&‘»Ãj^L,7ÚÞ’(évÚJgqR»×>U zUZÒÚ|æòªŠ‘¶­ÉŠÔ²šÔY²°Åܽ¶–ûÊncðF’F¢Œ[‡_ŽDe]пÔpä.?qÌc}’óv!‹¨}	~Âtu€›[’”`3³!S¥*<tl‘Çk%\[¢ÓD*Bï¶çD‚E„¯r5–<†a%®>n«äuµ×ð{	Ô`
+ê—.&ý&LFR“
Ý0÷õðÔx+º=G‚RaÂÒã•hY ¬„=bçëc'+šòƪŸJé_îä–
¨ák&ȲèO.i¬vw	—¯(L иü°ÄãµMÜw€Ëµr®uÙöW¡\ýò Vƒ®t¥˜
+í-Ã%wšivћؘ3ƒ_ W54	v-E…E¤‰¢ë·#É€A¸­ý¡Ú¼E8|&RÐßãr(cy˜»PUmyn¼…~îÒ3
+fÞšHÀicÚ.Ú·K‹¹´®ž]?Ž¢E5r¢ÍSŸ¯˜rg¤õCÇcŒ÷Kû¹!o"ìýµ´»Ê¾ýpXþÁšÙÜ &Ý„švÙ{)™¡VN4#<£Œµtqµ	šdzçˆÝÌ„
+!fçpW{I>;´VìË ø×
+æiš‰Ú‰Of‹û’QÙ«•§/j}Ÿ«n7þj=ÍN_ÿ
+ŽZ‚ãfÈOÎËÈZÛTèï cüónñ[ù¯G9Åy§@	°÷V÷Øïê‹:ß<µ3ûßjåìH+–ÕʹÑjæA/\«qD®ÇcD[½v>æi
+±pyÓ-LÔO½÷¦q[’yQþ7¦j;­oì“\ëzk‘ÝYMì5[Íá<`²À~—ù|V*¥ò¦†›Ëjq4Þ=ÊÇ›±ÈË73hËãœô‰kâÇzÆi%¿ñ»ŒÉI¸%š¦c·™2òZé½MsÑlü–­Qç¿%ÂÜU?\/2À<©Kê¹Y‡+K*…=L¤4r¿'Sqò^„©*ƒWD‘œ51‰iÆê'®\„Ê8GÙ#ò’9Y%vøÅ"ò ºB£×·ËBí."ü4ø©{¬ð²ðÈiY¾&¶ý¡'¥z²˜v^7læÚdRKK.Ô³mI&õ”’ÔSmSM¼Ô-_ˍvµX]Ekwý1ef¿ñß—õ1Ô~@³oµr¢ÔW*ä+ŸÛ•4ۘߖÑ®DW?[û§~5Øi¤^%†ÔÆ»+ù¢}r®^‰;QcLåék³ôí¾À0­À¢ikHZ|üÿ
+´ª¨Ë*OnÐ’¦·Qi¤ÿ
+îRFN‘\KTi"Î[’DpK’o!‰­{8±žX$Y!ŽI’Ùà‰e3Ämûomn¬Í¼j)ÕèÏÅ¥ºš^K!#B¢a+¡…ÖkYzŸUDM¦›‘‚¬„„Üc¶—ê®i^„”’û»—x{}Ç1 MI=$Ô³R\K”³3V+CRØ(ÖXl–©º›ÅÏ{øÄÖ?ÃØÛååºÓx½þ¼HvÖçmÀ­ùP5΃Öãmë}菨’”ŠÝ«—½Á­C»º¸ÌhM¥f“†ìÔ±‰#Ú¿ìCÖû¨û¯÷Í;ÿ
+×ÆRF±ÑºcSl¡ä–•¯±Wÿ
+ó-áÏk|~ºþœ5&œŽ¬žë©mo®9ª°WÞ/òæ/ÈV³dìá©3±Šlÿ
+-tÇjá%uÊ‘2uQwu‰·3LœSêìÖåy,H霮š¦"HùG´"dY9²²SöB¶íû“?Û”›ôÉ
+Åqq	&šUVtIešN'PCűmÊÞÂp—·_±Ÿ‰š”îRA@©¡Âƒ ¯BYV–yjÞëj[¥¬ÖE1÷7WkwÖõÉÚ;šŽåkäÃ"êGå•Þ½P5ʉ4…ßjuüQ5Ëaõ­ý®DÐ;5¦ò÷x,Þ;ú…ÎEq†þ¤ôԍmæ]
›:cN`;³7Lê)²þ	ÂÍe¬¿§mŽŸ\Åò³ÂÜÒðþëMÖ‚àï®êíúe¼k¢s'/਍d¼_®1Ï<[Ê
µê„D‚ŒµãlŸöæ€Â3Íš_ä²–Ø‹§Ò|ão›DìMƤ»žÒÕ'"@¢ˆ•á+‡¹»’ægûÓ¸«+io¦þ¥¡D֍_Ó6˜é³‘¶­y˜ü>¼
+Ec#îÈÄé,m4²,!h[ñAÏŒ`HŒgåü+
£E#D4
+»Gp‘WïQ,J`zÜrN¦´š7JR3î×PF
pˆnœã®.!6Ru˜º‰Au)†fA=jü>Ã÷©í%ˆInÑÉn·
+}“56? xwàsŸ·”W¤zF¤o@×nÊ&«EÒ¹&èÛTw†®lìò1ät4‚®"¼ÇIÏÖ;é/6««Ÿ“rõ½[Š&‰­ÆõËÞâ¹}}þ›Šä+ph±ó<‹Žñ^¿Ÿ-•ý´¢FR—5Ë^c/4ïœ<…ƒ­7ýJân_hÝP|±¥qÙŒ–KiÍ`WƒMtA=	½‰ö®á]â¾@Üܺ=ö	«n3ñŽV{ßé—P^Ö¡ñ7t¸‚Ùø]mS»ØxïMÍÓ}aÊa2rê+©4E®GÐ^k;kŒ>«±È9™e¹Nk*Øî¨ì㌳.<éí/ÙµA&ÆÜZ[y•´ô:"ÊÖKü†‰ÀC¥t¼ïëΙ?ÿ
+GbRO¨¨J±…ËZÇ_ܱ¨›T5”Ù3’¿‚{yàhÙŸÖõʹW2Mö ]év+¾ô¬vÑã¾åCHwšwšeæ++RYG™Ò¾UÄe/ïóZ_'miâí
œ¬ÿ
+êlÜÚ][-`u^oMɉÈi]v¹%ö2NÝÕ½[goA–¶”,ü‡uZÙ?ᵊ|ø´üNq©!‘fšÓYfìj?&´ÖþWÓ–šwU=Ñú÷l߸ó;6¿h§[¤ØHwVäÚ3Gdu^[ˆÇéÜKËï'äÝ
‰—¨q‚×E]ÜÇim¯5$º³Tÿ
+?c°–ko°
+ÉÃìR+³0@DK-e`ø¹xŸu´ýø`Ê´6Ö·W—b;lûÎ˜¦¼ÊØKm«® :ñÒ¿¼0×QþVÖAùQI™u£™‘Å¥ÅÅýÅõµý‹EýµqaŽžò¥k<…Ñ‘¡2ÚZÜÛ<tV·ý
 NÁ–½Võî¿šÞ¹nA¿èÄQ‰V)î.dŠ{\,X¸áÌ~?¬¯,WMy/¢¬5
…ë`üƒ›·¨u¦:X|¯§S¨nì"”ɶå% è{r,þœ›/ZÐJ´o$Umw8Ë»;ËG¯í´¦cMy?IMçq÷6Ùèlmqš‡
™ÓSÿ
+s›\ÆC†)
+\e
+ø+¨mïu2\ŽQ†J('·qN²[ÄϬµµƒP}ÈjßjÞ¿î·Ørõ¾ô6&æovJ×U[b¯Æ“%È_™­,"Hù,žЙ™üy­o4Ž–>$ù~Bó?žcI.V®ÄlóÂ7‹ì4¡¯“±—|+~4
c£V™rÚ’Ê^ä¯Öèªã5.NŸ_^_ØáNÏ!ä|¼¹Ì–—ÍI¥ò—s,÷'ÐÜSG“pc<[ÅÞ#¼òLx{Di§ìP<£æÝ;ãÛ]mä-K¯2FMè:‹)*[ëmCc´‚âúç¾Íi¬;	_aæü¯ùlÄüçsëOÙ$8¨¡`ýÿ
+ZHb¸W\•²âr8H%²Ãdó7Pä>Ûâ’üa¥E”È:Ý€ÞžE5¶ÔÛTR=´Ü«zFd<©¤3IÃamk-ýͶ/Œ¬†»ÌËoíª2Þ …»œÔŸÁø
I§®<•©’åµw%
;
®÷ŠîL…ÕÕC)¥mÌï•ÇÝeö“¾Ž®ð×1T–,´Ð:™DŠGªYÝ*B$¦V¯uèîxÁÈå^«z
+'ß*Þ¬í'¼›EjVˆ‡­4þa~H4×[S\z×YO…¾"MëNZ“m
´Q†ŠÑÕ#eyâä¨L”‘Ä
+¶‚ÐYÉ «^ðÂÞîI/#’Ý~ûGyÓ  çq2ˆ˜QŒÌÑÜÂÖo´|j¤§'Ù$hâµ2ü;>›{tjÞ9n2GQ\‡›6ñ¾sבًUÜ«ì•S[RîHTßþÅè6Ô€Z“‹…–îÐG•·eže¼/=ô 5¹¡ÒÒ\Ñ¢j‚sg,›Í&ÛR
¾æ·ˆ÷GôßôŒª´“™+‘Lm®ÍJ¾€]€Þ´‚¹Ö¹à­
‚k­7‚·7¹ldå-k†¹¼¹ËÜÌ{$%.'ˆÅš¹Jë5Õ¬Æp»‹ÕZ¤„àíɳŒZç0P9È銺ºŽ;ÜBR5#`k‘¯TTQŽ¿Š‡óõ¯T(֝Ó™Ù—Iþ>‹l ’êÒÌMe{ž€ÙduY}ªÐç¯òw·Y)»nXì12ãÃ}ýG#©t™ÅEô¨%–®&à]b’–7TRáž4z<© j"Ä¡Q™ú.)mšgamíbËHÀ<×Á£è¹ì…áìõ_]4µM$Ù¤aàlñý‘üiR–çˆd…S”pˆV'­º3Y€ð«/¹‚ù%w¸Æ©$õ4Í]á—PB¡ ¤d…
tÓ[îYJHއè(U…›^=Þ—º³¶PÛf^5$qÉV™L†:O•w˜¸¿ÀOŽ’Û™¼dÐùf—-…ÊažÞXbeØÑ*¦}åêDóá®îp‚i*"¿Šÿ
+´N

+Óxæ5Ã…¾Z%·¾R9ŸµXáòa㛹ŇŽ°°Ëi¦°–uxØëjü¤MY¨fÌÙÚxÏ^]
¿\þðA9ÙÞJãúzKG[“QE½$]**/uº‰¨¬…O66Ú[?0êìMŽG'q”º&‘¶¥-$²Š°ÎYÎÙm0²ÕŤ֬
µmî6’7Çë\Î>´W‘´¾PÞ¾ÂOfFáFbÕ–¸’dÉâŽòÆR4bž_z@^FúÑ®[Wòvô·dJÓ÷½òi+Ç{N)¥Ú»ԍïRYãg¶µ_`õ¦í;n¥wÛâpdµ]Œ;ÑÉ4½†‘‹Ò¨fë()'>§¨Š“~lŽi­œTÊ`¶¸qñ/kkunÓMsoÁÁÎBÕódJ¿,«0–Ò–F6û$²EÐ,*bw˜[™\;üv¸4¢Ih	 Ž/Ü·K×ux÷Ñ3˜ –:v[ÝĬnZ×æGbvHý=æË}
+VßS²ÝØ´uÉÖ¡”H?맮¯ÚÒÒ;UÈßS!1¸¹Çà2ùÁøþÂÔEµºËl”Í}3IxǏ³å0(ÈHѲE¥ëÉÜE©Ÿ!q–‰"æÅVŒŠ(¾ô*Hi-Å$[Pú׳QÆMHÐÄ"*I§–€Þ•UX‡º…Ñã}Å/Am)ˆÄ~LåÜm%íÌÕìÑ;‘½
+Ú¿ìÑ@k¬ŠØƒÊ·¯ãôåï’6éÍ{geqe˜Æäãgõ#!JV³»á¼ØVþ´•§	âe{VhÐBõÒ²‰­’9®#â)°é‘)aŽÜh@ŽŒhè†è”ºÆLP¬üù¥=»­{
·t&éá6ÿ
+…ØÚÊ•@X1Çä.±Ó\\c54òZË

(Diff truncated)

Index: wikisrc/ports/evbarm/allwinner.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/allwinner.mdwn,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- wikisrc/ports/evbarm/allwinner.mdwn	8 Jan 2020 06:45:15 -0000	1.105
+++ wikisrc/ports/evbarm/allwinner.mdwn	27 May 2026 08:44:40 -0000	1.106
@@ -93,10 +93,10 @@
 # Installation
 
 - Download or build **armv7.img** (32-bit) or **arm64.img** (64-bit) from NetBSD 9.0 or later
-- Write the image to disk: **dd if=armv7.img of=/dev/rld0d bs=1m conv=sync**
-- Install a board-specific U-Boot (2018.05 or later) from pkgsrc to the SD card
+- Install a board-specific U-Boot (2018.05 or later) from pkgsrc to the image
   (the `u-boot-sunxi-with-spl.bin`-s are provided by `sysutils/u-boot-<boardname>` packages):
-  **dd if=/usr/pkg/share/u-boot/&lt;boardname&gt;/u-boot-sunxi-with-spl.bin of=/dev/rld0d bs=1k seek=8 conv=sync**
+  **installboot -m evbarm -o board=olimex,a20-olinuxino-lime2 armv7.img /usr/pkg/share/u-boot/&lt;boardname&gt;/u-boot-sunxi-with-spl.bin**
+- Write the image to the SD card: **dd if=armv7.img of=/dev/rld0d bs=1m conv=sync**
 
 If your SoC has a SATA controller and you would like to install on
 an hard disk and use a SD card only for u-boot please give a look

Index: wikisrc/ports/evbarm/rockchip.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/rockchip.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/ports/evbarm/rockchip.mdwn	3 Dec 2025 04:32:26 -0000	1.10
+++ wikisrc/ports/evbarm/rockchip.mdwn	27 May 2026 08:41:07 -0000	1.11
@@ -72,9 +72,9 @@
 # Installation
 
 - Download or build **arm64.img** (64-bit) from NetBSD 9.0 or later (found under /evbarm-aarch64/binary/gzimg/)
-- Write the image to disk: **dd if=arm64.img of=/dev/rld0d bs=1m conv=sync**
-- Install a board-specific U-Boot from pkgsrc to the SD card
-  **dd if=/usr/pkg/share/u-boot/<boardname>/rksd_loader.img of=/dev/rld0d seek=64 conv=sync**
+- Install a board-specific U-Boot from pkgsrc to the image
+  **installboot -m evbarm -o board=pine64,rockpro64 arm64.img /usr/pkg/share/u-boot/<boardname>/rksd_loader.img**
+- Write the image to the SD card: **dd if=arm64.img of=/dev/rld0d bs=1m conv=sync**
 
 If your SoC has a SATA controller and you would like to install on
 an hard disk and use a SD card only for u-boot please give a look

Index: wikisrc/summits/bsdcan_2026.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/bsdcan_2026.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/summits/bsdcan_2026.mdwn	29 Apr 2026 20:26:12 -0000	1.5
+++ wikisrc/summits/bsdcan_2026.mdwn	29 Apr 2026 20:33:44 -0000	1.6
@@ -26,7 +26,7 @@
 you would like TNF to cover your ticket.
 
 Please add yourself to the corresponding table, so it helps everybody for
-planing the event.
+planning the event.
 
 ### NetBSD developers
 

Index: wikisrc/summits/bsdcan_2026.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/bsdcan_2026.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/summits/bsdcan_2026.mdwn	24 Apr 2026 17:48:38 -0000	1.4
+++ wikisrc/summits/bsdcan_2026.mdwn	29 Apr 2026 20:26:12 -0000	1.5
@@ -25,12 +25,22 @@
 sponsoring a limited number of devsummit tickets, so please indicate if
 you would like TNF to cover your ticket.
 
-Please add yourself to the table so it helps everybody for planing the event.
+Please add yourself to the corresponding table, so it helps everybody for
+planing the event.
+
+### NetBSD developers
 
 [[!table data="""
-First Last | `login@` | join dinner? | comment(s)
+First Last | `login@` | Join dinner? | Comment(s)
 Stephen Borrill | `sborrill@` | yes | 2 days may be overkill???
-Andrew Cagney | `-` | yes | sponsored by `hgutch`
+... | `...` | ... | ...
+"""]]
+
+### Guests
+
+[[!table data="""
+First Last | Sponsor | Join dinner? | Comment(s)
+Andrew Cagney | `hgutch@` | yes |
 ... | `...` | ... | ...
 """]]
 

Index: wikisrc/summits/bsdcan_2026.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/bsdcan_2026.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/summits/bsdcan_2026.mdwn	24 Apr 2026 07:46:17 -0000	1.3
+++ wikisrc/summits/bsdcan_2026.mdwn	24 Apr 2026 17:48:38 -0000	1.4
@@ -30,6 +30,7 @@
 [[!table data="""
 First Last | `login@` | join dinner? | comment(s)
 Stephen Borrill | `sborrill@` | yes | 2 days may be overkill???
+Andrew Cagney | `-` | yes | sponsored by `hgutch`
 ... | `...` | ... | ...
 """]]
 

Index: wikisrc/summits/bsdcan_2026.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/bsdcan_2026.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/summits/bsdcan_2026.mdwn	21 Apr 2026 08:17:56 -0000	1.2
+++ wikisrc/summits/bsdcan_2026.mdwn	24 Apr 2026 07:46:17 -0000	1.3
@@ -29,6 +29,7 @@
 
 [[!table data="""
 First Last | `login@` | join dinner? | comment(s)
+Stephen Borrill | `sborrill@` | yes | 2 days may be overkill???
 ... | `...` | ... | ...
 """]]
 

Members: 
	summits/bsdcan_2026.mdwn:1.1->1.2 

Index: wikisrc/summits/bsdcan_2026.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/bsdcan_2026.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/summits/bsdcan_2026.mdwn	21 Apr 2026 07:56:27 -0000	1.1
+++ wikisrc/summits/bsdcan_2026.mdwn	21 Apr 2026 08:17:56 -0000	1.2
@@ -29,12 +29,14 @@
 
 [[!table data="""
 First Last | `login@` | join dinner? | comment(s)
+... | `...` | ... | ...
 """]]
 
 ## Planning to present something?
 
 [[!table data="""
 Speaker | Title
+... | ...
 """]]
 
 ## Discussions

Members: 
	summits/bsdcan_2026.mdwn:INITIAL->1.1 

--- /dev/null	2026-04-21 08:00:36.745100638 +0000
+++ wikisrc/summits/bsdcan_2026.mdwn	2026-04-21 08:00:40.377361614 +0000
@@ -0,0 +1,45 @@
+<!-- we are supposed to use all lowercase letters in the link, so set a proper title for the page: -->
+[[!meta title="BSDCan 2026 NetBSD DevSummit"]]
+
+## Details
+
+We are organising a NetBSD/pkgsrc summit at BSDCan 2026 taking place June 16-20, 2026 in Ottawa, Canada.
+
+Additional details about the conference can be found at the official website:
+<https://www.bsdcan.org/2026/>
+
+The summit will take place on June 17-18 (the days before the main
+conference, the tutorial days).
+We are in room DMS 1110 and we start at 9:00 a.m.
+
+### NetBSD Dinner
+
+TODO
+
+## Planning to attend?
+
+The summit is for TNF members (NetBSD / pkgsrc developers) and not open
+to the general public.  Non-members can be invited to join as a guest -
+if you would like to join the summit, please reach out to us somehow
+(mailing lists, social media, IRC, ...). TNF is also financially
+sponsoring a limited number of devsummit tickets, so please indicate if
+you would like TNF to cover your ticket.
+
+Please add yourself to the table so it helps everybody for planing the event.
+
+[[!table data="""
+First Last | `login@` | join dinner? | comment(s)
+"""]]
+
+## Planning to present something?
+
+[[!table data="""
+Speaker | Title
+"""]]
+
+## Discussions
+
+### Other
+
+* PGP key signing?
+* ...

Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- wikisrc/sandbox.mdwn	1 Apr 2026 22:54:21 -0000	1.43
+++ wikisrc/sandbox.mdwn	1 Apr 2026 22:54:38 -0000	1.44
@@ -44,4 +44,4 @@
 
 fnord again
 
-Test ikiwiki commitses, my precious.
+We tests ikiwiki commitses, my precious.

Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wikisrc/sandbox.mdwn	1 Apr 2026 18:32:50 -0000	1.36
+++ wikisrc/sandbox.mdwn	1 Apr 2026 22:39:22 -0000	1.37
@@ -44,4 +44,4 @@
 
 fnord again
 
-Test ikiwiki commits.
+Test ikiwiki commit.

Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- wikisrc/sandbox.mdwn	1 Apr 2026 17:50:17 -0000	1.35
+++ wikisrc/sandbox.mdwn	1 Apr 2026 18:32:50 -0000	1.36
@@ -44,4 +44,4 @@
 
 fnord again
 
-Test ikiwiki commit.
+Test ikiwiki commits.

Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- wikisrc/sandbox.mdwn	1 Apr 2026 16:47:30 -0000	1.34
+++ wikisrc/sandbox.mdwn	1 Apr 2026 17:50:17 -0000	1.35
@@ -44,4 +44,4 @@
 
 fnord again
 
-Test ikiwiki commits.
+Test ikiwiki commit.

Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- wikisrc/sandbox.mdwn	1 Apr 2026 16:45:34 -0000	1.33
+++ wikisrc/sandbox.mdwn	1 Apr 2026 16:47:30 -0000	1.34
@@ -44,4 +44,4 @@
 
 fnord again
 
-Test ikiwiki commit.
+Test ikiwiki commits.

Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- wikisrc/sandbox.mdwn	1 Apr 2026 16:42:35 -0000	1.32
+++ wikisrc/sandbox.mdwn	1 Apr 2026 16:45:34 -0000	1.33
@@ -44,4 +44,4 @@
 
 fnord again
 
-Test ikiwiki commits.
+Test ikiwiki commit.

Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- wikisrc/sandbox.mdwn	17 Sep 2025 00:14:28 -0000	1.31
+++ wikisrc/sandbox.mdwn	1 Apr 2026 16:42:35 -0000	1.32
@@ -44,4 +44,4 @@
 
 fnord again
 
-Test ikiwiki commit.
+Test ikiwiki commits.

Members: 
	projects/project/pkgsrc_binpkg_depends.mdwn:1.5->1.6(DEAD) 

--- wikisrc/projects/project/pkgsrc_binpkg_depends.mdwn	2026-04-01 21:26:10.178417251 +0000
+++ /dev/null	2026-04-01 21:23:02.681933919 +0000
@@ -1,45 +0,0 @@
-[[!template id=project
-
-title="Add dependency information to binary packages (350h)"
-
-contact="""
-[tech-pkg](mailto:tech-pkg@NetBSD.org)
-"""
-
-mentors="""
-[Thomas Klausner](mailto:wiz@NetBSD.org)
-"""
-
-category="pkgsrc"
-difficulty="hard"
-duration="350h"
-
-description="""
-Change infrastructure so that dependency information (currently in buildlink3.mk files) is installed with a binary package and is used from there
-
-This is not an easy project.
-
-pkgsrc currently handles dependencies by including buildlink3.mk files spread over pkgsrc. The problem is that these files describe the current state of pkgsrc, not the current state of the installed packages.
-
-For this reason and because most of the information in the files is templated, the buildlink3.mk files should be replaced by the relevant information in an easily parsable manner (not necessarily make syntax) that can be installed with the package.
-Here the task is to come up with a definitive list of information necessary to replace all the stuff that's currently done in buildlink3.mk files (including: dependency information, lists of headers to pass through or replace by buildlink magic, conditional dependencies, ...)
-
-The next step is to come up with a proposal how to store this information with installed packages and how to make pkgsrc use it.
-
-Then the coding starts to adapt the pkgsrc infrastructure to do it and show with a number of trivial and non-trivial packages that this proposal works.
-
-It would be good to provide scripts that convert from the current state to the new one, and test it with a bulk build.
-
-Of course it's not expected that all packages be converted to the new framework in the course of this project, but the further steps should be made clear.
-
-goals/milestones:
-
-* invent a replacement for buildlink3.mk files, keeping current features
-* demonstrate your new tool as a buildlink3.mk replacement including new features
-* execute a bulk build with as many packages as possible using the new buildlink
-
-"""
-]]
-
-[[!tag gsoc]]
-[[!tag gsoc350h]]

Index: wikisrc/ports/sandpoint/instdsm-g600.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sandpoint/instdsm-g600.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/sandpoint/instdsm-g600.mdwn	5 Sep 2015 19:18:06 -0000	1.6
+++ wikisrc/ports/sandpoint/instdsm-g600.mdwn	17 Mar 2026 09:31:52 -0000	1.7
@@ -191,7 +191,7 @@
 
 U-Boot always runs **bootm FFF10000 FFC20000** and there is no way to
 change that. So it may be convenient to replace the RAMDisk image at
-`0xffc20000` by an empty U-Boot image, like [this](http://www.NetBSD.org/~phx/Sandpoint/dummy.img.gz)
+`0xffc20000` by an empty U-Boot image, like [this](https://ftp.netbsd.org/pub/NetBSD/misc/phx/sandpoint/dummy.img.gz)
 one (do not forget to uncompress it with `gunzip(1)`). Or use **mkubootimage** to
 make your own dummy. Write this image to Flash, as shown above, by
 entering the command **loadb r**.
Index: wikisrc/ports/sandpoint/instnh23x.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sandpoint/instnh23x.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/sandpoint/instnh23x.mdwn	5 Sep 2015 19:18:06 -0000	1.5
+++ wikisrc/ports/sandpoint/instnh23x.mdwn	17 Mar 2026 09:31:52 -0000	1.6
@@ -333,7 +333,7 @@
 
 Additionally you may think about replacing the Linux RAM disk image at
 the second address (`0xfff20000` in the example above) by an empty
-PPCBoot image, like [this](http://www.NetBSD.org/~phx/Sandpoint/dummy.img.gz)
+PPCBoot image, like [this](https://ftp.netbsd.org/pub/NetBSD/misc/phx/sandpoint/dummy.img.gz)
 one (do not forget to uncompress it with `gunzip(1)`). Or use **mkubootimage**
 to make your own dummy. Write it to flash as shown below. This will speed up
 the boot process, but is not really required.
Index: wikisrc/ports/sandpoint/instsynology.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sandpoint/instsynology.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/ports/sandpoint/instsynology.mdwn	25 Sep 2015 12:39:44 -0000	1.12
+++ wikisrc/ports/sandpoint/instsynology.mdwn	17 Mar 2026 09:31:52 -0000	1.13
@@ -550,7 +550,7 @@
 
 Optionally you may think about replacing the Linux RAM disk image at the
 second address (`0xffe00000` in the example above) by an empty PPCBoot
-image, like [this](http://www.NetBSD.org/~phx/Sandpoint/dummy.img.gz) one
+image, like [this](https://ftp.netbsd.org/pub/NetBSD/misc/phx/sandpoint/dummy.img.gz) one
 (do not forget to uncompress it with `gunzip(1)`). Or use **mkubootimage** to
 make your own dummy. Write it to flash as shown above. This will speed up the
 boot process, but is not really required.

Index: wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn	13 Mar 2026 08:42:58 -0000	1.7
+++ wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn	17 Mar 2026 00:47:11 -0000	1.8
@@ -22,7 +22,9 @@
 [[!table data="""
 First Last | `login@` | join dinner? | comment(s)
 ~~Harold~~ | ~~`hgutch@`~~ | ~~yes~~ | ~~n/a~~
-Pierre Pronchery | `khorben@` | yes | +1
+Pierre Pronchery | `khorben@` | yes | n/a
+Miroslava Talavera | (guest) | yes | Invited by `khorben@`
+Bernd E. | `veego@` | ? | n/a
 """]]
 
 ## Planning to present something?

Index: wikisrc/ports/sandpoint/instlinkstation.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sandpoint/instlinkstation.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/sandpoint/instlinkstation.mdwn	5 Sep 2015 17:18:53 -0000	1.5
+++ wikisrc/ports/sandpoint/instlinkstation.mdwn	15 Mar 2026 19:40:34 -0000	1.6
@@ -219,8 +219,8 @@
 Get an appropriate U-Boot firmware image from
 <http://www.genbako.com/u-boot_loader/> (URL is obsolete, use copies below):
 
--   [LinkStation HD-HLAN or KuroBox classic](http://www.netbsd.org/~phx/LinkStation/u-boot-hd.flash.bin)
--   [LinkStation HD-HGLAN or KuroBox HG](http://www.netbsd.org/~phx/LinkStation/u-boot-hg.flash.bin)
+-   [LinkStation HD-HLAN or KuroBox classic](https://ftp.netbsd.org/pub/NetBSD/misc/phx/sandpoint/LinkStation/u-boot-hd.flash.bin)
+-   [LinkStation HD-HGLAN or KuroBox HG](https://ftp.netbsd.org/pub/NetBSD/misc/phx/sandpoint/LinkStation/u-boot-hg.flash.bin)
 
 Transfer the firmware into the `share` folder on the LinkStation.
 

Index: wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn	13 Mar 2026 08:39:16 -0000	1.6
+++ wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn	13 Mar 2026 08:42:58 -0000	1.7
@@ -21,7 +21,7 @@
 
 [[!table data="""
 First Last | `login@` | join dinner? | comment(s)
-~~Harold | `hgutch@` | yes | n/a~~
+~~Harold~~ | ~~`hgutch@`~~ | ~~yes~~ | ~~n/a~~
 Pierre Pronchery | `khorben@` | yes | +1
 """]]
 
@@ -29,7 +29,7 @@
 
 [[!table data="""
 Speaker | Title
-~~`hgutch@` | NetBSD/WiiU demo~~
+~~`hgutch@`~~ | ~~NetBSD/WiiU demo~~
 `khorben@` | root-on-ZFS installer & smolBSD demos
 """]]
 

Index: wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn	23 Feb 2026 16:15:29 -0000	1.5
+++ wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn	13 Mar 2026 08:39:16 -0000	1.6
@@ -21,7 +21,7 @@
 
 [[!table data="""
 First Last | `login@` | join dinner? | comment(s)
-Harold | `hgutch@` | yes | n/a
+~~Harold | `hgutch@` | yes | n/a~~
 Pierre Pronchery | `khorben@` | yes | +1
 """]]
 
@@ -29,7 +29,7 @@
 
 [[!table data="""
 Speaker | Title
-`hgutch@` | NetBSD/WiiU demo
+~~`hgutch@` | NetBSD/WiiU demo~~
 `khorben@` | root-on-ZFS installer & smolBSD demos
 """]]
 

Members: 
	projects/project/aio.mdwn:1.5->1.6 

Index: wikisrc/projects/project/aio.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/aio.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/projects/project/aio.mdwn	1 Mar 2022 10:38:49 -0000	1.5
+++ wikisrc/projects/project/aio.mdwn	9 Mar 2026 20:37:07 -0000	1.6
@@ -32,7 +32,7 @@
 asynchronous requests to complete; it is much more problematic for an
 asynchronous request to call into code that expects to be synchronous.
 
-The [[flow control|tcp-writing]] project, which also requires
+The [[flow control|buffer-flowcontrol]] project, which also requires
 substantial revisions to the I/O path, naturally combines with this
 project.
 """

Index: wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn	22 Feb 2026 18:37:49 -0000	1.4
+++ wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn	23 Feb 2026 16:15:29 -0000	1.5
@@ -30,7 +30,7 @@
 [[!table data="""
 Speaker | Title
 `hgutch@` | NetBSD/WiiU demo
-`khorben@` | smolBSD demo (tentative)
+`khorben@` | root-on-ZFS installer & smolBSD demos
 """]]
 
 ## Discussions

Index: wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn	7 Feb 2026 17:48:27 -0000	1.3
+++ wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn	22 Feb 2026 18:37:49 -0000	1.4
@@ -29,7 +29,7 @@
 
 [[!table data="""
 Speaker | Title
-`hgutch@` | NetBSD/WiiU demo (tentative)
+`hgutch@` | NetBSD/WiiU demo
 `khorben@` | smolBSD demo (tentative)
 """]]
 

Index: wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn	7 Feb 2026 17:25:11 -0000	1.2
+++ wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn	7 Feb 2026 17:48:27 -0000	1.3
@@ -8,6 +8,11 @@
 
 TODO
 
+[[!table data="""
+Suggestion | Link
+Umeko Taiwanese Cuisine | https://maps.app.goo.gl/XAtUvW9GaQe4vRNL6
+"""]]
+
 ## Planning to attend?
 
 The summit is for TNF members (NetBSD / pkgsrc developers) and not open to the general public.  Non-members can be invited to join as a guest - if you would like to join the summit, please reach out to us somehow (mailing lists, social media, IRC, ...).

Index: wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn	25 Jan 2026 13:39:15 -0000	1.1
+++ wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn	7 Feb 2026 17:25:11 -0000	1.2
@@ -17,6 +17,7 @@
 [[!table data="""
 First Last | `login@` | join dinner? | comment(s)
 Harold | `hgutch@` | yes | n/a
+Pierre Pronchery | `khorben@` | yes | +1
 """]]
 
 ## Planning to present something?
@@ -24,6 +25,7 @@
 [[!table data="""
 Speaker | Title
 `hgutch@` | NetBSD/WiiU demo (tentative)
+`khorben@` | smolBSD demo (tentative)
 """]]
 
 ## Discussions

Index: wikisrc/releng.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng.mdwn,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- wikisrc/releng.mdwn	7 Feb 2026 10:42:28 -0000	1.59
+++ wikisrc/releng.mdwn	7 Feb 2026 10:46:25 -0000	1.60
@@ -24,7 +24,7 @@
 
 ### NetBSD 9.x
 
-* Next minor release: NetBSD 9.5 (no schedule)
+* Next minor release would be NetBSD 9.5, but is unlikely to happen.
   + CVS branch tag: <code>netbsd-9</code>
 * [Current pull-up queue for the netbsd-9 branch](http://releng.netbsd.org/cgi-bin/req-9.cgi)
 * end of support for netbsd-9 in first quarter 2026

Index: wikisrc/releng.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng.mdwn,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- wikisrc/releng.mdwn	20 Dec 2025 12:02:42 -0000	1.58
+++ wikisrc/releng.mdwn	7 Feb 2026 10:42:28 -0000	1.59
@@ -8,9 +8,7 @@
 
 The next major release will be NetBSD 11.0.
 
-* currently in BETA state, moving to RC1 state before the end of december (unless blockers
-  are resolved earlier).
-  11.0 release expected early in 2026.
+* currently in RC1 state, 11.0 release expected before the end of february 2026.
   + CVS branch tag: <code>netbsd-11</code>
 * [Current pull-up queue for the netbsd-11 branch](http://releng.netbsd.org/cgi-bin/req-11.cgi)
 * open issues to solve [before the 11.0 release](netbsd-11)

--- /dev/null	2026-04-01 21:23:02.681933919 +0000
+++ wikisrc/summits/asiabsdcon_2026_netbsd_summit.mdwn	2026-04-01 21:26:14.600000856 +0000
@@ -0,0 +1,38 @@
+[[!meta title="AsiaBSDCon 2026 NetBSD Summit"]]
+
+## Details
+
+There will be a NetBSD developer summit at AsiaBSDCon 2026.  Details to follow.
+
+## NetBSD dinner
+
+TODO
+
+## Planning to attend?
+
+The summit is for TNF members (NetBSD / pkgsrc developers) and not open to the general public.  Non-members can be invited to join as a guest - if you would like to join the summit, please reach out to us somehow (mailing lists, social media, IRC, ...).
+
+Please add yourself to the table to help planning the event.
+
+[[!table data="""
+First Last | `login@` | join dinner? | comment(s)
+Harold | `hgutch@` | yes | n/a
+"""]]
+
+## Planning to present something?
+
+[[!table data="""
+Speaker | Title
+`hgutch@` | NetBSD/WiiU demo (tentative)
+"""]]
+
+## Discussions
+
+### NetBSD 11
+
+* ...
+
+### Other
+
+* PGP key signing?
+* ...

(Maybe we can restrict it to 90h too, but I think we need to add a tag for
that!)

Members: 
	projects/project/update-webkit-gtk.mdwn:INITIAL->1.1 

--- /dev/null	2026-04-01 21:23:02.681933919 +0000
+++ wikisrc/projects/project/update-webkit-gtk.mdwn	2026-04-01 21:26:14.924499360 +0000
@@ -0,0 +1,37 @@
+[[!template id=project
+
+title="Update webkit-gtk "
+
+contact="""
+[tech-pkg](mailto:tech-pkg@NetBSD.org)
+"""
+
+mentors="""
+[Leonardo Taccari](mailto:leot@NetBSD.org),
+[Thomas Klausner](mailto:wiz@NetBSD.org)
+"""
+
+category="pkgsrc"
+difficulty="hard"
+duration="175 hours"
+
+description="""
+[WebKitGTK](https://webkitgtk.org/) together with Firefox and Chromium is the
+base of one of the most used web engine.
+
+It is packaged in pkgsrc as `www/webkit-gtk` but we are stuck at version 2.36.8
+because we have several build and run issues with newer versions on NetBSD.
+As part of this project we will focus only on `NetBSD/amd64`.
+
+This project consists on updating it (a possible starting point could
+be [pkgsrc-wip](https://www.pkgsrc.org/wip/) package `wip/webkit-gtk`) and
+trying to fix it.
+
+Please note that more than packaging work a lot of debugging of a big
+complex codebase is inspected as part of this project, hence why it is
+considered an "hard" one!
+"""
+]]
+
+[[!tag gsoc]]
+[[!tag gsoc175h]]

Index: wikisrc/projects/gsoc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/gsoc.mdwn,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- wikisrc/projects/gsoc.mdwn	20 Jan 2025 16:33:08 -0000	1.32
+++ wikisrc/projects/gsoc.mdwn	18 Jan 2026 17:57:37 -0000	1.33
@@ -19,7 +19,8 @@
 2021,
 2022,
 2023,
-2024).
+2024,
+2025).
 
 This page contains a list of concrete suggestions for projects we would
 like to see applications for in the next Summer of Code. Note that they