Hi Here a diff for www page: upgrade66
It seems to have on error Right? ---- Index: macppc.html =================================================================== RCS file: /cvs/www/macppc.html,v retrieving revision 1.267 diff -u -p -r1.267 macppc.html --- macppc.html 1 Jun 2019 23:12:48 -0000 1.267 +++ macppc.html 16 Oct 2019 19:15:13 -0000 @@ -1,7 +1,14 @@ +<<<<<<< macppc.html +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd";> +<html> +<head> +======= <!doctype html> <html lang=en id=platform> <meta charset=utf-8> +>>>>>>> 1.267 <title>OpenBSD/macppc</title> <meta name="description" content="the OpenBSD/macppc page"> <meta name="viewport" content="width=device-width, initial-scale=1"> @@ -161,7 +168,11 @@ Known compatible systems include the fol </ul> <p> +<<<<<<< macppc.html +To help us improve the accuracy of this list, <b>PLEASE</b> +======= To help us improve the accuracy of this list, <strong>PLEASE</strong> +>>>>>>> 1.267 <a href="faq/faq4.html#SendDmesg">send your dmesg</a> after installation to <a href="mailto:dm...@openbsd.org";>dm...@openbsd.org</a>. @@ -182,8 +193,13 @@ to <a href="mailto:dm...@openbsd.org";>dm <li>Apple Shasta </ul> +<<<<<<< macppc.html +<li><strong>PCI-Bridges</strong> +(<a href="https://man.openbsd.org/?query=pchb&arch=macppc&sektion=4";>pchb</a>) +======= <li><strong>PCI-Bridges</strong> (<a href="https://man.openbsd.org/macppc/pchb.4";>pchb</a>) +>>>>>>> 1.267 <ul> <li>Apple Bandit <li>Apple Intrepid 2 AGP @@ -313,8 +329,13 @@ to <a href="mailto:dm...@openbsd.org";>dm <li>LSIFC909, LSIFC919, LSIFC919X, LSIFC929, LSIFC929X, LSIFC949, LSIFC949X, <li>LSISAS1064, LSISAS1064E, LSISAS1068, LSISAS1068E </ul> +<<<<<<< macppc.html +<li>All PCI IDE +(<a href="https://man.openbsd.org/?query=pciide&arch=macppc&sektion=4";>pciide</a>) +======= <li>All PCI IDE (<a href="https://man.openbsd.org/macppc/pciide.4";>pciide</a>) +>>>>>>> 1.267 adapters supported by the <a href="i386.html">i386</a> platform </ul> @@ -344,6 +365,16 @@ adapters supported by the <a href="i386. <li><strong>USB Devices</strong> <ul> +<<<<<<< macppc.html +<li>Alps Electric Apple USB Keyboard (<a href="https://man.openbsd.org/?query=ukbd&arch=macppc&sektion=4";>ukbd</a>) +<li>Apple touchpad mouse (<a href="https://man.openbsd.org/?query=utpms&arch=macppc&sektion=4";>utpms</a>) +<li>Gude ADS Expert mouseCLOCK USB and Expert mouseCLOCK USB II DCF77 and HBG radio clocks (<a href="https://man.openbsd.org/?query=udcf&arch=macppc&sektion=4";>udcf</a>) +<li>Solid Year Keyboard and Mouse (<a href="https://man.openbsd.org/?query=ukbd&arch=macppc&sektion=4";>ukbd</a>) (<a href="https://man.openbsd.org/?query=ums&arch=macppc&sektion=4";>ums</a>) +<li>Logitech M4848 (<a href="https://man.openbsd.org/?query=ums&arch=macppc&sektion=4";>ums</a>) +<li>Kensington USB/PS2 Wheel Mouse (<a href="https://man.openbsd.org/?query=ums&arch=macppc&sektion=4";>ums</a>) +<li>USB Zip Drives (<a href="https://man.openbsd.org/?query=umass&arch=macppc&sektion=4";>umass</a>) +</ul> +======= <li>Alps Electric Apple USB Keyboard (<a href="https://man.openbsd.org/macppc/ukbd.4";>ukbd</a>) <li>Apple touchpad mouse (<a href="https://man.openbsd.org/macppc/utpms.4";>utpms</a>) <li>Gude ADS Expert mouseCLOCK USB and Expert mouseCLOCK USB II DCF77 and HBG radio clocks (<a href="https://man.openbsd.org/macppc/udcf.4";>udcf</a>) @@ -352,11 +383,17 @@ adapters supported by the <a href="i386. <li>Kensington USB/PS2 Wheel Mouse (<a href="https://man.openbsd.org/macppc/ums.4";>ums</a>) <li>USB Zip Drives (<a href="https://man.openbsd.org/macppc/umass.4";>umass</a>) </ul> +>>>>>>> 1.267 <li><strong>CardBus/PCMCIA bridges</strong> <ul> +<<<<<<< macppc.html +<li>PBG4 onboard CardBus bridge is now supported, as are PCI CardBus bridges. +(<a href="https://man.openbsd.org/?query=cbb&sektion=4";>cbb</a>) +======= <li>PBG4 onboard CardBus bridge is now supported, as are PCI CardBus bridges. (<a href="https://man.openbsd.org/cbb.4";>cbb</a>) +>>>>>>> 1.267 </ul> <li><strong>PC Cards (PCMCIA / Cardbus)</strong> @@ -485,10 +522,16 @@ There are several installation media pro while leaving the "C" key pressed will bootstrap the installation procedure. Alternatively, the CD can be booted at the Open Firmware prompt, with +<<<<<<< macppc.html +<pre> + boot cd:,ofwboot 6.5/macppc/bsd.rd +</pre> +======= <p> <kbd> boot cd:,ofwboot 6.5/macppc/bsd.rd </kbd> +>>>>>>> 1.267 <li><strong>Mac OS based boot</strong> <p> If the system disk is shared with Mac OS, the <code>ofwboot</code> bootloader @@ -529,12 +572,23 @@ detect which drive is the root drive, so prompt for a root drive or fail. <ul> +<<<<<<< macppc.html +<li><tt>ultra0</tt> is always a valid root drive. +<li><tt>ultra1</tt> is valid as a root disk, as long as <tt>ultra0</tt> +======= <li><code>ultra0</code> is always a valid root drive. <li><code>ultra1</code> is valid as a root disk, as long as <code>ultra0</code> +>>>>>>> 1.267 is a hard drive, not a non-hard disk ATAPI device. +<<<<<<< macppc.html +<li><tt>ide1</tt> (Zip drive bay) is valid as a root disk if no hard drive is + located at <tt>ultra1</tt>, +<li><tt>ide0</tt> (cdrom) is valid as a root drive <b>only</b> if no hard +======= <li><code>ide1</code> (Zip drive bay) is valid as a root disk if no hard drive is located at <code>ultra1</code>, <li><code>ide0</code> (cdrom) is valid as a root drive <strong>only</strong> if no hard +>>>>>>> 1.267 drives are connected to the Ultra bus. </ul> Index: faq/faq17.html =================================================================== RCS file: /cvs/www/faq/faq17.html,v retrieving revision 1.11 diff -u -p -r1.11 faq17.html --- faq/faq17.html 21 Jun 2019 08:22:16 -0000 1.11 +++ faq/faq17.html 16 Oct 2019 19:15:14 -0000 @@ -627,8 +627,13 @@ ike dynamic esp transport proto udp from psk mekmitasdigoat </pre> +<<<<<<< faq17.html +Once the IKEv1 tunnel is up and running, the L2TP tunnel need to be configured. +OpenBSD doesn't provide an L2TP client by default, so installing +======= Once the IKEv1 tunnel is up and running, the L2TP tunnel needs to be configured. OpenBSD doesn't provide an L2TP client by default, so installing +>>>>>>> 1.5 <code>xl2tpd</code> is required. <pre class="cmdbox"> Index: faq/upgrade66.html =================================================================== RCS file: /cvs/www/faq/upgrade66.html,v retrieving revision 1.10 diff -u -p -r1.10 upgrade66.html --- faq/upgrade66.html 16 Oct 2019 17:48:16 -0000 1.10 +++ faq/upgrade66.html 16 Oct 2019 19:15:14 -0000 @@ -36,10 +36,10 @@ local system first. Start by performing the <a href="#BeforeUpdate">pre-upgrade steps</a>. Next, boot from the install kernel, <a href="faq4.html#bsd.rd">bsd.rd</a>: -use <a href="faq4.html#MkInsMedia">bootable install media</a>, or place the -6.6 version of <code>bsd.rd</code> in the root of your filesystem and +use <a href="faq4.html#MkInsMedia">bootable install media</a>, or place the +6.6 version of <code>bsd.rd</code> in the root of your filesystem and instruct the boot loader to boot this kernel. -Once this kernel is booted, choose the <code>(U)pgrade</code> option and +Once this kernel is booted, choose the <code>(U)pgrade</code> option and follow the prompts. <p> @@ -136,7 +136,7 @@ any post-release fixes. <li><b>acme-client(1).</b> <a href="https://man.openbsd.org/OpenBSD-6.6/acme-client.1";>acme-client(1)</a> - has been updated to implement the recently published RFC 8555. Users + has been updated to implement the recently published RFC 8555. Users must change the api url in <a href="https://man.openbsd.org/OpenBSD-6.6/acme-client.5";> <code>/etc/acme-client.conf</code></a> from @@ -286,7 +286,7 @@ any post-release fixes. Remove files associated with client use of the X Font Service: <pre class="cmdbox"> <b>rm -f /usr/X11R6/lib/pkgconfig/libfs.pc \ - /usr/X11R6/include/X11/fonts/FSlib.h + /usr/X11R6/include/X11/fonts/FSlib.h; rm -rf /usr/X11R6/share/doc/libFS</b><!-- --></pre> -- ~ " Fully Basic System Distinguish Life! " ~ " Libre as a BSD " +=<<< ---- <me>Stephane HUC as PengouinBSD or CIOTBSD</me> <mail>b...@stephane-huc.net</mail>
