Author: fs Date: Fri Nov 25 14:23:02 2011 New Revision: 66953 URL: http://svn.opensuse.org/viewcvs/yast?rev=66953&view=rev Log: Adjusted Screenlayouts to avoid unnecessary whitespace and long lines Modified: trunk/autoinstallation/doc/xml/ASKSection.xml trunk/autoinstallation/doc/xml/BootloaderSection.xml trunk/autoinstallation/doc/xml/CreateProfile.xml trunk/autoinstallation/doc/xml/GeneralSection.xml trunk/autoinstallation/doc/xml/Installation.xml trunk/autoinstallation/doc/xml/KDumpSection.xml trunk/autoinstallation/doc/xml/MailSection.xml trunk/autoinstallation/doc/xml/Makefile.am trunk/autoinstallation/doc/xml/NFSSection.xml trunk/autoinstallation/doc/xml/NTPSection.xml trunk/autoinstallation/doc/xml/NetworkSection.xml trunk/autoinstallation/doc/xml/PartitioningSection.xml trunk/autoinstallation/doc/xml/Profile.xml trunk/autoinstallation/doc/xml/ReportSection.xml trunk/autoinstallation/doc/xml/RulesAndClasses.xml trunk/autoinstallation/doc/xml/ScriptsSection.xml trunk/autoinstallation/doc/xml/SoftwareSection.xml trunk/autoinstallation/doc/xml/UsersSection.xml trunk/autoinstallation/doc/xml/X11Section.xml trunk/autoinstallation/doc/xml/appendix2.xml trunk/autoinstallation/doc/xml/creating_autoyast2_modules.xml trunk/autoinstallation/doc/xml/linuxrc.xml trunk/autoinstallation/doc/xml/multiplesource.xml trunk/autoinstallation/doc/xml/purpose.xml Modified: trunk/autoinstallation/doc/xml/ASKSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/ASKSection.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/ASKSection.xml (original) +++ trunk/autoinstallation/doc/xml/ASKSection.xml Fri Nov 25 14:23:02 2011 @@ -108,7 +108,9 @@ <row> <entry><para>pathlist (available since openSUSE 11.0 and replaces <emphasis>path</emphasis>)</para></entry> <entry><para>A list of <emphasis>path</emphasis> elements (see above). - </para><screen><pathlist config:type="list"><path>networking,dns,hostname</path><path>...</path></screen></entry> + </para><screen><pathlist config:type="list" +><path>networking,dns,hostname</path> +<path>...</path></screen></entry> <entry><para>This information is optional but you should at least provide <emphasis>path</emphasis> or <emphasis>file</emphasis>.</para></entry> </row> <row> @@ -141,8 +143,7 @@ <entry><para>The selection element contains a list of <entry> elements. Each entry represents a possible option for the user to choose. The user cannot enter a value in a textfield, but he can choose from a list of values. - </para><screen> -<selection config:type="list"> + </para><screen><selection config:type="list"> <entry> <value> reiser @@ -306,8 +307,7 @@ Below you can see an example of the usage of the "ask" feature. </para> - <screen> -<general> + <screen><general> <ask-list config:type="list"> <ask> <!-- deprecated since openSUSE 11.0; use pathlist instead @@ -370,15 +370,13 @@ </ask> </ask-list> ... -</general> -</screen> +</general></screen> <para> The following example is a nice way to choose between &ay; profiles. &ay; will read the <filename>modified.xml</filename> file again after the ask-dialogs are done. This way you can fetch a complete new profile. </para> -<screen> - <ask> +<screen><ask> <selection config:type="list"> <entry> <value>part1.xml</value> @@ -407,14 +405,12 @@ <debug config:type="boolean">false</debug> <feedback config:type="boolean">false</feedback> </script> - </ask> -</screen> + </ask></screen> <para> Since openSUSE 11.0, you can verify the answer of a question with a script like this: </para> -<screen> - <ask> +<screen><ask> <script> <filename>my.sh</filename> <rerun_on_error config:type="boolean">true</rerun_on_error> @@ -440,8 +436,7 @@ </pathlist> <question>Enter Hostname</question> <default>enter your hostname here</default> - </ask> -</screen> + </ask></screen> </section> Modified: trunk/autoinstallation/doc/xml/BootloaderSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/BootloaderSection.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/BootloaderSection.xml (original) +++ trunk/autoinstallation/doc/xml/BootloaderSection.xml Fri Nov 25 14:23:02 2011 @@ -27,8 +27,7 @@ <para> General scope of &ay; profile only bootloader part.<remark>emap 2011-11-04: Unclear and incomplete sentence.</remark> </para> - <screen> -<bootloader> + <screen><bootloader> <device_map config:type="list"> - info about order of devices in device.map </device_map> @@ -42,35 +41,30 @@ <sections config:type="list"> - bootloader sections in menu.lst </sections> - </bootloader> -</screen> + </bootloader></screen> <section><title>Device map</title> <para> You can define devices and their order in <filename>device.map</filename>, but it is not necessary. yast2-bootloader checks the devices during installation and proposes a device.map. It can happen that the order of the devices is wrong or you have defined a different order than the one set in the BIOS. Take care when you make changes there. The system might not boot afterwards. </para> -<screen> -<device_map config:type="list"> +<screen><device_map config:type="list"> <device_map_entry> <firmware>hd0</firmware> <!-- order of devices in target map --> <linux>/dev/disk/by-id/ata-ST3500418AS_6VM23FX0</linux> <!-- name of device (disk) --> </device_map_entry> -</device_map> -</screen> +</device_map></screen> </section> <section><title>Globals</title> <para> This is an important if optional part. Define here where to install GRUB and how the boot process will work. Again, yast2-bootloader proposes a configuration if you don't define one. Usually the &ay; profile includes only this part and all other parts are added automatically during installation by yast2-bootloader. Unless you have some special requirements, don't specify the bootloader config in the XML file. </para> -<screen> - <global> +<screen><global> <activate>true</activate> <default>openSUSE 11.2 - 2.6.31.5-0.1</default> <gfxmenu>(hd0,1)/boot/message</gfxmenu> <lines_cache_id>4</lines_cache_id> <timeout config:type="integer">10</timeout> - </global> -</screen> + </global></screen> <informaltable frame='top'> <tgroup cols="3"> @@ -87,7 +81,7 @@ <entry> <para>Set the boot flag on the boot partition. The boot partition can be "/" if there is no separate /boot partition. If the boot partition is on a logical partition, the boot flag is set to the extended partition. </para> - <para><literal><activate>true</activate></literal></para> + <screen><activate>true</activate></screen> </entry> <entry></entry> </row> @@ -97,7 +91,7 @@ <para> Name (title) of the default boot section from <filename>menu.lst</filename>. </para> - <para><literal><default>openSUSE 11.2 - 2.6.31.5-0.1</default></literal></para> + <screen><default>openSUSE 11.2 - 2.6.31.5-0.1</default></screen> </entry> <entry></entry> </row> @@ -107,7 +101,7 @@ <para> Path to the graphical boot menu (/boot/message). Set to 'none' if you do not want to use a graphical boot menu. </para> - <para><literal><gfxmenu>(hd0,1)/boot/message</gfxmenu></literal></para> + <screen><gfxmenu>(hd0,1)/boot/message</gfxmenu></screen> </entry> <entry></entry> </row> @@ -117,7 +111,7 @@ <para> The timeout in seconds for automatically booting the default boot section from <filename>menu.lst</filename>. </para> - <para><literal><timeout config:type="integer">10</timeout></literal></para> + <screen><timeout config:type="integer">10</timeout></screen> </entry> <entry></entry> </row> @@ -127,7 +121,7 @@ <para> Write generic boot code to MBR, will be ignored if boot_mbr is set to "true". </para> - <para><literal><generic_mbr>false</generic_mbr></literal></para> + <screen><generic_mbr>false</generic_mbr></screen> </entry> <entry></entry> </row> @@ -137,7 +131,7 @@ <para> Write GRUB to MBR of the first disk in the order (device.map includes order of disks). </para> - <para><literal><boot_mbr>false</boot_mbr></literal></para> + <screen><boot_mbr>false</boot_mbr></screen> </entry> <entry></entry> </row> @@ -147,7 +141,7 @@ <para> Write GRUB to separate /boot partition. If no separate /boot partition exists, GRUB will be written to "/". </para> - <para><literal><boot_boot>false</boot_boot></literal></para> + <screen><boot_boot>false</boot_boot></screen> </entry> <entry></entry> </row> @@ -157,7 +151,7 @@ <para> Write GRUB to "/" partition. </para> - <para><literal><boot_root>false</boot_root></literal></para> + <screen><boot_root>false</boot_root></screen> </entry> <entry></entry> </row> @@ -167,7 +161,7 @@ <para> Write GRUB to the extended partition (important if you want to use a generic boot code and the "boot" partition is logical). NOTE: if the boot partition is logical, it should use boot_mbr (write GRUB to MBR) instead of generic_mbr. </para> - <para><literal><boot_extended>false</boot_extended></literal></para> + <screen><boot_extended>false</boot_extended></screen> </entry> <entry></entry> </row> @@ -177,7 +171,7 @@ <para> Write GRUB to custom device. </para> - <para><literal><boot_custom>/dev/sda3</boot_custom></literal></para> + <screen><boot_custom>/dev/sda3</boot_custom></screen> </entry> <entry></entry> </row> @@ -187,7 +181,7 @@ <para> Use trusted GRUB instead of the classical GRUB (gfxmenu is deleted automatically if this option is true). Do not use trusted GRUB if your hardware does not support it. </para> - <para><literal><trusted_grub>false</trusted_grub></literal></para> + <screen><trusted_grub>false</trusted_grub></screen> </entry> <entry></entry> </row> @@ -197,7 +191,6 @@ <para> Internal option specifying the cache id for perl-Bootloader. Do not use or change it in a cloned XML file. </para> - <para><literal></literal></para> </entry> <entry></entry> </row> @@ -215,16 +208,13 @@ <para> Define which boot loader to use: grub, lilo, ppc or elilo. </para> - <screen> -<loader_type>grub</loader_type> - </screen> + <screen><loader_type>grub</loader_type></screen> </section> <section><title>Sections</title> <para> The configuration of the boot sections in the menu.lst is added automatically here by yast2-bootloader during installation. yast2-bootloader deletes boot sections with no valid kernel and initrd path. </para> -<screen> - <sections config:type="list"> +<screen><sections config:type="list"> <section> <append>resume=/dev/disk/by-id/raid-sil_ajacccbhejai-part2 splash=silent quiet showotps</append> <image>(hd0,0)/vmlinuz-2.6.31-10-default</image> @@ -260,8 +250,7 @@ <original_name>floppy</original_name> <type>other</type> </section> - </sections> -</screen> + </sections></screen> </section> <section><title>Options</title> <para> @@ -284,7 +273,7 @@ <para> List of kernel args but without(!) vga= and root=. </para> - <para><literal><append>splash=silent quiet showopts</append></literal></para> + <screen><append>splash=silent quiet showopts</append></screen> </entry> <entry></entry> </row> @@ -294,7 +283,7 @@ <para> Path to the kernel. </para> - <para><literal><image>(hd0,0)/vmlinuz-2.6.31-10</image></literal></para> + <screen><image>(hd0,0)/vmlinuz-2.6.31-10</image></screen> </entry> <entry></entry> </row> @@ -304,7 +293,7 @@ <para> Path to the initrd. </para> - <para><literal><initrd>(hd0,0)/my-initrd</initrd></literal></para> + <screen><initrd>(hd0,0)/my-initrd</initrd></screen> </entry> <entry></entry> </row> @@ -314,7 +303,7 @@ <para> Internal option specifying the cache id for perl-Bootloader. Do not use or change it in a cloned XML file. </para> - <para><literal></literal></para> + <screen></screen> </entry> <entry></entry> </row> @@ -324,7 +313,7 @@ <para> Name of section. </para> - <para><literal><name>Productive System</name></literal></para> + <screen><name>Productive System</name></screen> </entry> <entry></entry> </row> @@ -334,7 +323,7 @@ <para> Internal name of section parsed by &yast; from a comment in the configuration file. There are some rules for names, and original_name helps to determine if the boot section is "linux" or "failsafe". For chainloader it helps to determine if it is "windows" or other (linux, floppy, etc). Use a simple original_name: linux, xen, windows, floppy, etc. </para> - <para><literal><original_name>linux</original_name></literal></para> + <screen><original_name>linux</original_name></screen> </entry> <entry></entry> </row> @@ -344,7 +333,7 @@ <para> Location of the root partition ("/"). </para> - <para><literal><root>/dev/mapper/sil_ajacccbhejai_part3</root></literal></para> + <screen><root>/dev/mapper/sil_ajacccbhejai_part3</root></screen> </entry> <entry></entry> </row> @@ -354,7 +343,7 @@ <para> Type of section (image/xen/other/menu). </para> - <para><literal><type>xen</type></literal></para> + <screen><type>xen</type></screen> </entry> <entry></entry> </row> @@ -364,7 +353,7 @@ <para> Kernel arg for vga (vga=). </para> - <para><literal><vgamode>0x31a</vgamode></literal></para> + <screen><vgamode>0x31a</vgamode></screen> </entry> <entry></entry> </row> @@ -374,7 +363,7 @@ <para> Path to xen.gz. </para> - <para><literal><xen>(hd0,0)/xen.gz</xen></literal></para> + <screen><xen>(hd0,0)/xen.gz</xen></screen> </entry> <entry></entry> </row> @@ -384,7 +373,7 @@ <para> Kernel args for XEN. </para> - <para><literal><xen_append></xen_append></literal></para> + <screen><xen_append></xen_append></screen> </entry> <entry></entry> </row> @@ -409,7 +398,7 @@ <para> Internal option specifying the cache id for perl-Bootloader. Do not use or change it in a cloned XML file. </para> - <para><literal></literal></para> + <screen></screen> </entry> <entry></entry> </row> @@ -419,7 +408,7 @@ <para> Name or title of the section. </para> - <para><literal><name>Floppy</name></literal></para> + <screen><name>Floppy</name></screen> </entry> <entry></entry> </row> @@ -429,7 +418,7 @@ <para> Internal name of the section parsed by &yast; from a comment in the configuration file. There are some rules for names and original_name helps to determine if the boot section is "linux" or "failsafe". For the chainloader it helps to determine if it is "windows" or other (linux, floppy, etc). Use a simple original_name: linux, xen, windows, floppy etc. </para> - <para><literal><original_name>linux</original_name></literal></para> + <screen><original_name>linux</original_name></screen> </entry> <entry></entry> </row> @@ -439,7 +428,7 @@ <para> Type of section (image/xen/other/menu). </para> - <para><literal><type>other</type></literal></para> + <screen><type>other</type></screen> </entry> <entry></entry> </row> @@ -449,7 +438,7 @@ <para> Offset in chainloader (used only in grub). </para> - <para><literal><blockoffset>1</blockoffset></literal></para> + <screen><blockoffset>1</blockoffset></screen> </entry> <entry></entry> </row> @@ -459,7 +448,7 @@ <para> Partition part for chainloader (so chainloader+blockoffset get final chainloader item in grub).<remark>emap 2011-11-04: Not sure what the parenthesis is supposed to say.</remark> </para> - <para><literal><chainloader>/dev/fd0</chainloader></literal></para> + <screen><chainloader>/dev/fd0</chainloader></screen> </entry> <entry></entry> </row> @@ -469,7 +458,7 @@ <para> With or without checking root. <remark>emap 2011-11-04: Awkward. Can someone make this clearer?</remark> </para> - <para><literal><noverifyroot>true</noverifyroot></literal></para> + <screen><noverifyroot>true</noverifyroot></screen> </entry> <entry></entry> </row> @@ -479,7 +468,7 @@ <para> Windows-specific option for remapping hard disks, for example switch the first and second disk: map (hd0) (hd1) map (hd1) (hd0) </para> - <para><literal><remap>false</remap></literal></para> + <screen><remap>false</remap></screen> </entry> <entry></entry> </row> @@ -489,7 +478,7 @@ <para> Add the makeactive argument for the chainloader section. </para> - <para><literal><makeactive>false</makeactive></literal></para> + <screen><makeactive>false</makeactive></screen> </entry> <entry></entry> </row> @@ -514,7 +503,7 @@ <para> Internal option specifying the cache id for perl-Bootloader. Do not use or change it in a cloned XML file. </para> - <para><literal></literal></para> + <screen></screen> </entry> <entry></entry> </row> @@ -524,7 +513,7 @@ <para> Name or title of section. </para> - <para><literal><name>Floppy</name></literal></para> + <screen><name>Floppy</name></screen> </entry> <entry></entry> </row> @@ -534,7 +523,7 @@ <para> Internal name of section parsed by YaST from a comment in the configuration file. There are some rules for names and original_name helps to determine if the boot section is "linux" or "failsafe". For the chainloader it helps to determine if it is "windows" or other (linux, floppy etc). Use a simple original_name: linux, xen, windows, floppy etc. </para> - <para><literal><original_name>linux</original_name></literal></para> + <screen><original_name>linux</original_name></screen> </entry> <entry></entry> </row> @@ -544,7 +533,7 @@ <para> Type of section (image/xen/other/menu). </para> - <para><literal><type>other</type></literal></para> + <screen><type>other</type></screen> </entry> <entry></entry> </row> @@ -554,7 +543,7 @@ <para> Path to menu.lst config file. </para> - <para><literal><configfile>1</configfile></literal></para> + <screen><configfile>1</configfile></screen> </entry> <entry></entry> </row> @@ -564,7 +553,7 @@ <para> Device name for loading menu.lst from another installation of Linux. </para> - <para><literal><root>/dev/sda1</root></literal></para> + <screen><root>/dev/sda1</root></screen> </entry> <entry></entry> </row> Modified: trunk/autoinstallation/doc/xml/CreateProfile.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/CreateProfile.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/CreateProfile.xml (original) +++ trunk/autoinstallation/doc/xml/CreateProfile.xml Fri Nov 25 14:23:02 2011 @@ -68,9 +68,7 @@ following command (make sure the <emphasis>DISPLAY</emphasis> variable is set correctly to start the graphical user interface instead of the text based one): </para> - <screen> -/sbin/yast2 autoyast - </screen> + <screen>/sbin/yast2 autoyast</screen> </section> @@ -85,9 +83,7 @@ on the distribution. For example, to verify that the file is well-formed, use the utility <command>xmllint</command> available with the <emphasis>libxml2</emphasis> package: </para> - <screen> -xmllint <control file> - </screen> + <screen>xmllint <control file></screen> <para> If the control file is not well formed, for example, if a tag is not closed, <command>xmllint</command> will report about the errors. @@ -125,9 +121,7 @@ </para> <example> <title>Example file for replacing hostname/domain by script</title> - <screen>http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> <para> This file expects the "hostname" and the "domain" as parameters from the user. @@ -147,12 +141,10 @@ <para> If you have multiple XSL files you want to apply to a template, do the following: </para> - <screen> - sabcmd add_hd_vg.xsl \$device=/dev/sda \$partition=p2 \$vg=system \ + <screen>sabcmd add_hd_vg.xsl \$device=/dev/sda \$partition=p2 \$vg=system \ | sabcmd add_harddisk.xsl \$device=/dev/system \$lvm=true \ | sabcmd .... - | sabcmd add_hostname.xsl \$hostname=myHost \$domain=my.domain - </screen> + | sabcmd add_hostname.xsl \$hostname=myHost \$domain=my.domain</screen> <para> Pipe the output of each sabcmd to the next sabcmd. </para> Modified: trunk/autoinstallation/doc/xml/GeneralSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/GeneralSection.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/GeneralSection.xml (original) +++ trunk/autoinstallation/doc/xml/GeneralSection.xml Fri Nov 25 14:23:02 2011 @@ -82,42 +82,42 @@ <row> <entry>confirm</entry> <entry>If this boolean is set to "true", the installation stops at the confirmation screen (also called proposal screen) and has to be confirmed with the "install" button. - <para><screen><confirm config:type="boolean">true</confirm></screen></para> + <screen><confirm config:type="boolean">true</confirm></screen> </entry> <entry>Optional. The default is true.</entry> </row> <row> <entry>halt</entry> <entry>Shuts down the machine after the first stage. So if you turn it on again, the machine boots and the second stage of the autoinstallation starts - <para><screen><halt config:type="boolean">true</halt></screen></para> + <screen><halt config:type="boolean">true</halt></screen> </entry> <entry>Optional. The default is false.</entry> </row> <row> <entry>second_stage</entry> <entry>This boolean determines if AutoYaST will run in the second stage too (after the partitioning, software and bootloader installation of the first stage). If you set this to "false", a normal manual installation happens in the second stage. - <para><screen><second_stage config:type="boolean">true</second_stage></screen></para> + <screen><second_stage config:type="boolean">true</second_stage></screen> </entry> <entry>Optional. The default is true.</entry> </row> <row> <entry>final_reboot</entry> <entry>If you set this to "true", the machine will reboot at the very end of the installation (when everything is installed and configured at the end of the second stage) - <para><screen><final_reboot config:type="boolean">true</final_reboot></screen></para> + <screen><final_reboot config:type="boolean">true</final_reboot></screen> </entry> <entry>Optional. The default is false. It makes no sense to set this <emphasis>and</emphasis> final_halt to "true". This options is available since openSUSE 11.0 and SLES11.</entry> </row> <row> <entry>final_halt</entry> <entry>If you set this to "true", the machine will shutdown at the very end of the installation (when everything is installed and configured at the end of the second stage) - <para><screen><final_halt config:type="boolean">true</final_halt></screen></para> + <screen><final_halt config:type="boolean">true</final_halt></screen> </entry> <entry>Optional. The default is "false". It makes no sense to set this <emphasis>and</emphasis> final_reboot to "true". This options is available since openSUSE 11.0 and SLES11.</entry> </row> <row> <entry>forceboot</entry> <entry>Some openSUSE releases use kexec to avoid the reboot after the first stage. They immediately boot into the installed system. You can force a reboot with this - <para><screen><forceboot config:type="boolean">true</forceboot></screen></para> + <screen><forceboot config:type="boolean">true</forceboot></screen> </entry> <entry>Optional. The default is "false".</entry> </row> Modified: trunk/autoinstallation/doc/xml/Installation.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Installation.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/Installation.xml (original) +++ trunk/autoinstallation/doc/xml/Installation.xml Fri Nov 25 14:23:02 2011 @@ -128,8 +128,7 @@ Here is an example of a <filename>/srv/tftp/pxelinux.cfg/default</filename> file: </para><remark>emap 2011-11-07: Update the example to SLES11?</remark> - <screen> -default SLES9 + <screen>default SLES9 # install SLES9 label SLES9 @@ -138,8 +137,7 @@ # boot harddisc label hd· - LOCALBOOT 0 - </screen> + LOCALBOOT 0</screen> <para> We recommended you add the vga=... parameter with a valid value for graphical installations, to trigger an installation with the frame buffer device instead @@ -148,8 +146,7 @@ <para> Here is as an example of a <filename>/etc/dhcp.conf</filename> file: </para> - <screen> -option domain-name-servers 192.168.66.1; + <screen>option domain-name-servers 192.168.66.1; default-lease-time 600; max-lease-time 7200; ddns-update-style none; ddns-updates off; @@ -173,8 +170,7 @@ # The configured tftp server on 192.168.100.1 runs in a· # "change-root jail" to /srv/tftpboot filename "pxelinux.0"; -} - </screen> +}</screen> <para> A problem you might run into if you do installation via PXE is that the installation will run into an endless loop, because after the first reboot, @@ -191,9 +187,7 @@ <para> Another way is to use &ay; to upload a new PXE boot configuration for the target host via the profile: </para> - <screen> - <![CDATA[ - <pxe> + <screen><![CDATA[<pxe> <pxe_localboot config:type="boolean">true</pxe_localboot> <pxelinux-config> DEFAULT linux @@ -206,8 +200,7 @@ <pxelinux-dir>/pxelinux.cfg</pxelinux-dir> <filename>__MAC__</filename> <!-- since openSUSE 11.2, not SLES11 --> </pxe> -]]> - </screen> +]]></screen> <para> This entry will upload a new configuration for the target host to the tftp server shortly before the first reboot happens. In most installations the TFTP daemon runs as user @@ -554,17 +547,13 @@ <para> Specify the exact location of the control file: </para> - <screen> -autoyast=http://192.168.1.1/control-files/client01.xml - </screen> + <screen>autoyast=http://192.168.1.1/control-files/client01.xml</screen> </listitem> <listitem> <para> Specify a directory where several control files are located: </para> - <screen> -autoyast=http://192.168.1.1/control-files/ - </screen> + <screen>autoyast=http://192.168.1.1/control-files/</screen> <para> In this case the relevant control file is retrieved using the hex digit representation of the IP as described below. @@ -620,10 +609,8 @@ </para> <example> <title>Determine HEX code for an IP address</title> - <screen> -# /usr/sbin/gethostip 10.10.0.1 -10.10.0.1 10.10.0.1 0A0A0001 - </screen> + <screen># /usr/sbin/gethostip 10.10.0.1 +10.10.0.1 10.10.0.1 0A0A0001</screen> </example> @@ -646,8 +633,7 @@ <filename>autoinst.xml</filename> to a floppy by either mounting the floppy or by using the <emphasis>mtools</emphasis>. </para> - <screen>mcopy autoinst.xml a: - </screen> + <screen>mcopy autoinst.xml a:</screen> <remark>emap 2011-11-07: This section should be merged with the previous one on auto-install with the original CDs and floppy, with all redundant information dropped.</remark> </section> Modified: trunk/autoinstallation/doc/xml/KDumpSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/KDumpSection.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/KDumpSection.xml (original) +++ trunk/autoinstallation/doc/xml/KDumpSection.xml Fri Nov 25 14:23:02 2011 @@ -315,14 +315,16 @@ <row> <entry>KDUMP_SAVEDIR</entry> <entry><para>An URL that specifies the target to which the dump and related files will be saved. - </para><screen><KDUMP_SAVEDRIR>file:///var/crash/</KDUMP_SAVEDIR></screen></entry> + </para><screen><KDUMP_SAVEDRIR +>file:///var/crash/</KDUMP_SAVEDIR></screen></entry> <entry>required</entry> </row> <row> <entry>KDUMP_COPY_KERNEL</entry> <entry><para>Set to "true", if not only the dump should be saved to <literal>KDUMP_SAVEDIR</literal> but also the kernel and its debugging information (if installed). - </para><screen><KDUMP_COPY_KERNEL>false</KDUMP_COPY_KERNEL></screen></entry> + </para><screen><KDUMP_COPY_KERNEL +>false</KDUMP_COPY_KERNEL></screen></entry> <entry>optional</entry> </row> <row> @@ -331,7 +333,8 @@ <para>Disk space in megabytes that must remain free after saving the dump. If not enough space is available to write the dump and keep the required disk space free, the dump will not be saved. - </para><screen><KDUMP_FREE_DISK_SIZE>64</KDUMP_FREE_DISK_SIZE></screen></entry> + </para><screen><KDUMP_FREE_DISK_SIZE +>64</KDUMP_FREE_DISK_SIZE></screen></entry> <entry>optional</entry> </row> <row> @@ -339,7 +342,8 @@ <entry> <para>The number of dumps that are kept (i.e., not deleted) if <literal>KDUMP_SAVEDIR</literal> points to a local directory. Specify 0 if you do not want any dumps to be automatically deleted, specify -1 if all dumps except the current one should be deleted. - </para><screen><KDUMP_KEEP_OLD_DUMPS>4</KDUMP_KEEP_OLD_DUMPS></screen></entry> + </para><screen><KDUMP_KEEP_OLD_DUMPS +>4</KDUMP_KEEP_OLD_DUMPS></screen></entry> <entry>optional</entry> </row> </tbody> @@ -396,14 +400,16 @@ Exactly one email address to which the email should be sent. Additional recipients can be specified in <literal>KDUMP_NOTIFICATION_CC</literal>. - </para><screen><KDUMP_NOTIFICATION_TO>tux@example.com</KDUMP_NOTIFICATION_TO></screen><remark>emap 2011-11-06: Do we really want to use an actual email address here?</remark> + </para><screen><KDUMP_NOTIFICATION_TO +>tux@example.com</KDUMP_NOTIFICATION_TO></screen><remark>emap 2011-11-06: Do we really want to use an actual email address here?</remark> <remark>ke 2011-11-09: no, use example.com</remark></entry> <entry>optional (notification disabled if empty)</entry> </row> <row> <entry>KDUMP_NOTIFICATION_CC</entry> <entry><para>Zero, one or more recipients that are in the cc line of the notification email. - </para><screen><KDUMP_NOTIFICATION_CC>spam@suse.de devnull@suse.de</KDUMP_NOTIFICATION_CC></screen></entry> + </para><screen><KDUMP_NOTIFICATION_CC +>spam@suse.de devnull@suse.de</KDUMP_NOTIFICATION_CC></screen></entry> <entry>optional</entry> </row> <row> @@ -411,7 +417,8 @@ <entry><para> Host name of the SMTP server used for mail delivery. SMTP authentication is supported (see <literal>KDUMP_SMTP_USER</literal> and <literal>KDUMP_SMTP_PASSWORD</literal>) but TSL and SSL are <emphasis>not</emphasis>. - </para><screen><KDUMP_SMTP_SERVER>email.suse.de</KDUMP_SMTP_SERVER></screen></entry> + </para><screen><KDUMP_SMTP_SERVER +>email.suse.de</KDUMP_SMTP_SERVER></screen></entry> <entry>optional (notification disabled if empty)</entry> </row> <row> @@ -419,7 +426,8 @@ <entry><para> User name used together with <literal>KDUMP_SMTP_PASSWORD</literal> for SMTP authentication. - </para><screen><KDUMP_SMTP_USER>bwalle</KDUMP_SMTP_USER></screen></entry> + </para><screen><KDUMP_SMTP_USER +>bwalle</KDUMP_SMTP_USER></screen></entry> <entry>optional</entry> </row> <row> @@ -427,7 +435,8 @@ <entry><para> Password used together with <literal>KDUMP_SMTP_USER</literal> for SMTP authentication. - </para><screen><KDUMP_SMTP_PASSWORD>geheim</KDUMP_SMTP_PASSWORD></screen></entry> + </para><screen><KDUMP_SMTP_PASSWORD +>geheim</KDUMP_SMTP_PASSWORD></screen></entry> <entry>optional</entry> </row> </tbody> @@ -479,13 +488,15 @@ <entry>KDUMP_KERNELVER</entry> <entry><para>Version string for the kernel used for kdump. Leave it empty to use the auto-detection mechanism (strongly recommended). - </para><screen><KDUMP_KERNELVER>2.6.27-default</KDUMP_KERNELVER></screen></entry> + </para><screen><KDUMP_KERNELVER +>2.6.27-default</KDUMP_KERNELVER></screen></entry> <entry>optional (auto-detection if empty)</entry> </row> <row> <entry>KDUMP_COMMANDLINE_APPEND</entry> <entry><para>Additional command line parameters for the kdump kernel. - </para><screen><KDUMP_COMMANDLINE_APPEND>console=ttyS0,57600</KDUMP_COMMANDLINE_APPEND></screen></entry> + </para><screen><KDUMP_COMMANDLINE_APPEND +>console=ttyS0,57600</KDUMP_COMMANDLINE_APPEND></screen></entry> <entry>optional</entry> </row> <row> @@ -493,7 +504,8 @@ <entry><para> Overwrite the automatically generated kdump command line. Use with care. In most cases, <literal>KDUMP_COMMANDLINE_APPEND</literal> should suffice. - </para><screen><KDUMP_COMMANDLINE_APPEND>root=/dev/sda5 maxcpus=1 irqpoll</KDUMP_COMMANDLINE></screen></entry> + </para><screen><KDUMP_COMMANDLINE_APPEND +>root=/dev/sda5 maxcpus=1 irqpoll</KDUMP_COMMANDLINE></screen></entry> <entry>optional<!-- (email notification disabled if empty)--> <remark>emap 2011-11-06: I don't think the email stuff belongs here.</remark></entry> </row> @@ -526,7 +538,8 @@ <entry><para><literal>true</literal> if the system should be rebooted automatically after the dump has been saved, <literal>false</literal> otherwise. The default is to reboot the system automatically. - </para><screen><KDUMP_IMMEDIATE_REBOOT>true</KDUMP_IMMEDIATE_REBOOT></screen></entry> + </para><screen><KDUMP_IMMEDIATE_REBOOT +>true</KDUMP_IMMEDIATE_REBOOT></screen></entry> <entry>optional</entry> </row> <row> Modified: trunk/autoinstallation/doc/xml/MailSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/MailSection.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/MailSection.xml (original) +++ trunk/autoinstallation/doc/xml/MailSection.xml Fri Nov 25 14:23:02 2011 @@ -29,10 +29,8 @@ </para> <example> <title>Mail Configuration</title> - <screen> - http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> </section> Modified: trunk/autoinstallation/doc/xml/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Makefile.am?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/Makefile.am (original) +++ trunk/autoinstallation/doc/xml/Makefile.am Fri Nov 25 14:23:02 2011 @@ -8,10 +8,10 @@ htmldir = $(docdir)/html xml_file = autoyast.xml -xml_files = $(wildcard *.xml) -daps_ent_files = entity-decl.ent network-decl.ent +xml_files = $(wildcard *.xml) +ent_files = $(wildcard *.ent) -EXTRA_DIST = $(xml_files) $(daps_ent_files) $(wildcard *.xsl) \ +EXTRA_DIST = $(xml_files) $(ent_files) $(wildcard *.xsl) \ web/default.css bin entities examples CLEANFILES = .html.sum profile.dtd.xml elements \ @@ -22,51 +22,62 @@ STYLESHEET_CSS = default.css -html_DATA = $(wildcard html/*.html) \ - html/index.html \ - html/yast2docs.css \ - html/default.css +DAPS_BASE=$(shell readlink -f ..) + +html_DATA = html +doc_DATA = pdf + +#html_DATA = $(wildcard html/*.html) \ +# html/index.html \ +# html/yast2docs.css \ +# html/default.css #doc_DATA = autoyast.pdf -components: components.ent +.PHONY: pdf html pkgsrc html-debug entities + +html: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml +html: RESULTDIR=$(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) html-dir-name 2>/dev/null) +html: + daps -e ENV-autoyast --basedir=$(DAPS_BASE) html --static + rm -rf html && mkdir -p html + mv $(RESULTDIR)/* html + +pdf: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml +pdf: RESULTDIR=$(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) +pdf: + daps -e ENV-autoyast --basedir=$(DAPS_BASE) pdf-color + +pkgsrc: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml + daps -e ENV-autoyast --basedir=$(DAPS_BASE) package-src + +html-debug: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml + daps --debug -e ENV-autoyast --basedir=$(DAPS_BASE) html + +#bigfile: +# cd xml; make ay_bigfile.xml + + + + +entities: components.ent examples.ent images.ent + +components.ent: bin/components.sh noref > components.ent -examples: examples.ent +examples.ent: bin/examples.sh > examples.ent -html/index.html: autoyast.xml - XML_CATALOG_FILES=@XML_CATALOG@ \ - time -p @XSLTPROC@ --xinclude \ - -stringparam chunk.fast '1' \ - --stringparam html.stylesheet $(STYLESHEET_CSS) \ - @STYLESHEET_HTML@ autoyast.xml - XML_CATALOG_FILES=@XML_CATALOG@ \ - time -p @XSLTPROC@ --xinclude \ - -stringparam base.dir 'html/devel/' \ - -stringparam chunk.fast '1' \ - --stringparam show.comments '0' \ - --stringparam html.stylesheet $(STYLESHEET_CSS) \ - @STYLESHEET_HTML@ creating_autoyast2_modules.xml - cd html/devel; \ - ln -s ../default.css ./default.css; \ - cd ../.. - -html/index.html: autoyast.xml - XML_CATALOG_FILES=@XML_CATALOG@ \ - @XSLTPROC@ --xinclude \ - --stringparam show.comments '0' \ - @STYLESHEET_HTML@ \ - $< +images.ent: + @make -r -C images/WEB -f makefile.ent ima # was: images/PNG/*.png prep-daps-images: mkdir -p ../images/src/png - cp ../autoyast2/img/*.png ../images/src/png + cp -axu ../autoyast2/img/*.png ../images/src/png -ay_bigfile_docbook.xml: prep-daps-images +ay_bigfile_docbook.xml: autoyast.xml $(xml_files) prep-daps-images entities # Remove internal entity statements -ay_bigfile_docbook.xml: autoyast.xml { head -n 3 $< ; \ XML_CATALOG_FILES=@XML_CATALOG@ \ xmllint --xinclude --noent --nocdata -o - $< \ @@ -90,17 +101,54 @@ xsltproc --output $@ \ /usr/share/susedoc/xslt/misc/db2novdoc.xsl $< +install-data-local: + install -d -m 755 $(DESTDIR)$(htmldir) + cp -a $(srcdir)/html/* $(DESTDIR)$(htmldir) +# cp -a $(srcdir)/html/images $(DESTDIR)$(htmldir) +# cp -a $(srcdir)/html/img $(DESTDIR)$(htmldir) +# cp -a $(srcdir)/html/devel $(DESTDIR)$(htmldir) + +clean-local: + rm -rf html + + + +#html/index.html: autoyast.xml +# XML_CATALOG_FILES=@XML_CATALOG@ \ +# time -p @XSLTPROC@ --xinclude \ +# -stringparam chunk.fast '1' \ +# --stringparam html.stylesheet $(STYLESHEET_CSS) \ +# @STYLESHEET_HTML@ autoyast.xml +# XML_CATALOG_FILES=@XML_CATALOG@ \ +# time -p @XSLTPROC@ --xinclude \ +# -stringparam base.dir 'html/devel/' \ +# -stringparam chunk.fast '1' \ +# --stringparam show.comments '0' \ +# --stringparam html.stylesheet $(STYLESHEET_CSS) \ +# @STYLESHEET_HTML@ creating_autoyast2_modules.xml +# cd html/devel; \ +# ln -s ../default.css ./default.css; \ +# cd ../.. + +#html/index.html: autoyast.xml +# XML_CATALOG_FILES=@XML_CATALOG@ \ +# @XSLTPROC@ --xinclude \ +# --stringparam show.comments '0' \ +# @STYLESHEET_HTML@ \ +# $< + + # Not in use; use ay_bigfile.xml -ay_bigfile_novdoc.xml: prep-daps-images -ay_bigfile_novdoc.xml: autoyast.xml - { echo '<?xml version="1.0" encoding="UTF-8"?>'; \ - echo '<!DOCTYPE book PUBLIC "-//Novell//DTD NovDoc XML V1.0//EN" "novdocx.dtd"'; \ - echo '['; \ - echo '<!ENTITY % NOVDOC.DEACTIVATE.IDREF "INCLUDE">'; \ - XML_CATALOG_FILES=@XML_CATALOG@ \ - xmllint --xinclude --noent --nocdata -o - $< \ - | awk 'BEGIN{b=0}; /^]>/ && b == 0 {b=1}; b == 1 {print}' \ - | sed 's|fileref=\"img/|fileref=\"|' ; } > $@ +#ay_bigfile_novdoc.xml: prep-daps-images +#ay_bigfile_novdoc.xml: autoyast.xml +# { echo '<?xml version="1.0" encoding="UTF-8"?>'; \ +# echo '<!DOCTYPE book PUBLIC "-//Novell//DTD NovDoc XML V1.0//EN" "novdocx.dtd"'; \ +# echo '['; \ +# echo '<!ENTITY % NOVDOC.DEACTIVATE.IDREF "INCLUDE">'; \ +# XML_CATALOG_FILES=@XML_CATALOG@ \ +# xmllint --xinclude --noent --nocdata -o - $< \ +# | awk 'BEGIN{b=0}; /^]>/ && b == 0 {b=1}; b == 1 {print}' \ +# | sed 's|fileref=\"img/|fileref=\"|' ; } > $@ #autoyast.fo: autoyast.xml # XML_CATALOG_FILES=@XML_CATALOG@ \ @@ -113,71 +161,59 @@ #autoyast.pdf: autoyast.fo # fop -q $< $@ -autoyast.xml: images.ent examples components - -html/yast2docs.css: html/index.html - cp @STYLESHEET_CSS@ html - cp -a $(ydatadir)/docbook/images html +#autoyast.xml: images.ent examples components -html/default.css: html/index.html webimages - cp web/default.css html +#html/yast2docs.css: html/index.html +# cp @STYLESHEET_CSS@ html +# cp -a $(ydatadir)/docbook/images html + +#html/default.css: html/index.html webimages +# cp web/default.css html + +#: images.ent chunks webimages + + +#webimages: +# mkdir -p html/img +# cp -a images/WEB/*png html/img + + +#.PHONY: images examples.ent components.ent + +#images: images/EPS/* images/PNG/* +# @if ! [ -e "img" ]; then \ +# mkdir -p img; \ +# fi +# @if ! [ -e "img/Makefile" ]; then \ +# ln -s ../images/makefile.images img/Makefile; \ +# fi + +# @echo "generating PNG files for all outputs..."; +# @if [ "$(IMAGES)" = "all" ]; then \ +# rm -f img/*.{png,pdf}; \ +# fi; + +# @for j in `bin/findImages.sh` ; do \ +# if [ -e "images/EPS/$$j" ]; then \ +# source="images/EPS/$$j"; eps="1";\ +# elif [ -e "images/PNG/$$j" ]; then \ +# source="images/PNG/$$j"; eps="0"; \ +# fi; \ +# dest=`echo "img/$$j" | sed -e "s|_|-|g;s|.eps||g;s|.png||g;"`; \ +# if [ -e "$$source" ]; then \ +# if [ ! -f $$dest".png" ] || [ $$dest".png" -ot $$source ]; then \ +# if [ $$eps == "1" ]; then \ +# echo " converting $$source -> $$dest'.pdf'"; \ +# bin/epstopdf12 -o=$$dest".pdf" $$source; \ +# echo " converting $$source -> $$dest'.png'"; \ +# convert $$source $$dest".png"; \ +# else \ +# echo " linking $$source -> $$dest'.png'"; \ +# convert -depth 8 $$source $$dest".png"; \ +# fi; \ +# fi; \ +# fi; \ +# done +# @make -r -C img ima -images.ent: - @make -r -C images/WEB -f makefile.ent ima - -: images.ent chunks webimages - - -webimages: - mkdir -p html/img - cp -a images/WEB/*png html/img - - -.PHONY: images examples.ent components.ent - -images: images/EPS/* images/PNG/* - @if ! [ -e "img" ]; then \ - mkdir -p img; \ - fi - @if ! [ -e "img/Makefile" ]; then \ - ln -s ../images/makefile.images img/Makefile; \ - fi - - @echo "generating PNG files for all outputs..."; - @if [ "$(IMAGES)" = "all" ]; then \ - rm -f img/*.{png,pdf}; \ - fi; - - @for j in `bin/findImages.sh` ; do \ - if [ -e "images/EPS/$$j" ]; then \ - source="images/EPS/$$j"; eps="1";\ - elif [ -e "images/PNG/$$j" ]; then \ - source="images/PNG/$$j"; eps="0"; \ - fi; \ - dest=`echo "img/$$j" | sed -e "s|_|-|g;s|.eps||g;s|.png||g;"`; \ - if [ -e "$$source" ]; then \ - if [ ! -f $$dest".png" ] || [ $$dest".png" -ot $$source ]; then \ - if [ $$eps == "1" ]; then \ - echo " converting $$source -> $$dest'.pdf'"; \ - bin/epstopdf12 -o=$$dest".pdf" $$source; \ - echo " converting $$source -> $$dest'.png'"; \ - convert $$source $$dest".png"; \ - else \ - echo " linking $$source -> $$dest'.png'"; \ - convert -depth 8 $$source $$dest".png"; \ - fi; \ - fi; \ - fi; \ - done - @make -r -C img ima - - -install-data-local: - install -d -m 755 $(DESTDIR)$(htmldir) - cp -a $(srcdir)/html/images $(DESTDIR)$(htmldir) - cp -a $(srcdir)/html/img $(DESTDIR)$(htmldir) -# cp -a $(srcdir)/html/devel $(DESTDIR)$(htmldir) - -clean-local: - rm -rf html Modified: trunk/autoinstallation/doc/xml/NFSSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/NFSSection.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/NFSSection.xml (original) +++ trunk/autoinstallation/doc/xml/NFSSection.xml Fri Nov 25 14:23:02 2011 @@ -32,11 +32,8 @@ <title> Network Configuration: NFS Client </title> - <screen> - - http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> <para> From openSUSE 11.3 (SLE12 respectively) on, the structure of NFS @@ -52,23 +49,16 @@ <title> Network Configuration: NFS Client - New Style (openSUSE 11.3 and newer) </title> - <screen> - - http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> <example> <title> Network Configuration: NFS Server </title> - <screen> - - - http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> </section> Modified: trunk/autoinstallation/doc/xml/NTPSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/NTPSection.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/NTPSection.xml (original) +++ trunk/autoinstallation/doc/xml/NTPSection.xml Fri Nov 25 14:23:02 2011 @@ -40,10 +40,8 @@ <title> Network configuration: NTP Client </title> - <screen> - http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> </section> Modified: trunk/autoinstallation/doc/xml/NetworkSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/NetworkSection.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/NetworkSection.xml (original) +++ trunk/autoinstallation/doc/xml/NetworkSection.xml Fri Nov 25 14:23:02 2011 @@ -40,9 +40,7 @@ In the networking section, set this option to "true" (default is "false", available since openSUSE 11.2 but not in SLES11): </para> - <screen> - <keep_install_network config:type="boolean">true</keep_install_network> - </screen> + <screen><keep_install_network config:type="boolean">true</keep_install_network></screen> <para> &yast; will keep network settings created during installation (via Linuxrc) and/or merge it with network settings from the &ay; profile (if defined). @@ -78,10 +76,8 @@ <title> Network configuration: Proxy </title> - <screen> - http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> Modified: trunk/autoinstallation/doc/xml/PartitioningSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/PartitioningSection.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/PartitioningSection.xml (original) +++ trunk/autoinstallation/doc/xml/PartitioningSection.xml Fri Nov 25 14:23:02 2011 @@ -53,42 +53,48 @@ <row> <entry>device</entry> <entry><para>The device you want to configure in this section. Since SUSE Linux 10.1 and SLES10, you can use persistent device names via id, like <emphasis>/dev/disk/by-id/ata-WDC_WD3200AAKS-75L9A0_WD-WMAV27368122</emphasis>. With SLES10 SP1 and SUSE Linux 10.2, <emphasis>by-path</emphasis> is possible too, like <emphasis>/dev/disk/by-path/pci-0001:00:03.0-scsi-0:0:0:0</emphasis>.</para> - <para><literal><device>/dev/hda</device></literal></para> + <screen><device>/dev/hda</device></screen> </entry> <entry>Optional. If left out, &ay; tries to guess the device. A RAID must always have "/dev/md" as device.</entry> </row> <row> <entry>initialize</entry> <entry><para>If set to "true", the partition table gets wiped out before &ay; starts the partition calculation.</para> -<para><literal><initialize config:type="boolean">true</initialize></literal></para> +<screen><initialize config:type="boolean" +>true</initialize></screen> </entry> <entry>Optional. The default is "false".</entry> </row> <row> <entry>is_lvm_vg</entry> <entry><para>Specifies if a device is not a physical device but a LVM volume group (see LVM configuration below).</para> -<para><literal><is_lvm_vg config:type="boolean">true</is_lvm_vg></literal></para> +<screen><is_lvm_vg config:type="boolean" +>true</is_lvm_vg></screen> </entry> <entry><para><emphasis>Deprecated</emphasis> since SLES10SP1 and SL10.2. Use <emphasis>type</emphasis> instead. Must be "true" if this device is a LVM volume group. The default is "false".</para></entry> </row> <row> <entry>is_evms_vg</entry> <entry><para>Specifies if a device is not a physical device but an EVMS volume group (see EVMS configuration below).</para> -<para><literal><is_evms_vg config:type="boolean">true</is_evms_vg></literal></para> +<screen><is_evms_vg config:type="boolean" +>true</is_evms_vg></screen> </entry> <entry><para><emphasis>Deprecated</emphasis> since SLES10SP1 and SL10.2. Use <emphasis>type</emphasis> instead. Must be "true" if this device is an EVMS volume group. The default is "false".</para></entry> </row> <row> <entry>partitions</entry> <entry><para>A list of <partition> entries (see table below).</para> -<para><literal><partitions config:type="list"><partition>...</partition>...</partitions></literal></para> +<screen><partitions config:type="list"> + <partition>...</partition> + ... +</partitions></screen> </entry> <entry>Optional. If no partitions are specified, &ay; will create a reasonable partitioning (see Automated Partitioning below).</entry> </row> <row> <entry>pesize</entry> <entry><para>This value makes only sense with LVM/EVMS.</para> -<para><literal><pesize>8M</pesize></literal></para> +<screen><pesize>8M</pesize></screen> </entry> <entry>Optional. Default is 4M for EVMS/LVM volume groups.</entry> </row> @@ -129,7 +135,7 @@ </listitem> </itemizedlist> -<para><literal><type config:type="symbol">CT_LVM</type></literal></para> +<screen><type config:type="symbol">CT_LVM</type></screen> </entry> <entry>Optional. Default is CT_DISK for a normal physical hard disk.</entry> </row> @@ -146,14 +152,15 @@ </listitem> </itemizedlist> -<para><literal><disklabel>gpt</disklabel></literal></para> +<screen><disklabel>gpt</disklabel></screen> </entry> <entry>Optional and available since openSUSE 12.1 and SLES11 SP2. By default &yast; decides what makes sense (msdos in most cases).</entry> </row> <row> <entry>keep_unknown_lv</entry> <entry><para>This value only makes sense for type=CT_LVM drives. If you are reusing a LVG and you set this to "true", all existing LVs in that VG will not be touched unless they are specified in the <partitioning> section. So you can keep existing LVs without specifying them.</para> -<para><literal><keep_unknown_lv config:type="boolean">false</keep_unknown_lv></literal></para> +<screen><keep_unknown_lv config:type="boolean" +>false</keep_unknown_lv></screen> </entry> <entry>Optional and available since openSUSE 12.1 and SLES11 SP2. The default is "false".</entry> </row> @@ -183,7 +190,8 @@ <para> Specify if this partition must be created or if it already exists. </para> - <para><literal><create config:type="boolean">false</create></literal></para> + <screen><create config:type="boolean" +>false</create></screen> </entry> <entry>If set to "false", provide information for &ay; which partition this is (like with partition_nr).</entry> </row> @@ -193,8 +201,8 @@ <para> The mountpoint of this partition. </para> - <para><literal><mount>/</mount></literal></para> - <para><literal><mount>swap</mount></literal></para> + <screen><mount>/</mount></screen> + <screen><mount>swap</mount></screen> </entry> <entry>You should have at least a root partition (/) and a swap partition.</entry> </row> @@ -204,7 +212,8 @@ <para> Mount options for this partition. </para> - <para><literal><fstopt>ro,noatime,user,data=ordered,acl,user_xattr</fstopt></literal></para> + <screen><fstopt +>ro,noatime,user,data=ordered,acl,user_xattr</fstopt></screen> </entry> <entry>See <command>man mount</command> for available mount options.</entry> </row> @@ -214,7 +223,7 @@ <para> The label of the partition (useful for the "mountby" parameter; see below). </para> - <para><literal><label>mydata</label></literal></para> + <screen><label>mydata</label></screen> </entry> <entry>See <command>man e2label</command> for an example.</entry> </row> @@ -224,7 +233,8 @@ <para> The uuid of the partition (only useful for the "mountby" parameter; see below). </para> - <para><literal><uuid>1b4e28ba-2fa1-11d2-883f-b9a761bde3fb</uuid></literal></para> + <screen><uuid +>1b4e28ba-2fa1-11d2-883f-b9a761bde3fb</uuid></screen> </entry> <entry>See <command>man uuidgen</command>.</entry> </row> @@ -239,7 +249,7 @@ With SUSE Linux 10.2 and SLES10 SP1, you can specify the the size in percentage. So 10% will use 10% of the size of the hard disk or VG. You can mix auto, max, size, and percentage as you like. </para> - <para><literal><size>10G</size></literal></para> + <screen><size>10G</size></screen> </entry> <entry></entry> </row> @@ -249,7 +259,7 @@ <para> Specify if &ay; should format the partition. </para> - <para><literal><format config:type="boolean">false</format></literal></para> + <screen><format config:type="boolean">false</format></screen> </entry> <entry>If you set "create" to "true", then you likely want this is option set to "true" as well.</entry> </row> @@ -280,7 +290,8 @@ </listitem> </itemizedlist> - <para><literal><filesystem config:type="symbol">reiser</filesystem></literal></para> + <screen><filesystem config:type="symbol" +>reiser</filesystem></screen> </entry> <entry><para>Optional. The default is reiser<remark>emap 2011-11-05: Fix this too.</remark></para></entry> </row> @@ -293,7 +304,8 @@ partition via partition_nr. You can force &ay; to only create primary partitions by assigning numbers below 5. </para> - <para><literal><partition_nr config:type="integer">2</partition_nr></literal></para> + <screen><partition_nr config:type="integer" +>2</partition_nr></screen> </entry> <entry>In most cases, numbers 1 to 4 are primary partitions while 5 and higher are logical partitions.</entry> @@ -305,7 +317,8 @@ The partition_id sets the id of the partition. If you want different identifiers than 131 for Linux partition or 130 for swap, configure them with partition_id. </para> - <para><literal><partition_id config:type="integer">131</partition_id></literal></para> + <screen><partition_id config:type="integer" +>131</partition_id></screen> </entry> <entry>The default is 131 for linux partition and 130 for swap.</entry> </row> @@ -315,7 +328,8 @@ <para> See partition_id above. For historical reasons they represent the same. </para> - <para><literal><filesystem_id config:type="integer">131</filesystem_id></literal></para> + <screen><filesystem_id config:type="integer" +>131</filesystem_id></screen> </entry> <entry>Since 10.1 and SLES10 it is recommended to use partition_id instead.</entry> </row> @@ -325,7 +339,8 @@ <para> Instead of a partition number, you can tell &ay; to mount a partition by label, uuid, path or id, which are the udev path and udev id (see /dev/disk/...). </para> - <para><literal><mountby config:type="symbol">label</mountby></literal></para> + <screen><mountby config:type="symbol" +>label</mountby></screen> </entry> <entry>See "label" and "uuid" documentation above.</entry> </row> @@ -337,7 +352,7 @@ (LVM or EVMS) specify the logical volume name here (see is_lvm_vg or is_evms_vg parameter in drive configuration). </para> - <para><literal><lv_name>opt_lv</lv_name></literal></para> + <screen><lv_name>opt_lv</lv_name></screen> </entry> <entry></entry> </row> @@ -347,7 +362,7 @@ <para> An integer that configures LVM striping. Specify across how many devices you want to stripe (spread data). </para> - <para><literal><stripes config:type="integer">2</stripes></literal></para> + <screen><stripes config:type="integer">2</stripes></screen> </entry> <entry></entry> </row> @@ -357,7 +372,8 @@ <para> Specify the size of each block in kb. </para> - <para><literal><stripesize config:type="integer">4</stripesize></literal></para> + <screen><stripesize config:type="integer" +>4</stripesize></screen> </entry> <entry></entry> </row> @@ -369,7 +385,7 @@ group (LVM), you have to specify the name of the volume group here. </para> - <para><literal><lvm_group>system</lvm_group></literal></para> + <screen><lvm_group>system</lvm_group></screen> </entry> <entry></entry> </row> @@ -381,7 +397,7 @@ (EVMS), you have to specify the name of the volume group here. </para> - <para><literal><evms_group>system</evms_group></literal></para> + <screen><evms_group>system</evms_group></screen> </entry> <entry></entry> </row> @@ -392,7 +408,7 @@ If this physical volume is part of a RAID, specify the name of the RAID. </para> - <para><literal><raid_name>/dev/md0</raid_name></literal></para> + <screen><raid_name>/dev/md0</raid_name></screen> </entry> <entry></entry> </row> @@ -402,7 +418,7 @@ <para> Specify the type of the RAID. </para> - <para><literal><raid_type>raid1</raid_type></literal></para> + <screen><raid_type>raid1</raid_type></screen> </entry> <entry></entry> </row> @@ -412,7 +428,7 @@ <para> Specify RAID options, see below. </para> - <para><literal><raid_options>...</raid_options></literal></para> + <screen><raid_options>...</raid_options></screen> </entry> <entry></entry> </row> @@ -429,7 +445,8 @@ <emphasis>800M</emphasis>. <emphasis>max</emphasis> and <emphasis>auto</emphasis> do not work as size here. </para> - <para><literal><resize config:type="boolean">false</resize></literal></para> + <screen><resize config:type="boolean" +>false</resize></screen> </entry> <entry>The resize only works with physical disks. Not with LVM/EVMS volumes.</entry> </row> @@ -457,7 +474,7 @@ <entry> <para> </para> - <para><literal><chunk_size>4</chunk_size></literal></para> + <screen><chunk_size>4</chunk_size></screen> </entry> <entry></entry> </row> @@ -467,7 +484,8 @@ <para> Possible values are: left_asymmetric, left_symmetric, right_asymmetric, right_symmetric. Since SLES11 SP2 and openSUSE 12.1 you can use: parity_first, parity_last, left_asymmetric_6, left_symmetric_6, right_asymmetric_6, right_symmetric_6, parity_first_6, n2, o2, f2, n3, o3, f3 for RAID6 and RAID10 </para> - <para><literal><parity_algorithm>left_asymmetric</parity_algorithm></literal></para> + <screen><parity_algorithm +>left_asymmetric</parity_algorithm></screen> </entry> <entry></entry> </row> @@ -477,7 +495,7 @@ <para> Possible values are: raid0,raid1 and raid5. </para> - <para><literal><raid_type>raid1</raid_type></literal></para> + <screen><raid_type>raid1</raid_type></screen> </entry> <entry>The default is raid1.</entry> </row> @@ -626,11 +644,7 @@ device, it will be automatically detected. You do not have to create different profiles for /dev/sda or /dev/hda systems. </para> - <screen> - http://www.w3.org/2001/XInclude"/> - - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> <para> A more detailed example shows how existing partitions and @@ -638,10 +652,8 @@ </para> <example> <title>Detailed Automated Partitioning</title> - <screen> - http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> </section> @@ -657,11 +669,7 @@ <para> Go to the "drive" section and add: </para> - <screen> -<![CDATA[ -<initialize config:type="boolean">true</initialize> -]]> -</screen> + <screen><![CDATA[<initialize config:type="boolean">true</initialize>]]></screen> <para> With this setting &ay; will delete the partition table before it starts to analyse the actual partitioning and calculates its partition plan. Of course this means, that you cannot keep any of your existing @@ -759,11 +767,7 @@ <example> <title>Mount Options</title> - <screen> - http://www.w3.org/2001/XInclude"/> - - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> </section> @@ -793,10 +797,8 @@ <title> Keeping partitions </title> - <screen> - http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> <para> The last example requires exact knowledge of the existing partition @@ -856,10 +858,8 @@ <title> Reading existing <filename>/etc/fstab</filename> </title> - <screen> - http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> </section> @@ -879,10 +879,8 @@ The following example shows how to prepare for LVM in the <emphasis>partitioning</emphasis> resource: </para> - <screen> - http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> <para> @@ -895,10 +893,8 @@ <title> LVM Logical Volumes (New syntax) </title> - <screen> -http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> <para> With SUSE Linux 10.1 and all following versions, it is possible to set the <emphasis>size</emphasis> @@ -930,10 +926,8 @@ <title> EVMS Logical Volumes </title> - <screen> -http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> </section> <section> @@ -993,10 +987,8 @@ <example> <title>RAID1 configuration</title> - <screen> -http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> Modified: trunk/autoinstallation/doc/xml/Profile.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Profile.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/Profile.xml (original) +++ trunk/autoinstallation/doc/xml/Profile.xml Fri Nov 25 14:23:02 2011 @@ -39,9 +39,7 @@ The following example shows a control file in XML format: </para> <example><title>XML Control File (Profile)</title> - <screen> -<![CDATA[ -<?xml version="1.0"?> + <screen><![CDATA[<?xml version="1.0"?> <!DOCTYPE profile> <profile xmlns="http://www.suse.com/1.0/yast2ns" @@ -85,10 +83,7 @@ </pre-scripts> </scripts> </configure> <!-- configure is deprecated since SUSE Linux 10.0 --> -</profile> -]]> - - </screen> +</profile>]]></screen> </example> </section> @@ -105,9 +100,7 @@ <example> <title>Control file container</title> - <screen> -<![CDATA[ -<?xml version="1.0"?> + <screen><![CDATA[<?xml version="1.0"?> <!DOCTYPE profile> <profile xmlns="http://www.suse.com/1.0/yast2ns" @@ -115,9 +108,7 @@ <!-- RESOURCES --> -</profile> -]]> - </screen> +</profile>]]></screen> </example> <para> The profile element (root node) contains one or more distinct resource @@ -158,9 +149,7 @@ <title> Nested Resources </title> - <screen> -<![CDATA[ -... + <screen><![CDATA[... <drive> <device>/dev/hda</device> <partitions config:type="list"> @@ -175,8 +164,7 @@ </partitions> </drive> .... -]]> - </screen> +]]></screen> </example> <para> @@ -198,9 +186,7 @@ <title> Nested Resources with Type Attributes </title> - <screen> -<![CDATA[ -... + <screen><![CDATA[... <drive> <device>/dev/hda</device> <partitions config:type="list"> @@ -214,9 +200,7 @@ </partition> </partitions> </drive> -.... -]]> - </screen> +....]]></screen> </example> </section> @@ -273,9 +257,7 @@ <para> Verfify your &ay; XML file </para> - <screen> -/usr/bin/xmllint --noout --relaxng /usr/share/YaST2/schema/autoyast/rng/profile.rng myAutoYaSTProfile.xml - </screen> + <screen>/usr/bin/xmllint --noout --relaxng /usr/share/YaST2/schema/autoyast/rng/profile.rng myAutoYaSTProfile.xml</screen> </section> </section> Modified: trunk/autoinstallation/doc/xml/ReportSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/ReportSection.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/ReportSection.xml (original) +++ trunk/autoinstallation/doc/xml/ReportSection.xml Fri Nov 25 14:23:02 2011 @@ -45,10 +45,8 @@ </itemizedlist> <example> <title>Reporting Behavior</title> - <screen> - http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> <para> Modified: trunk/autoinstallation/doc/xml/RulesAndClasses.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/RulesAndClasses.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/RulesAndClasses.xml (original) +++ trunk/autoinstallation/doc/xml/RulesAndClasses.xml Fri Nov 25 14:23:02 2011 @@ -24,11 +24,9 @@ following is used, the rules file will not be evaluated: </para> <screen>autoyast=http://10.10.0.1/profile/myprofile.xml -autoyast=http://10.10.0.1/profile/rules/rules.xml - </screen> +autoyast=http://10.10.0.1/profile/rules/rules.xml</screen> <para>Instead use:</para> - <screen>autoyast=http://10.10.0.1/profile/ - </screen> + <screen>autoyast=http://10.10.0.1/profile/</screen> <para>which will load http://10.10.0.1/profile/rules/rules.xml (the slash at the end of the directory name is important).</para> <figure id="rules_fig1"> <title id="rules_fig1.title" >Rules</title> @@ -74,8 +72,7 @@ The following simple example illustrates how the rules file is used to retrieve the configuration for a client with known hardware. </para> - <screen><![CDATA[ -<?xml version="1.0"?> + <screen><![CDATA[<?xml version="1.0"?> <!DOCTYPE autoinstall> <autoinstall xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> <rules config:type="list"> @@ -100,9 +97,7 @@ </result> </rule> </rules> -</autoinstall> -]]> - </screen> +</autoinstall>]]></screen> </example> <para> @@ -141,8 +136,7 @@ The following example illustrates how the rules file is used to retrieve the configuration for a client with known hardware. </para> - <screen><![CDATA[ -<?xml version="1.0"?> + <screen><![CDATA[<?xml version="1.0"?> <!DOCTYPE autoinstall> <autoinstall xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> <rules config:type="list"> @@ -175,9 +169,7 @@ </result> </rule> </rules> -</autoinstall> -]]> - </screen> +</autoinstall>]]></screen> </example> <para> @@ -199,8 +191,7 @@ <para> Here is an example for the use of custom rules: </para> - <screen><![CDATA[ -<rule> + <screen><![CDATA[<rule> <custom1> <script> if grep -i intel /proc/cpuinfo > /dev/null; then @@ -216,9 +207,7 @@ <profile>@custom1@.xml</profile> <continue config:type="boolean">true</continue> </result> -</rule> -]]> - </screen> +</rule>]]></screen> <para> The script in this rule can echo either "intel" or "non_intel" to STDOUT (the output of the grep command must be directed to @@ -288,8 +277,7 @@ an example: </para> - <screen><![CDATA[ -<rule> + <screen><![CDATA[<rule> <disksize> <match>/dev/hda 1000</match> <match_type>greater</match_type> @@ -303,9 +291,7 @@ <continue config:type="boolean">false</continue> </result> <operator>or</operator> -</rule> -]]> - </screen> +</rule>]]></screen> <para> Just "and" and "or" are possible operators and the default operator @@ -536,8 +522,7 @@ <para> Here is an example of how to use dialogs with rules: </para> - <screen><![CDATA[ - <rules config:type="list"> + <screen><![CDATA[<rules config:type="list"> <rule> <custom1> <script> @@ -595,8 +580,7 @@ </result> </rule> </rules> -]]> - </screen> +]]></screen> </section> </section> @@ -612,15 +596,12 @@ <para> Here is an example of a class definition: </para> - <screen><![CDATA[ -<classes config:type="list"> + <screen><![CDATA[<classes config:type="list"> <class> <class_name>TrainingRoom</class_name> <configuration>Software.xml</configuration> </class> -</classes> -]]> - </screen> +</classes>]]></screen> <para> The file Software.xml must be in the directory "classes/TrainingRoom/" then. It will get fetched from the same place the &ay; profile and rules @@ -745,8 +726,7 @@ </partition> </partitions> </drive> -</partitioning> - </screen> +</partitioning></screen> <screen><partitioning config:type="list"> <drive> @@ -763,8 +743,7 @@ </partitions> <use>all</use> </drive> -</partitioning> - </screen> +</partitioning></screen> <para> You might expect the profile to contain 3 partitions. This is not the @@ -788,8 +767,7 @@ <screen><partition dontmerge="1"> ... -</partitions> - </screen> +</partitions></screen> <para> Because of the new attribute, the merge script will not detect the partitions as the same element type. If you have more files, you may need to add more attributes like <emphasis>dontmerge="2"</emphasis>, etc. @@ -811,8 +789,7 @@ <element>partition</element> </dont_merge> </class> -</classes> - </screen> +</classes></screen> <screen><rule> <board_vendor> @@ -837,8 +814,7 @@ <element>partition</element> </dont_merge> </result> -</rule> - </screen> +</rule></screen> </section> </chapter> Modified: trunk/autoinstallation/doc/xml/ScriptsSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/ScriptsSection.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/ScriptsSection.xml (original) +++ trunk/autoinstallation/doc/xml/ScriptsSection.xml Fri Nov 25 14:23:02 2011 @@ -85,7 +85,10 @@ <entry>location</entry> <entry><para>Define a location from where the script gets fetched. Locations can be the same as for the profile (http, ftp, nfs, etc.). - </para><screen><location>http://10.10.0.1/myPreScript.sh</location>;</screen></entry> + </para> + <screen><location +>http://10.10.0.1/myPreScript.sh</location>;</screen> + </entry> <entry>Either <location> or <source> must be defined.</entry> </row> <row> @@ -118,7 +121,8 @@ <entry><para>If this boolean is "true", stdout and stderr of the script will be shown in a popup, which the user has to confirm via the OK button. If stdout and stderr are empty, no popup is shown and therefore no confirmation is needed. - </para><screen><feedback config:type="boolean">true</feedback></screen></entry> + </para><screen><feedback config:type="boolean" +>true</feedback></screen></entry> <entry>Optional, default is "false". This option was introduced with SL 10.1/SLES10.</entry> </row> <row> @@ -179,7 +183,8 @@ <entry>location</entry> <entry><para>Define a location from where the script gets fetched. Locations can be the same as for the profile (http, ftp, nfs, etc.). - </para><screen><location>http://10.10.0.1/myScript.sh</location>;</screen></entry> + </para><screen><location +>http://10.10.0.1/myScript.sh</location>;</screen></entry> <entry>Either <location> or <source> must be defined.</entry> </row> <row> @@ -212,7 +217,8 @@ <entry><para>If this boolean is "true", stdout and stderr of the script will be shown in a popup, which the user has to confirm via the OK button. If stdout and stderr are empty, no popup is shown and therefore no confirmation is needed. - </para><screen><feedback config:type="boolean">true</feedback></screen></entry> + </para><screen><feedback config:type="boolean" +>true</feedback></screen></entry> <entry>Optional, the default is "false". This option was introduced with SL 10.1/SLES10.</entry> </row> <row> @@ -273,7 +279,8 @@ <entry><para>Define a location from where the script gets fetched. Locations can be the same as for the profile (http, ftp, nfs, etc.). </para> - <screen><location>http://10.10.0.1/myChrootScript.sh</location>;</screen> + <screen><location +>http://10.10.0.1/myChrootScript.sh</location>;</screen> </entry> <entry>Either <location> or <source> must be defined.</entry> </row> @@ -282,15 +289,20 @@ <entry><para>The script itself (source code), encapsulated in a CDATA tag. If you do not want to put the whole shell script into the XML profile, use the location parameter. - </para><screen><source> <![CDATA[ echo "Testing the - chroot script" > /tmp/chroot_out.txt ]]> - </source></screen></entry> + </para> + <screen><source> +<![CDATA[ +echo "Testing the chroot script" > +/tmp/chroot_out.txt +]]> +</source></screen></entry> <entry>Either <location> or <source> must be defined.</entry> </row> <row> <entry>chrooted</entry> <entry><para>This value can be "true" or "false". If set to "false", the installed system remains mounted at "/mnt" and no chroot happens. The bootloader is not installed either at this stage. Set to "true" means, a chroot into /mnt is performed, where the installed system is mounted. The bootloader is installed, and if you want to change anything in the installed system, you don't have to use the "/mnt/" prefix anymore. - </para><screen><chrooted config:type="boolean">true</chrooted></screen></entry> + </para><screen><chrooted config:type="boolean" +>true</chrooted></screen></entry> <entry>Optional, default is "false".</entry> </row> <row> @@ -310,7 +322,8 @@ <entry><para>If this boolean is "true", stdout and stderr of the script will be shown in a popup, which the user has to confirm via the OK button. If stdout and stderr are empty, no popup is shown and therefore no confirmation is needed. - </para><screen><feedback config:type="boolean">true</feedback></screen></entry> + </para><screen><feedback config:type="boolean" +>true</feedback></screen></entry> <entry>Optional, default is "false". This option was added with SL 10.1/SLES10.</entry> </row> <row> @@ -375,7 +388,8 @@ <entry><para>Define a location from where the script gets fetched. Locations can be the same as for the profile (http, ftp, nfs, etc.). </para> - <screen><location>http://10.10.0.1/myPostScript.sh</location>;</screen> + <screen><location +>http://10.10.0.1/myPostScript.sh</location>;</screen> </entry> <entry>Either <location> or <source> must be defined.</entry> </row> @@ -385,7 +399,8 @@ to put the whole shell script into the XML profile, use the location parameter. </para><screen><source> <![CDATA[ -echo "Testing the chroot script" > /tmp/chroot_out.txt +echo "Testing the chroot script" > +/tmp/chroot_out.txt ]]> </source></screen></entry> <entry>Either <location> or <source> must be defined.</entry> @@ -394,7 +409,8 @@ <entry>network_needed</entry> <!-- FIXME: double check that. I'm very unsure if this is correct --> <entry><para>This value can be "true" or "false". On "false" the script will run after the &yast; modules like the user configuration and everything else are done. The network is configured but not up and running yet. With this value set to "true", the script runs before all &yast; modules are configured. So there is no local user and no network is configured but the installation network is still up and running (if you did a network installation). - </para><screen><network_needed config:type="boolean">true</network_needed></screen></entry> + </para><screen><network_needed config:type="boolean" +>true</network_needed></screen></entry> <entry>Optional, default is "false".</entry> </row> <row> @@ -414,7 +430,8 @@ <entry><para>If this boolean is "true", stdout and stderr of the script will be shown in a popup, which the user has to confirm via the OK button. If stdout and stderr are empty, no popup is shown and therefore no confirmation is needed. - </para><screen><feedback config:type="boolean">true</feedback></screen></entry> + </para><screen><feedback config:type="boolean" +>true</feedback></screen></entry> <entry>Optional, default is "false". This option was added with SL 10.1/SLES10.</entry> </row> <row> @@ -479,7 +496,8 @@ <entry><para>Define a location from where the script gets fetched. Locations can be the same as for the profile (http, ftp, nfs, etc.). </para> - <screen><location>http://10.10.0.1/myInitScript.sh</location>;</screen> + <screen><location +>http://10.10.0.1/myInitScript.sh</location>;</screen> </entry> <entry>Either <location> or <source> must be defined.</entry> </row> @@ -489,7 +507,8 @@ to put the whole shell script into the XML profile, use the location parameter. </para><screen><source> <![CDATA[ -echo "Testing the init script" > /tmp/init_out.txt +echo "Testing the init script" > +/tmp/init_out.txt ]]> </source></screen></entry> <entry>Either <location> or <source> must be defined.</entry> @@ -522,11 +541,8 @@ <title>Script Example</title> <example> <title>Post Script Configuration</title> - <screen> - http://www.w3.org/2001/XInclude"/> - - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> <para> After installation is finished, the scripts and the output logs can be @@ -538,11 +554,7 @@ The log is the output when executing the shell scripts using the following command: </para> - <screen> - <![CDATA[ - /bin/sh -x <script_name> 2&> /var/adm/autoinstall/logs/<script_name>.log - ]]> - </screen> + <screen><![CDATA[/bin/sh -x <script_name> 2&> /var/adm/autoinstall/logs/<script_name>.log]]></screen> </section> </section> Modified: trunk/autoinstallation/doc/xml/SoftwareSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/SoftwareSection.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/SoftwareSection.xml (original) +++ trunk/autoinstallation/doc/xml/SoftwareSection.xml Fri Nov 25 14:23:02 2011 @@ -41,10 +41,7 @@ <title> Package Selection in Control File with Patterns </title> - <screen> -http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> <para> The <emphasis>packages</emphasis> section is still the same as on a @@ -67,10 +64,7 @@ <title> Activating Image Deployment </title> - <screen> -http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> </section> @@ -98,10 +92,8 @@ </para> <example> <title>Creating Package Database</title> - <screen> - cd /usr/local/CDs/LATEST/suse - create_package_descr -x PATH_TO_EXTRA_PROV -d /usr/local/CDs/LATEST/suse - </screen> + <screen>cd /usr/local/CDs/LATEST/suse + create_package_descr -x PATH_TO_EXTRA_PROV -d /usr/local/CDs/LATEST/suse</screen> </example> <note> <title>Change starting with SUSE Linux 9.1/SLES 9</title> @@ -133,23 +125,19 @@ add-on products like the SDK), add a file <emphasis>add_on_products</emphasis> to CD1 of the main product. </para> - <screen> -media_url [path_on_media [product_1 [product_2 [....]]] - </screen> + <screen>media_url [path_on_media [product_1 [product_2 [....]]]</screen> <para> media_url is the URL of the media, path_on_media is the path to the catalog on the media. If not present, / (root) is assumed. product_1 and following are the names of products, which should be marked for installation. If no product is specified, all products found on the - media are selected for installation. For example: </para><screen> - http://192.168.66.6/SLES10/sdk/CD1 - http://192.168.66.6/SLES10/CD1/updates - </screen> + media are selected for installation. For example: </para> + <screen>http://192.168.66.6/SLES10/sdk/CD1 + http://192.168.66.6/SLES10/CD1/updates</screen> <para> Besides the <emphasis>add_on_products</emphasis> file, you can use the &ay; profile to specify add-on products. For example: </para> - <screen> -<add-on> + <screen><add-on> <add_on_products config:type="list"> <listentry> <media_url>http://192.168.66.6/SLES10/CD1/updates</media_url>; @@ -159,8 +147,7 @@ <name>MyUpdates</name> <!-- available since openSUSE 11.1/SLES11 (bnc#433981) --> </listentry> </add_on_products> -</add-on> - </screen> +</add-on></screen> <para> With this entry in the &ay; profile, the <emphasis>add_on_products</emphasis> file is not necessary. Since openSUSE 11.0, &ay; can ask the user to make add-on products available instead of reporting a time-out error when an add-on product cannot be found at the given location. Set ask_on_error to "true" (the default is "false"). @@ -192,42 +179,48 @@ <row> <entry>accept_unsigned_file</entry> <entry><para>If set to "true", &ay; will accept unsigned files like the content file.</para> - <para><literal><accept_unsigned_file config:type="boolean">true</accept_unsigned_file></literal></para> + <screen><accept_unsigned_file config:type="boolean" +>true</accept_unsigned_file></screen> </entry> <entry>Optional. If left out, &ay; lets &yast; decide what to do.</entry><remark>emap 2011-11-05: Is this correct? How will YaST make the decision? Above we write that YaST will ask the user, but during auto-install the package will be rejected. So which is it?</remark> </row> <row> <entry>accept_file_without_checksum</entry> <entry><para>If set to "true", &ay; will accept files without a checksum in the content file.</para> - <para><literal><accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum></literal></para> + <screen><accept_file_without_checksum config:type="boolean" +>true</accept_file_without_checksum></screen> </entry> <entry>Optional. If left out, &ay; lets &yast; decide what to do.</entry><remark>emap 2011-11-05: See my previous remark.</remark> </row> <row> <entry>accept_verification_failed</entry> <entry><para>If set to "true", &ay; will accept signed files even when the verification of the signature failed.</para> - <para><literal><accept_verification_failed config:type="boolean">true</accept_verification_failed></literal></para> + <screen><accept_verification_failed config:type="boolean" +>true</accept_verification_failed></screen> </entry> <entry>Optional. If left out, &ay; lets &yast; decide what to do.</entry><remark>emap 2011-11-05: Same here. Unless I'm just not getting it, please fix all other occurrences below.</remark> </row> <row> <entry>accept_unknown_gpg_key</entry> <entry><para>If set to "true", &ay; will accept new gpg keys on the installation source, for example the key used to sign the content file.</para> - <para><literal><accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key></literal></para> + <screen><accept_unknown_gpg_key config:type="boolean" +>true</accept_unknown_gpg_key></screen> </entry> <entry>Optional. If left out, &ay; lets &yast; decide what to do.</entry> </row> <row> <entry>accept_non_trusted_gpg_key</entry> <entry><para>This basically means, we know the key, but it is not trusted.</para> - <para><literal><accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key></literal></para> + <screen><accept_non_trusted_gpg_key config:type="boolean" +>true</accept_non_trusted_gpg_key></screen> </entry> <entry>Optional. If left out, &ay; lets &yast; decide what to do.</entry> </row> <row> <entry>import_gpg_key</entry> <entry><para>If set to "true", &ay; will accept and import new gpg keys on the installation source in its database.</para> - <para><literal><import_gpg_key config:type="boolean">true</import_gpg_key></literal></para> + <screen><import_gpg_key config:type="boolean" +>true</import_gpg_key></screen> </entry> <entry>Optional. If left out, &ay; lets &yast; decide what to do.</entry> </row> @@ -253,63 +246,60 @@ <row> <entry>accept_unsigned_file</entry> <entry><para>If set to "true", &ay; will accept unsigned files like the content file for this add-on product.</para> - <para><literal><accept_unsigned_file config:type="boolean">true</accept_unsigned_file></literal></para> + <screen><accept_unsigned_file config:type="boolean" +>true</accept_unsigned_file></screen> </entry> <entry>Optional. If left out, the global signature-handing in the <general> section is used.</entry> </row> <row> <entry>accept_file_without_checksum</entry> <entry><para>If set to "true", &ay; will accept files without a checksum in the content file for this add-on.</para> - <para><literal><accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum></literal></para> + <screen><accept_file_without_checksum config:type="boolean" +>true</accept_file_without_checksum></screen> </entry> <entry>Optional. If left out, the global signature-handing in the <general> section is used.</entry> </row> <row> <entry>accept_verification_failed</entry> <entry><para>If set to "true", &ay; will accept signed files even when the verification of the signature fails.</para> - <para><literal><accept_verification_failed config:type="boolean">true</accept_verification_failed></literal></para> + <screen><accept_verification_failed config:type="boolean" +>true</accept_verification_failed></screen> </entry> <entry>Optional. If left out, the global signature-handing in the <general> section is used.</entry> </row> <row> <entry>accept_unknown_gpg_key</entry> <entry><para>If set to "true", &ay; will accept new gpg keys on the installation source, for example the key used to sign the content file.</para> - <screen> - <accept_unknown_gpg_key> + <screen><accept_unknown_gpg_key> <all config:type="boolean">false</all> <keys config:type="list"> <keyid>3B3011B76B9D6523</keyid> </keys> - </accept_unknown_gpg_key> - </screen> + </accept_unknown_gpg_key></screen> </entry> <entry>Optional. If left out, the global signature-handing in the <general> section is used.</entry> </row> <row> <entry>accept_non_trusted_gpg_key</entry> <entry><para>This basically means, we know the key, but it is not trusted.</para> - <screen> - <accept_non_trusted_gpg_key> + <screen><accept_non_trusted_gpg_key> <all config:type="boolean">false</all> <keys config:type="list"> <keyid>3B3011B76B9D6523</keyid> </keys> - </accept_non_trusted_gpg_key> -</screen> + </accept_non_trusted_gpg_key></screen> </entry> <entry>optional. If left out, the global signature-handing in the <general> section is used.</entry> </row> <row> <entry>import_gpg_key</entry> <entry><para>If set to "true", &ay; will accept and import new gpg keys on the installation source into its database.</para> - <screen> - <import_gpg_key> + <screen><import_gpg_key> <all config:type="boolean">false</all> <keys config:type="list"> <keyid>3B3011B76B9D6523</keyid> </keys> - </import_gpg_key> - </screen> + </import_gpg_key></screen> </entry> <entry>Optional. If left out, the global signature-handing in the <general> section is used.</entry> </row> @@ -334,11 +324,8 @@ <title> Package Selection in Control File<remark>emap 2011-11-05: Should this read: Kernel Selection in Control File?</remark> </title> - <screen> -http://www.w3.org/2001/XInclude"/> - - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> </section> <section> @@ -362,12 +349,7 @@ <title> Package Selection in Control File </title> - <screen> -http://www.w3.org/2001/XInclude"/> - - - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> </section> <section> @@ -377,27 +359,23 @@ during the normal installation process in stage 1, you can use the <emphasis>post-packages</emphasis> element for that: </para> - <screen> -<software> + <screen><software> <post-packages config:type="list"> <package>yast2-cim</package> </post-packages> -</software> - </screen> +</software></screen> </section> <section> - <title>FIXME Title</title><remark>emap 2011-11-05: Just drawing attention to this fixme. How about: Installing Patterns in Stage 2</remark> + <title>Installing Patterns in Stage 2</title> <para> Since SLES11 and openSUSE 11.1, you can also install patterns in stage 2. Use the <emphasis>post-patterns</emphasis> element for that: </para> - <screen> -<software> + <screen><software> <post-patterns config:type="list"> <pattern>apparmor</pattern> </post-patterns> -</software> - </screen> +</software></screen> </section> <section> <title>Online Update in Stage 2</title> @@ -405,11 +383,9 @@ Since openSUSE 11.1, you can perform an online update at the end of the installation. Set the boolean <emphasis>do_online_update</emphasis> to "true". Of course this makes only sense if you add an online update repository in the suse-register/customer-center section, for example, or in a post-script. If the online update repository was available in stage 1 already via add-on section, then &ay; has already installed the latest packages available. If a kernel update is done via online-update, a reboot at the end of stage 2 is triggered. </para> - <screen> -<software> + <screen><software> <do_online_update config:type="boolean">true</do_online_update> -</software> - </screen> +</software></screen> </section> </section> Modified: trunk/autoinstallation/doc/xml/UsersSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/UsersSection.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/UsersSection.xml (original) +++ trunk/autoinstallation/doc/xml/UsersSection.xml Fri Nov 25 14:23:02 2011 @@ -39,10 +39,8 @@ <title> User Configuration </title> - <screen> - http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> <para> The last example shows the minimal information required for adding Modified: trunk/autoinstallation/doc/xml/X11Section.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/X11Section.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/X11Section.xml (original) +++ trunk/autoinstallation/doc/xml/X11Section.xml Fri Nov 25 14:23:02 2011 @@ -37,10 +37,8 @@ <title> X11 and Monitor configuration (deprecated since openSUSE 11.2) </title> - <screen> -http://www.w3.org/2001/XInclude"/> - </screen> + <screen>http://www.w3.org/2001/XInclude"/></screen> </example> Modified: trunk/autoinstallation/doc/xml/appendix2.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/appendix2.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/appendix2.xml (original) +++ trunk/autoinstallation/doc/xml/appendix2.xml Fri Nov 25 14:23:02 2011 @@ -37,9 +37,7 @@ <para> Watch the clientdisplay for a message like </para> -<screen> -Probing...[EEPRO100] Ethernet addr: 00:50:ba:3f:b5:d5 -</screen> +<screen>Probing...[EEPRO100] Ethernet addr: 00:50:ba:3f:b5:d5</screen> <para> Write down the MAC address, which is the numeric string starting with 00:50 (only an example). @@ -47,13 +45,10 @@ <para>Alternativly, you can find the MAC address in the system log files where you are running a &dhcp; server,<remark>emap 2011-11-04: Should this read: in the system log files of your &dhcp; server?</remark> for example:</para> - <screen> -Feb 27 00:43:22 avicenna dhcpd: DHCPDISCOVER from 00:50:ba:3f:b5:d5 via eth0 + <screen>Feb 27 00:43:22 avicenna dhcpd: DHCPDISCOVER from 00:50:ba:3f:b5:d5 via eth0 Feb 27 00:43:22 avicenna dhcpd: DHCPOFFER on 192.168.1.5 to 00:50:ba:3f:b5:d5 via eth0 Feb 27 00:43:22 avicenna dhcpd: DHCPREQUEST for 192.168.1.5 (192.168.1.1) from 00:50:ba:3f:b5:d5 via eth0 -Feb 27 00:43:22 avicenna dhcpd: DHCPACK on 192.168.1.5 to 00:50:ba:3f:b5:d5 via eth0 - -</screen> +Feb 27 00:43:22 avicenna dhcpd: DHCPACK on 192.168.1.5 to 00:50:ba:3f:b5:d5 via eth0</screen> </listitem> Power down client. Repeat steps 2 through 4 for each compute node. Modified: trunk/autoinstallation/doc/xml/creating_autoyast2_modules.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/creating_autoyast2_modules.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/creating_autoyast2_modules.xml (original) +++ trunk/autoinstallation/doc/xml/creating_autoyast2_modules.xml Fri Nov 25 14:23:02 2011 @@ -283,12 +283,10 @@ <para> For example, this function can return the following structure: </para> - <screen> - $[ + <screen>$[ "install": ["pkg1", "pkg2"], "remove": ["pkg3"] - ] - </screen> + ]</screen> </refsect1> </refentry> <refentry> Modified: trunk/autoinstallation/doc/xml/linuxrc.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/linuxrc.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/linuxrc.xml (original) +++ trunk/autoinstallation/doc/xml/linuxrc.xml Fri Nov 25 14:23:02 2011 @@ -56,9 +56,7 @@ <para> Lines starting with '<emphasis>#</emphasis>' are comments, valid entries are of the form: </para> - <screen> - key: value - </screen><para> + <screen>key: value</screen><para> Note that <emphasis>value</emphasis> extends to the end of the line and therefore may contain spaces. <emphasis>key</emphasis> is matched case insensitive. </para> @@ -167,11 +165,7 @@ </para> <para>For example, the following can be entered on the command line:</para> - <screen> - -netsetup=-dhcp,+nameserver3 - -</screen> + <screen>netsetup=-dhcp,+nameserver3</screen> </section> </appendix> Modified: trunk/autoinstallation/doc/xml/multiplesource.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/multiplesource.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/multiplesource.xml (original) +++ trunk/autoinstallation/doc/xml/multiplesource.xml Fri Nov 25 14:23:02 2011 @@ -62,15 +62,13 @@ <para> The order file defines which sources are needed for installation and their priority for installation. A typical example for an order file is given here: </para> -<screen> -# yast/order: priority of installation sources +<screen># yast/order: priority of installation sources # # source- product # description path /yast/sles8 /sles8-i386/CD1 /yast/ul /unitedlinux-i386/CD1 -/ / -</screen> +/ /</screen> <para> The order file is ASCII, line based, '#' at the beginning of a line denote a comment line.</para> @@ -111,15 +109,13 @@ <para>A typical example for an instorder file is given here:</para> - <screen> -# yast/instorder: order of installation sources + <screen># yast/instorder: order of installation sources # # install 'ul' before 'sles8' # /yast/ul /yast/sles8 -/ -</screen> +/</screen> </section> <section> @@ -141,8 +137,7 @@ <para>In the 'order' example above, the 'order' directory structure looks as follows: </para> - <screen> -yast/ + <screen>yast/ instorder # instorder file order # order file ul/ # product 'ul', placing it below yast isn't really needed @@ -173,9 +168,7 @@ packages.en packages.de ... - packages.pt - -</screen> + packages.pt</screen> @@ -215,8 +208,7 @@ something suitable to your environment. </para> - <screen> -#!/bin/sh + <screen>#!/bin/sh instsource="/exports/sles8" # @@ -313,9 +305,7 @@ # # End -# - - </screen> +#</screen> <note> <para> Fields of the order files have TAB as delimiter. Modified: trunk/autoinstallation/doc/xml/purpose.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/purpose.xml?rev=66953&r1=66952&r2=66953&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/purpose.xml (original) +++ trunk/autoinstallation/doc/xml/purpose.xml Fri Nov 25 14:23:02 2011 @@ -60,9 +60,7 @@ <title>Values</title> - <screen> - true or false, default is false. - </screen> + <screen>true or false, default is false.</screen> </refsect2> ]]></description> </reboot> @@ -79,13 +77,10 @@ Here's the list of available keyboards on i386 and Alpha machines: </para> - <screen> - belgian, czech, czech-qwerty, danish, dutch, dvorak, english- + <screen>belgian, czech, czech-qwerty, danish, dutch, dvorak, english- uk, english-us, finnish, french, french-ch, german, german-ch, greek, hungarian, italian, japanese, norwegian, polish, portugese, portugese-br, - russian, slovak, slovak-qwerty, spanish, swedish, turkish - - </screen> </refsect2> + russian, slovak, slovak-qwerty, spanish, swedish, turkish</screen> </refsect2> <refsect2><title>&alice; Compatibility</title> <para>This property is replaces the following tags in &alice; </para> @@ -148,11 +143,9 @@ <para> Valid language codes are the following </para> - <screen> - cs_CZ, da_DK, en_US, fr_FR, de_DE, hu_HU, is_IS, it_IT, + <screen>cs_CZ, da_DK, en_US, fr_FR, de_DE, hu_HU, is_IS, it_IT, ja_JP.eucJP, no_NO, ro_RO, sk_SK, sl_SI, sr_YU, es_ES, - ru_RU.KOI8-R, uk_UA.KOI8-U, sv_SE, tr_TR - </screen> + ru_RU.KOI8-R, uk_UA.KOI8-U, sv_SE, tr_TR</screen> </refsect2> <refsect2><title>&alice; Compatibility</title> <para>This property is replaces the following tags in &alice; @@ -181,8 +174,7 @@ <para> Valid timezone codes are the following </para> - <screen> - Africa/Algiers, Africa/Brazzaville, Africa/Cairo, Africa/Casablanca, + <screen>Africa/Algiers, Africa/Brazzaville, Africa/Cairo, Africa/Casablanca, Africa/Ceuta, Africa/Dakar, Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Freetown, Africa/Johannesburg, Africa/Libreville, Africa/Monrovia, Africa/Nairobi, Africa/Timbuktu, Africa/Tripoli, Africa/Tunis, @@ -230,9 +222,7 @@ Pacific/Samoa, Pacific/Tahiti, Poland, Portugal, ROC, ROK, Singapore, Turkey, UCT, US/Alaska, US/Aleutian, US/Arizona, US/Central, US/East-Indiana, US/Eastern, US/Hawaii, US/Indiana-Starke, US/Michigan, - US/Mountain, US/Pacific, US/Samoa, UTC, Universal, W-SU, WET, Zulu - - </screen> + US/Mountain, US/Pacific, US/Samoa, UTC, Universal, W-SU, WET, Zulu</screen> </refsect2> <refsect2><title>&alice; Compatibility</title> <para>This property is replaces the following tags in &alice; @@ -2928,15 +2918,13 @@ </para> <para>As specifed in <filename>/etc/inittab</filename>, the following run levels are possible</para> - <screen> -# runlevel 0 is System halt (Do not use this for initdefault!) + <screen># runlevel 0 is System halt (Do not use this for initdefault!) # runlevel 1 is Single user mode # runlevel 2 is Local multiuser without remote network (e.g. NFS) # runlevel 3 is Full multiuser with network # runlevel 4 is Not used # runlevel 5 is Full multiuser with network and xdm -# runlevel 6 is System reboot (Do not use this for initdefault!) -</screen> +# runlevel 6 is System reboot (Do not use this for initdefault!)</screen> <refsect2><title>Type</title> -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org