Skip to content

Commit 86ddca3

Browse files
tbazanttbazant
authored
Imported chapters from Deployment guide (#1134)
* imported chapters from Deployment guide * fixed validation in opensuse
1 parent 8bf8229 commit 86ddca3

8 files changed

Lines changed: 54 additions & 125 deletions

‎xml/book_administration.xml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@
4343
<xi:include href="adm_sudo.xml"/>
4444
<xi:include href="yast2_gui.xml"/>
4545
<xi:include href="yast2_ncurses.xml"/>
46-
<xi:include href="yast2_userman.xml"/>
4746
<xi:include href="yast2_lang.xml"/>
48-
<xi:include href="yast2_hw.xml"/>
47+
<xi:include href="yast2_userman.xml"/>
4948
<xi:include href="yast2_you.xml"/>
5049
<xi:include href="yast2_sw.xml"/>
5150
<xi:include href="sw_managing_commandline.xml"/>
@@ -83,18 +82,17 @@
8382
<xi:include href="udev.xml"/>
8483
<xi:include href="suse_linux.xml"/>
8584
<xi:include href="nm.xml"/>
86-
<xi:include href="powermanagement.xml"/>
87-
<!-- FIXME cwickert 2018-10-26: A single chapter doesn't justify a part of
88-
it's own. However, we might want to have a 'Hardware' part once we have
89-
more content. For now, the part is commented out.
90-
-->
91-
<!-- </part> -->
85+
</part>
9286
<!-- ===================================================================== -->
9387
<!-- Part: Hardware Configuration -->
9488
<!-- ===================================================================== -->
95-
<!-- <part xml:id="part-hardware">
96-
<title>Hardware configuration</title> -->
97-
<xi:include href="hardware_vm_guest.xml"/>
89+
<part xml:id="part-hardware">
90+
<title>Hardware configuration</title>
91+
<xi:include href="yast2_keymouse.xml"/>
92+
<xi:include href="yast2_sound.xml"/>
93+
<xi:include href="yast2_printer.xml"/>
94+
<xi:include os="sled;osuse" href="yast2_scanner.xml"/>
95+
<xi:include href="powermanagement.xml"/>
9896
<xi:include href="hardware_nvdimm.xml"/>
9997
</part>
10098
<!-- ===================================================================== -->

‎xml/book_startup-opensuse.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<title>Administration</title>
3939
<xi:include href="yast2_userman.xml"/>
4040
<xi:include href="yast2_lang.xml"/>
41-
<xi:include href="yast2_hw.xml"/>
4241
<xi:include href="printing.xml"/>
4342
<xi:include href="fuse.xml"/>
4443
</part>
@@ -60,6 +59,17 @@
6059
<xi:include href="newbie_bash.xml"/>
6160
<xi:include href="adm_shell.xml"/>
6261
</part>
62+
<!-- ===================================================================== -->
63+
<!-- Part: Hardware Configuration -->
64+
<!-- ===================================================================== -->
65+
<part xml:id="part-hardware">
66+
<title>Hardware configuration</title>
67+
<xi:include href="yast2_keymouse.xml"/>
68+
<xi:include href="yast2_sound.xml"/>
69+
<xi:include href="yast2_printer.xml"/>
70+
<xi:include os="sled;osuse" href="yast2_scanner.xml"/>
71+
<xi:include href="hardware_nvdimm.xml"/>
72+
</part>
6373
<!-- ===================================================================== -->
6474
<!-- Part: Help and Troubleshooting -->
6575
<!-- ===================================================================== -->

‎xml/hardware_vm_guest.xml‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎xml/yast2_hw.xml‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎xml/yast2_keymouse.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE sect1
2+
<!DOCTYPE chapter
33
[
44
<!ENTITY % entities SYSTEM "generic-entities.ent">
55
%entities;
66
]>
77

8-
<sect1 version="5.0" xml:id="sec-yast-hw-keym"
8+
<chapter version="5.0" xml:id="sec-yast-hw-keym"
99
xmlns="http://docbook.org/ns/docbook"
1010
xmlns:xi="http://www.w3.org/2001/XInclude"
1111
xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -51,8 +51,8 @@
5151
</step>
5252
<step>
5353
<para>
54-
The result is stored in the files <filename>/etc/vconsole.conf</filename>
55-
(for text consoles) and
54+
The result is stored in the files <filename>/etc/vconsole.conf</filename>
55+
(for text consoles) and
5656
<filename>/etc/X11/xorg.conf.d/00-keyboard.conf</filename> (for X11).
5757
</para>
5858
</step>
@@ -67,4 +67,4 @@
6767
</para>
6868
</step>
6969
</procedure>
70-
</sect1>
70+
</chapter>

‎xml/yast2_printer.xml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE sect1
2+
<!DOCTYPE chapter
33
[
44
<!ENTITY % entities SYSTEM "generic-entities.ent">
55
%entities;
66
]>
77

8-
<sect1 version="5.0" xml:id="sec-yast-hw-print"
8+
<chapter version="5.0" xml:id="sec-yast-hw-print"
99
xmlns="http://docbook.org/ns/docbook"
1010
xmlns:xi="http://www.w3.org/2001/XInclude"
1111
xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -48,7 +48,7 @@
4848
</para>
4949
</note>
5050

51-
<sect2 xml:id="sec-yast-hw-print-local">
51+
<sect1 xml:id="sec-yast-hw-print-local">
5252
<title>Configuring printers</title>
5353
<para>
5454
Usually a USB printer is automatically detected. There are two possible
@@ -170,7 +170,7 @@
170170
</para>
171171
</step>
172172
</procedure>
173-
<sect3 xml:id="sec-yast-hw-print-local-get-ppd">
173+
<sect2 xml:id="sec-yast-hw-print-local-get-ppd">
174174
<title>Adding drivers with &yast;</title>
175175
<para>
176176
Not all printer drivers available for &productname; are installed by
@@ -279,8 +279,8 @@
279279
</para>
280280
</step>
281281
</procedure>
282-
</sect3>
283-
<sect3 xml:id="sec-yast-hw-print-local-tune">
282+
</sect2>
283+
<sect2 xml:id="sec-yast-hw-print-local-tune">
284284
<title>Editing a local printer configuration</title>
285285
<para>
286286
By editing an existing configuration for a printer you can change basic
@@ -324,10 +324,10 @@
324324
</para>
325325
</step>
326326
</procedure>
327-
</sect3>
328-
</sect2>
327+
</sect2>
328+
</sect1>
329329

330-
<sect2 xml:id="sec-yast-hw-print-network">
330+
<sect1 xml:id="sec-yast-hw-print-network">
331331
<title>Configuring printing via the network with &yast;</title>
332332
<para>
333333
Network printers are not detected automatically. They must be configured
@@ -337,7 +337,7 @@
337337
network printing by choosing <guimenu>Printing via Network</guimenu> from
338338
the left pane in the &yast; printer module.
339339
</para>
340-
<sect3 xml:id="sec-yast-hw-print-network-cups">
340+
<sect2 xml:id="sec-yast-hw-print-network-cups">
341341
<title>Using CUPS</title>
342342
<para>
343343
In a Linux environment CUPS is usually used to print via the network. The
@@ -439,8 +439,8 @@
439439
</para>
440440
</step>
441441
</procedure>
442-
</sect3>
443-
<sect3 xml:id="sec-yast-hw-print-network-other">
442+
</sect2>
443+
<sect2 xml:id="sec-yast-hw-print-network-other">
444444
<title>Using print servers other than CUPS</title>
445445
<para>
446446
If your network offers print services via print servers other than CUPS,
@@ -451,10 +451,10 @@
451451
<guimenu>Connection Type</guimenu>. Ask your network administrator for
452452
details on configuring a network printer in your environment.
453453
</para>
454-
</sect3>
455-
</sect2>
454+
</sect2>
455+
</sect1>
456456

457-
<sect2 xml:id="sec-yast-hw-print-share">
457+
<sect1 xml:id="sec-yast-hw-print-share">
458458
<title>Sharing printers over the network</title>
459459
<para>
460460
Printers managed by a local CUPS daemon can be shared over the network and
@@ -499,5 +499,5 @@
499499
</para>
500500
</step>
501501
</procedure>
502-
</sect2>
503-
</sect1>
502+
</sect1>
503+
</chapter>

‎xml/yast2_scanner.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE sect1
2+
<!DOCTYPE chapter
33
[
44
<!ENTITY % entities SYSTEM "generic-entities.ent">
55
%entities;
66
]>
77

8-
<sect1 version="5.0" xml:id="sec-yast-hw-scan"
8+
<chapter version="5.0" xml:id="sec-yast-hw-scan"
99
xmlns="http://docbook.org/ns/docbook"
1010
xmlns:xi="http://www.w3.org/2001/XInclude"
1111
xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -72,7 +72,7 @@
7272
</step>
7373
</procedure>
7474

75-
<sect2 xml:id="sec-yast-hw-scan-hp-allinone">
75+
<sect1 xml:id="sec-yast-hw-scan-hp-allinone">
7676
<title>Configuring an HP all-in-one device</title>
7777
<para>
7878
An HP All-In-One device can be configured with &yast; even if it is
@@ -114,9 +114,9 @@
114114
</para>
115115
</step>
116116
</procedure>
117-
</sect2>
117+
</sect1>
118118

119-
<sect2 xml:id="sec-yast-hw-scan-network-server">
119+
<sect1 xml:id="sec-yast-hw-scan-network-server">
120120
<title>Sharing a scanner over the network</title>
121121
<para>
122122
&productname; allows the sharing of a scanner over the network. To do
@@ -144,9 +144,9 @@
144144
</para>
145145
</step>
146146
</procedure>
147-
</sect2>
147+
</sect1>
148148

149-
<sect2 xml:id="sec-yast-hw-scan-network-client">
149+
<sect1 xml:id="sec-yast-hw-scan-network-client">
150150
<title>Scanning over the network</title>
151151
<para>
152152
To use a scanner that is shared over the network, proceed as follows:
@@ -179,5 +179,5 @@
179179
</para>
180180
</step>
181181
</procedure>
182-
</sect2>
183-
</sect1>
182+
</sect1>
183+
</chapter>

‎xml/yast2_sound.xml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE sect1
2+
<!DOCTYPE chapter
33
[
44
<!ENTITY % entities SYSTEM "generic-entities.ent">
55
%entities;
66
]>
77

88
<!--taroth 2010-01-08: yast2 module maintainer: lslezak@suse.cz-->
9-
<sect1 version="5.0" xml:id="sec-yast-hw-sound"
9+
<chapter version="5.0" xml:id="sec-yast-hw-sound"
1010
xmlns="http://docbook.org/ns/docbook"
1111
xmlns:xi="http://www.w3.org/2001/XInclude"
1212
xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -54,10 +54,6 @@
5454
The dialog shows all sound cards that were detected.
5555
</para>
5656

57-
<!--taroth 2010-01-18: removed information about probing for old sound chips as
58-
this referred to ISA sound cards only which are gone for several years already
59-
according to lslezak, no need to mention this any longer-->
60-
6157
<procedure xml:id="pro-yast2-sound-add">
6258
<title>Configuring sound cards</title>
6359
<para>
@@ -260,4 +256,4 @@
260256
<filename>/etc/modprobe.d/sound</filename> and written to
261257
<filename>/etc/sysconfig/sound</filename>.
262258
</para>
263-
</sect1>
259+
</chapter>

0 commit comments

Comments
 (0)