Skip to content

Commit ef647db

Browse files
sucthanMattias Schlenker
authored andcommitted
pick-24 QW implemented tab boxes in install_packages_debian (en) to sync with the refurbished German article. Minor clean-up in the German version, too
1 parent 362d100 commit ef647db

File tree

2 files changed

+50
-35
lines changed

2 files changed

+50
-35
lines changed

src/onprem/de/install_packages_debian.asciidoc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ Stabilitäts-Updates werden hier früher als zu den _Dot Releases_ (z.B. Ubuntu
3838

3939
Damit funktionieren die folgenden minimalen Beispiele einer `/etc/apt/sources.list`:
4040

41-
//[discrete] Wohin mit den bisherigen Auszeichnungen und Ankern? Baue ich sie unten ein, werden mir die TB nicht korrekt gerendert.
42-
//[discrete] Wohin damit, brauchen wir discrete noch...?
43-
4441
[.tabs]
4542
====
4643
Debian 12 _Bookworm_::
@@ -62,7 +59,6 @@ Debian 11 _Bullseye_::
6259
--
6360
[#debian11]
6461
Debian 11 _Bullseye_ lässt sich über folgende Paketquellen beziehen:
65-
// Kurz und knapp oder etwas gesprächiger mit abwechslungsreichem Text? Sprechenden Namen (Bullseye) erst hier nennen und raus aus dem Tab?
6662

6763
./etc/apt/sources.list
6864
[{file}]
@@ -84,9 +80,6 @@ Stabilitäts-Updates werden hier früher als zu den _Dot Releases_ bereitgestell
8480

8581
Daraus resultieren die folgenden Beispiele der `/etc/apt/sources.list` bzw. ab Ubuntu 24.04 der `/etc/apt/sources.list.d/ubuntu.sources`:
8682

87-
// SH: [discrete] von Ubuntu 22.04, stand vor dem Anker.
88-
// SH: [discrete] von Ubuntu 24.04, stand vor dem Anker. Wohin damit? Oder löschen? ---> Löschen. Verbirgt ZÜ in TOC. Hier nicht mehr nötig.
89-
9083
[.tabs]
9184
====
9285
Ubuntu 24.04 _Noble Numbat_::

src/onprem/en/install_packages_debian.asciidoc

Lines changed: 50 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -38,29 +38,41 @@ Stability updates are provided here earlier than for the _dot releases_ (e.g. Ub
3838

3939
The following minimal examples of an `/etc/apt/sources.list` therefore work:
4040

41-
[discrete]
42-
[#debian11]
43-
==== Debian 11 _Bullseye_
41+
42+
[.tabs]
43+
====
44+
Debian 12 _Bookworm_::
45+
+
46+
--
47+
// SH: Leave anchors inside for the time being due to retrievability (MFS). They need to be taken out/replaced at a later point when we have a better solution. Reason: There must be one single ID per article.
48+
[#debian12]
49+
Debian 12_Bookworm_ can be obtained from the following package sources:
4450

4551
./etc/apt/sources.list
4652
[{file}]
4753
----
48-
deb http://deb.debian.org/debian/ bullseye main
49-
deb https://security.debian.org/debian-security bullseye-security main
50-
# deb http://deb.debian.org/debian bullseye-updates main
54+
deb http://deb.debian.org/debian/ bookworm main
55+
deb https://security.debian.org/debian-security bookworm-security main
56+
# deb http://deb.debian.org/debian bookworm-updates main
5157
----
58+
--
59+
Debian 11 _Bullseye_::
60+
+
61+
--
62+
// SH: Leave anchors inside for the time being due to retrievability (MFS). They need to be taken out/replaced at a later point when we have a better solution. Reason: There must be one single ID per article.
63+
[#debian11]
64+
Debian 11_Bullseye_ can be obtained from the following package sources:
5265

53-
[discrete]
54-
[#debian12]
55-
==== Debian 12 _Bookworm_
5666

5767
./etc/apt/sources.list
5868
[{file}]
5969
----
60-
deb http://deb.debian.org/debian/ bookworm main
61-
deb https://security.debian.org/debian-security bookworm-security main
62-
# deb http://deb.debian.org/debian bookworm-updates main
70+
deb http://deb.debian.org/debian/ bullseye main
71+
deb https://security.debian.org/debian-security bullseye-security main
72+
# deb http://deb.debian.org/debian bullseye-updates main
6373
----
74+
--
75+
====
6476

6577
[#ubuntu]
6678
=== Ubuntu
@@ -72,24 +84,15 @@ Stability updates are provided here earlier than for the _dot releases_.
7284

7385
This results in the following examples of the `/etc/apt/sources.list` or, from Ubuntu 24.04 onwards, `/etc/apt/sources.list.d/ubuntu.sources`:
7486

75-
[discrete]
76-
[#ubuntu2204]
77-
==== Ubuntu 22.04 _Jammy Jellyfish_
78-
79-
./etc/apt/sources.list
80-
[{file}]
81-
----
82-
deb http://archive.ubuntu.com/ubuntu/ jammy main
83-
deb http://archive.ubuntu.com/ubuntu/ jammy universe
84-
deb http://archive.ubuntu.com/ubuntu jammy-security main
85-
deb http://archive.ubuntu.com/ubuntu jammy-security universe
86-
# deb http://archive.ubuntu.com/ubuntu/ jammy-updates main
87-
# deb http://archive.ubuntu.com/ubuntu/ jammy-updates universe
88-
----
8987

90-
[discrete]
88+
[.tabs]
89+
====
90+
Ubuntu 24.04 _Noble Numbat_::
91+
+
92+
--
93+
// SH: Leave anchors inside for the time being due to retrievability (MFS). They need to be taken out/replaced at a later point when we have a better solution. Reason: There must be one single ID per article.
9194
[#ubuntu2404]
92-
==== Ubuntu 24.04 _Noble Numbat_
95+
The configuration files for the package sources in Ubuntu 24.04 _Noble Numbat_ use a new syntax with blocks separated by blank lines:
9396

9497
./etc/apt/sources.list.d/ubuntu.sources
9598
[{file}]
@@ -106,7 +109,26 @@ Suites: noble-security
106109
Components: main universe
107110
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
108111
----
112+
--
113+
Ubuntu 22.04 _Jammy Jellyfish_::
114+
+
115+
--
116+
// SH: Leave anchors inside for the time being due to retrievability (MFS). They need to be taken out/replaced at a later point when we have a better solution. Reason: There must be one single ID per article.
117+
[#ubuntu2204]
118+
The configuration files for the package sources in Ubuntu 22.04 _Jammy Jellyfish_ use a new syntax with blocks separated by blank lines:
109119

120+
./etc/apt/sources.list
121+
[{file}]
122+
----
123+
deb http://archive.ubuntu.com/ubuntu/ jammy main
124+
deb http://archive.ubuntu.com/ubuntu/ jammy universe
125+
deb http://archive.ubuntu.com/ubuntu jammy-security main
126+
deb http://archive.ubuntu.com/ubuntu jammy-security universe
127+
# deb http://archive.ubuntu.com/ubuntu/ jammy-updates main
128+
# deb http://archive.ubuntu.com/ubuntu/ jammy-updates universe
129+
----
130+
--
131+
====
110132

111133
[#download]
112134
== Download the appropriate packages

0 commit comments

Comments
 (0)