Merge branch 'acidanthera:master' into master

CrisHotpatch · Oct 11, 2023 · 229a3f1 · 229a3f1
2 parents acc484b + 16f83e5
commit 229a3f1
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/Docs/Configuration.md5 b/Docs/Configuration.md5
@@ -1 +1 @@
-5c460454adb816f53426dd7682c1800f
+df3af82157ce89c1990dff6eb26cb6d0
diff --git a/Docs/Configuration.pdf b/Docs/Configuration.pdf
diff --git a/Docs/Configuration.tex b/Docs/Configuration.tex
@@ -3012,15 +3012,17 @@ \subsection{Scheme Properties}\label{kernelpropsscheme}
       \texttt{x86\_64}, \texttt{i386}, \texttt{i386-user32}.
   \end{enumerate}
 
-  Unlike macOS~10.7 (where certain board identifiers are treated as the \texttt{i386}
+  Unlike macOS~10.7 (where certain board identifiers are treated as \texttt{i386}
   only machines), and macOS~10.5 or earlier (where \texttt{x86\_64} is not supported
   by the macOS kernel), macOS~10.6 is very special. The architecture choice on macOS~10.6
   depends on many factors including not only the board identifier, but also the macOS
   product type (client vs server), macOS point release, and amount of RAM. The detection
   of all these is complicated and impractical, as several point releases had implementation
   flaws resulting in a failure to properly execute the server detection in the first place.
-  For this reason, OpenCore on macOS~10.6 falls back on the \texttt{x86\_64}
-  architecture whenever it is supported by the board, as it is on macOS~10.7.
+  For this reason when \texttt{Auto} is set, OpenCore on macOS~10.6 falls back
+  to the \texttt{x86\_64} architecture when it is supported by the board, as
+  on macOS~10.7. The 32-bit \texttt{KernelArch} options can still be configured
+  explicitly however.
 
   A 64-bit Mac model compatibility matrix corresponding to actual
   EfiBoot behaviour on macOS 10.6.8 and 10.7.5 is outlined below.

diff --git a/Docs/Differences/Differences.pdf b/Docs/Differences/Differences.pdf
diff --git a/Docs/Differences/Differences.tex b/Docs/Differences/Differences.tex
@@ -1,7 +1,7 @@
 \documentclass[]{article}
 %DIF LATEXDIFF DIFFERENCE FILE
-%DIF DEL PreviousConfiguration.tex   Wed Sep 27 10:25:48 2023
-%DIF ADD ../Configuration.tex        Wed Sep 27 10:25:48 2023
+%DIF DEL PreviousConfiguration.tex   Mon Oct  9 15:13:53 2023
+%DIF ADD ../Configuration.tex        Mon Oct  9 15:31:36 2023
 
 \usepackage{lmodern}
 \usepackage{amssymb,amsmath}
@@ -3072,15 +3072,18 @@ \subsection{Scheme Properties}\label{kernelpropsscheme}
       \texttt{x86\_64}, \texttt{i386}, \texttt{i386-user32}.
   \end{enumerate}
 
-  Unlike macOS~10.7 (where certain board identifiers are treated as the \texttt{i386}
+  Unlike macOS~10.7 (where certain board identifiers are treated as \DIFdelbegin \DIFdel{the }\DIFdelend \texttt{i386}
   only machines), and macOS~10.5 or earlier (where \texttt{x86\_64} is not supported
   by the macOS kernel), macOS~10.6 is very special. The architecture choice on macOS~10.6
   depends on many factors including not only the board identifier, but also the macOS
   product type (client vs server), macOS point release, and amount of RAM. The detection
   of all these is complicated and impractical, as several point releases had implementation
   flaws resulting in a failure to properly execute the server detection in the first place.
-  For this reason, OpenCore on macOS~10.6 falls back on the \texttt{x86\_64}
-  architecture whenever it is supported by the board, as it is on macOS~10.7.
+  For this reason \DIFaddbegin \DIFadd{when }\texttt{\DIFadd{Auto}} \DIFadd{is set}\DIFaddend , OpenCore on macOS~10.6 falls back
+  \DIFdelbegin \DIFdel{on }\DIFdelend \DIFaddbegin \DIFadd{to }\DIFaddend the \texttt{x86\_64} architecture \DIFdelbegin \DIFdel{whenever }\DIFdelend \DIFaddbegin \DIFadd{when }\DIFaddend it is supported by the board, as
+  \DIFdelbegin \DIFdel{it is }\DIFdelend on macOS~10.7. \DIFaddbegin \DIFadd{The 32-bit }\texttt{\DIFadd{KernelArch}} \DIFadd{options can still be configured
+  explicitly however.
+}\DIFaddend 
 
   A 64-bit Mac model compatibility matrix corresponding to actual
   EfiBoot behaviour on macOS 10.6.8 and 10.7.5 is outlined below.

diff --git a/Docs/Errata/Errata.pdf b/Docs/Errata/Errata.pdf