diff options
| author | Xi Ruoyao <xry111@xry111.site> | 2023-09-03 04:18:47 +0800 |
|---|---|---|
| committer | Xi Ruoyao <xry111@xry111.site> | 2023-09-03 04:18:47 +0800 |
| commit | 39365097ceb3d40252244f4587696d1e51e34ae9 (patch) | |
| tree | 4e455c8c70e7272728529829fba6836de5510756 | |
| parent | 5b096078f0f4af5bcfc988e9e07465a1447a4214 (diff) | |
| parent | 50c08b0f00626832ef05a21f52dc5fcaff0afcaa (diff) | |
Merge remote-tracking branch 'origin/12.0' into xry111/arm64-12.0xry111/arm64-12.0
| -rw-r--r-- | chapter02/hostreqs.xml | 2 | ||||
| -rw-r--r-- | chapter10/kernel.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chapter02/hostreqs.xml b/chapter02/hostreqs.xml index e2fbce07b..10c1bf16e 100644 --- a/chapter02/hostreqs.xml +++ b/chapter02/hostreqs.xml @@ -173,7 +173,7 @@ <para >To see whether your host system has all the appropriate versions, and the ability to compile programs, run the following commands:</para> -<screen role="nodump"><userinput>cat > version-check.sh << "EOF" +<screen role="nodump"><?dbfo keep-together="auto"?><userinput>cat > version-check.sh << "EOF" <literal>#!/bin/bash # A script to list version numbers of critical development tools diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml index 314ba3f31..f2d2b4cf8 100644 --- a/chapter10/kernel.xml +++ b/chapter10/kernel.xml @@ -120,8 +120,8 @@ <!-- Support for compiling a keymap into the kernel is deliberately removed --> - <note> + <?dbfo keep-together="auto"?> <para>A good starting place for setting up the kernel configuration is to run <command>make defconfig</command>. This will set the base configuration to a good state that takes your current system architecture |