Author: keichwa
Date: Wed Oct 26 10:03:07 2011
New Revision: 66589
URL: http://svn.opensuse.org/viewcvs/yast?rev=66589&view=rev
Log:
novdoc adjustments
Added:
branches/tmp/ke/autoinstallation/doc/xml/entity-decl.ent
branches/tmp/ke/autoinstallation/doc/xml/network-decl.ent
Modified:
branches/tmp/ke/autoinstallation/doc/xml/BootMedia.xml
branches/tmp/ke/autoinstallation/doc/xml/Installation.xml
branches/tmp/ke/autoinstallation/doc/xml/KDumpSection.xml
branches/tmp/ke/autoinstallation/doc/xml/Makefile.am
branches/tmp/ke/autoinstallation/doc/xml/PartitioningSection.xml
branches/tmp/ke/autoinstallation/doc/xml/RulesAndClasses.xml
branches/tmp/ke/autoinstallation/doc/xml/linuxrc.xml
Modified: branches/tmp/ke/autoinstallation/doc/xml/BootMedia.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/xml/BootMedia.xml?rev=66589&r1=66588&r2=66589&view=diff
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/BootMedia.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/BootMedia.xml Wed Oct 26 10:03:07 2011
@@ -21,8 +21,8 @@
Floppies can be used to store the control file, especially when using
the original &company-suse; CD-ROMs for a single, disconnected machine. Using the
kernel command line, you can specify the location of the control
- file on the floppy. (See <quote></link></quote>)
+ file on the floppy. (See <quote></xref></quote>)
</para>
<para>
Even without specifying any command line options, it is still possible to initiate the
@@ -54,4 +54,4 @@
mode: xml
sgml-parent-document: ("autoyast2.xml" "chapter" "section")
End:
- -->
\ No newline at end of file
+ -->
Modified: branches/tmp/ke/autoinstallation/doc/xml/Installation.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/xml/Installation.xml?rev=66589&r1=66588&r2=66589&view=diff
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/Installation.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/Installation.xml Wed Oct 26 10:03:07 2011
@@ -255,8 +255,8 @@
<para>
The configuration file used by <command>linuxrc</command> can have the
following keywords (for a detailed description of how linuxrc works and
- other keywords, see <quote></link></quote> ):
+ other keywords, see <quote></xref></quote> ):
</para>
<table frame='top'>
@@ -335,8 +335,8 @@
</para>
<para>
The format of the special command line variable
- <emphasis>autoyast</emphasis> can be used as described in table <quote></link></quote>
+ <emphasis>autoyast</emphasis> can be used as described in table <quote></xref></quote>
</para>
<table frame='top' id="commandLineAutoYaST">
@@ -443,9 +443,9 @@
upon startup for a file named
<filename>autoinst.xml</filename>. If such a file is found, YaST2
will switch into auto-installation mode even if no special
- command line variables were supplied. (See <quote></link></quote> )
+ endterm="autoinstall.singlesystem.title"></xref></quote> )
</para>
</listitem>
<listitem>
Modified: branches/tmp/ke/autoinstallation/doc/xml/KDumpSection.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/xml/KDumpSection.xml?rev=66589&r1=66588&r2=66589&view=diff
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/KDumpSection.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/KDumpSection.xml Wed Oct 26 10:03:07 2011
@@ -395,10 +395,12 @@
<tbody>
<row>
<entry>KDUMP_NOTIFICATION_TO</entry>
- <entry>Exactly one email address (and only an address) to which the mail
+ <entry>
+ <para>
+ Exactly one email address (and only an address) to which the mail
should be sent. Additional recipients can be specified in
<literal>KDUMP_NOTIFICATION_CC</literal>.
- <para><screen><KDUMP_NOTIFICATION_TO>bwalle@suse.de</KDUMP_NOTIFICATION_TO></screen></para></entry>
+ </para><screen><KDUMP_NOTIFICATION_TO>bwalle@suse.de</KDUMP_NOTIFICATION_TO></screen></entry>
<entry>optional (email notification is disabled if empty)</entry>
</row>
<row>
Modified: branches/tmp/ke/autoinstallation/doc/xml/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/xml/Makefile.am?rev=66589&r1=66588&r2=66589&view=diff
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/Makefile.am (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/Makefile.am Wed Oct 26 10:03:07 2011
@@ -71,6 +71,9 @@
-e 's|</acronym>|</phrase>|g' \
-e 's|<caution>|<!-- role=\"caution\" --><note>|g' \
-e 's|</caution>|</note>|g' \
+ -e 's||<!-- numeration=\"arabic\" --><orderedlist>|g' \
-e 's|title id=[^>]*|title|' \
-e 's|endterm=[^/]*||' \
-e 's|frame=\"top\"||g' \
Modified: branches/tmp/ke/autoinstallation/doc/xml/PartitioningSection.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/xml/PartitioningSection.xml?rev=66589&r1=66588&r2=66589&view=diff
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/PartitioningSection.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/PartitioningSection.xml Wed Oct 26 10:03:07 2011
@@ -793,9 +793,9 @@
</figure>
<para>
- In this scenario and as shown in figure <quote></quote> , &autoyast2;
+ endterm="partitioning-keep1.title"/></quote>, &autoyast2;
should not in any case create any new
partitions, instead it should search for certain partition types on the system and use
them according to the partitioning plan in the control file. No
Modified: branches/tmp/ke/autoinstallation/doc/xml/RulesAndClasses.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/xml/RulesAndClasses.xml?rev=66589&r1=66588&r2=66589&view=diff
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/RulesAndClasses.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/RulesAndClasses.xml Wed Oct 26 10:03:07 2011
@@ -205,7 +205,6 @@
<para>
Here is an example for the use of a custom rules:
</para>
- <para>
<screen>
<![CDATA[
<rule>
@@ -227,7 +226,6 @@
</rule>
]]>
</screen>
- </para>
<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 /dev/null in this case).
@@ -247,7 +245,7 @@
<para>
you can have five different match_types:
</para>
- <para>
+
<itemizedlist>
<listitem>
<para>
@@ -275,7 +273,7 @@
</para>
</listitem>
</itemizedlist>
- </para>
+
<para>
"greater" and "lower" can be used for memsize or totaldisk for
example. They can match only on rules which return an integer value.
@@ -295,7 +293,7 @@
You can do that with the "operator" element in the rules.xml file. Here is
an example:
</para>
- <para>
+
<screen>
<![CDATA[
<rule>
@@ -315,7 +313,7 @@
</rule>
]]>
</screen>
- </para>
+
<para>
Just "and" and "or" are possible operators and the default operator
is "and".
@@ -353,8 +351,7 @@
<para>
If you are unsure about a value on your system, start an autoinstallation.
If the proposal shows up, switch to the console via CTRL+ALT+F2 and run
- <screen>/usr/lib/YaST2/bin/y2base ayast_probe ncurses
- </screen>. It might help to to turn the confirmation on for this, so that
+ <command>/usr/lib/YaST2/bin/y2base ayast_probe ncurses</command>. It might help to to turn the confirmation on for this, so that
the installation does not start in the background while you are watching the
values. The textbox with the values is scrollable.
</para>
@@ -402,8 +399,8 @@
<row>
<entry>mac</entry>
<entry>MAC address of host</entry>
- <entry>This attribute must always match exactly. (MAC addresses
- to be matched should be in the form <emphasis>0080c8f6484c</emphasis></entry>
+ <entry><para>This attribute must always match exactly. (MAC addresses
+ to be matched should be in the form <emphasis>0080c8f6484c</emphasis></para></entry>
</row>
<row>
<entry>linux</entry>
@@ -504,48 +501,42 @@
<tbody>
<row>
<entry>dialog_nr</entry>
- <entry>all rules with the same dialog_nr are presented on the same popup dialog so the same dialog_nr can appear in multiple rules.
- <para><screen><dialog_nr config:type="integer">3</dialog_nr></screen></para>
- </entry>
+ <entry><para>all rules with the same dialog_nr are presented on the same popup dialog so the same dialog_nr can appear in multiple rules.
+ </para><screen><dialog_nr config:type="integer">3</dialog_nr></screen></entry>
<entry>This element is optional and the default for a missing dialog_nr is always "0". If you have one popup only anyway, you don't need to specify the dialog_nr</entry>
</row>
<row>
<entry>element</entry>
- <entry>each element needs a uniq id. Even if you have more than one dialog, you must not use the same id twice like an id "1" on dialog 1 and and id "1" on dialog 2. That's different than with <ask> dialogs, where you can have the same <element> id on multiple dialogs.
- <para><screen><element config:type="integer">3</element></screen></para>
- </entry>
+ <entry><para>each element needs a uniq id. Even if you have more than one dialog, you must not use the same id twice like an id "1" on dialog 1 and and id "1" on dialog 2. That's different than with <ask> dialogs, where you can have the same <element> id on multiple dialogs.
+ </para><screen><element config:type="integer">3</element></screen></entry>
<entry>optional. If left out, autoyast adds his own id's internally but you can't use conflicts then (see below)</entry>
</row>
<row>
<entry>title</entry>
- <entry>the caption of the popup dialog
- <para><screen><title>Desktop Selection</title></screen></para>
- </entry>
+ <entry><para>the caption of the popup dialog
+ </para><screen><title>Desktop Selection</title></screen></entry>
<entry>optional</entry>
</row>
<row>
<entry>question</entry>
- <entry>the question text is shown in the popup behind the checkbox.
- <para><screen><question>KDE Desktop</question></screen></para>
- </entry>
+ <entry><para>the question text is shown in the popup behind the checkbox.
+ </para><screen><question>KDE Desktop</question></screen></entry>
<entry>optional. If you don't configure a text here, the name of the XML file that is triggered by this rule will be shown instead.</entry>
</row>
<row>
<entry>timeout</entry>
- <entry>a timeout in seconds after which the dialog will automatically "press" the okay button. Useful for a non blocking installation in combination with rules-dialogs.
- <para><screen><timeout config:type="integer">30</timeout></screen></para>
- </entry>
+ <entry><para>a timeout in seconds after which the dialog will automatically "press" the okay button. Useful for a non blocking installation in combination with rules-dialogs.
+ </para><screen><timeout config:type="integer">30</timeout></screen></entry>
<entry>optional. A missing timeout will stop the installation process until the dialog is confirmed by the user.</entry>
</row>
<row>
<entry>conflicts</entry>
- <entry>a list of element id's (rules) that conflict with this rule. If this rule matches or is selected by the user, all conflicting rules are deselected and disabled in the popup. Take care that you don't create deadlocks.
- <para><screen><conflicts config:type="list">
+ <entry><para>a list of element id's (rules) that conflict with this rule. If this rule matches or is selected by the user, all conflicting rules are deselected and disabled in the popup. Take care that you don't create deadlocks.
+ </para><screen><conflicts config:type="list">
<element config:type="integer">1</element>
<element config:type="integer">5</element>
...
-</conflicts></screen></para>
- </entry>
+</conflicts></screen></entry>
<entry>optional</entry>
</row>
</tbody>
@@ -554,7 +545,6 @@
<para>
Here is an example of how to use dialogs with rules:
</para>
- <para>
<screen>
<![CDATA[
<rules config:type="list">
@@ -617,7 +607,6 @@
</rules>
]]>
</screen>
- </para>
</section>
</section>
@@ -635,7 +624,6 @@
<para>
Here is an example of a class definition:
</para>
- <para>
<screen>
<![CDATA[
<classes config:type="list">
@@ -646,7 +634,6 @@
</classes>
]]>
</screen>
- </para>
<para>
The file Software.xml must be in the directory "classes/TrainingRoom/" then and
it will get fetched from the same place like the autoyast profile and the rules were
@@ -732,8 +719,8 @@
It is possible to mix rules and classes during an auto-installation
session. For example you can identify a system using rules which contain
class definitions in them. The process is described in the figures
- <quote></link></quote>.
+ <quote></xref></quote>.
</para>
<para>
After retrieving the rules and merging them, the generated control file
@@ -752,7 +739,6 @@
<para>
Let's take a look at two XML parts that we want to merge:
</para>
- <para>
<screen>
<partitioning config:type="list">
<drive>
@@ -774,8 +760,7 @@
</drive>
</partitioning>
</screen>
- </para>
- <para>
+
<screen>
<partitioning config:type="list">
<drive>
@@ -794,7 +779,7 @@
</drive>
</partitioning>
</screen>
- </para>
+
<para>
What you would expect is, that you'll end up in a profile with 3 partitions.
That is not the case. You'll end up with two partitions and the first partition
@@ -822,13 +807,13 @@
not official supported by autoyast and more a workaround than a nice solution. For each partition
in one file, add an attribute to the partition like this:
</para>
- <para>
+
<screen>
<partition dontmerge="1">
...
</partitions>
</screen>
- </para>
+
<para>
The trick is, that the merge script will not detect the partitions as the same element type because of the
new attribute. If you have more files, it might be needed to to add more attributes like <emphasis>dontmerge="2"</emphasis>.
@@ -842,7 +827,7 @@
<para>you can use the <emphasis>dont_merge</emphasis> element in the rules or classes file
like this:
</para>
- <para>
+
<screen>
<classes config:type="list">
<class>
@@ -854,8 +839,7 @@
</class>
</classes>
</screen>
- </para>
- <para>
+
<screen>
<rule>
<board_vendor>
@@ -882,7 +866,7 @@
</result>
</rule>
</screen>
- </para>
+
</section>
</chapter>
Added: branches/tmp/ke/autoinstallation/doc/xml/entity-decl.ent
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/xml/entity-decl.ent?rev=66589&view=auto
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/entity-decl.ent (added)
+++ branches/tmp/ke/autoinstallation/doc/xml/entity-decl.ent Wed Oct 26 10:03:07 2011
@@ -0,0 +1,251 @@
+<!-- ...................................................................... -->
+<!-- General Entities -->
+<!-- ...................................................................... -->
+
+<!ENTITY exampleuser "tux">
+<!ENTITY exampleuserII "wilber">
+<!ENTITY examplegroup "users">
+
+
+<!-- #######################################################################-->
+<!-- Obsolete entities. Do not use. -->
+<!-- See network-decl.ent for Network related entities -->
+
+<!ENTITY exampledomainip "192.168.0">
+<!ENTITY exampledomain1ip "192.168.1">
+<!ENTITY exampledomain2ip "192.168.2">
+<!-- ipv6 equivalent to 192.168.2.10 -->
+<!ENTITY exampledomain2ipv6 "2002:c0a8:20a::">
+<!ENTITY exampleserver "sun">
+<!ENTITY exampleserverip "&exampledomainip;.20">
+<!ENTITY exampleserverfq "&exampleserver;.&exampledomain;">
+<!ENTITY exampleclient "earth">
+<!ENTITY exampleclientip "&exampledomainip;.1">
+<!ENTITY exampleclientfq "&exampleclient;.&exampledomain;">
+<!ENTITY exampleclientppp "ppp&exampleclient;">
+<!ENTITY exampleclientslip "sl&exampleclient;">
+<!ENTITY exampleclientuucp "uu&exampleclient;">
+<!ENTITY exampleclientII "venus">
+<!ENTITY exampleclientIIppp "ppp&exampleclientII;">
+<!ENTITY exampleclientIIslip "sl&exampleclientII;">
+<!ENTITY exampleclientIIuucp "uu&exampleclientII;">
+
+
+<!ENTITY rootuser '<systemitem class="username">root</systemitem>'>
+<!ENTITY grub "GRUB">
+
+<!-- lilo will become obsolete with code 11 -->
+<!ENTITY lilo "LILO">
+
+<!ENTITY sax "SaX2">
+<!ENTITY atomic-update "Atomic Update">
+<!ENTITY suse "SUSE">
+<!ENTITY novell "Novell">
+<!ENTITY suseconfig "SuSEconfig">
+<!ENTITY suselinux "&suse; Linux">
+<!ENTITY suseonsite "&suse; Studio Onsite">
+<!ENTITY suseonsitereg "&suseonsite;®">
+<!-- suse studio service as different from the Onsite product -->
+<!ENTITY susestudio "&suse; Studio">
+<!ENTITY obs "&opensuse; Build Server">
+<!ENTITY xvendor "X.Org">
+<!ENTITY yast "YaST">
+<!ENTITY yastcc "&yast; Control Center">
+<!ENTITY gnomecc "GNOME Control Center">
+<!ENTITY ay "AutoYaST">
+<!ENTITY nm "NetworkManager">
+<!ENTITY fspot "f-spot">
+<!ENTITY digikam "digiKam">
+<!ENTITY yelp "Help">
+<!ENTITY khc "KDE help center">
+<!ENTITY umtsmon "UMTSmon">
+<!-- deprecated - use &libo; instead -->
+<!ENTITY ooo "&libo;">
+<!ENTITY libo "LibreOffice">
+<!ENTITY aide "AIDE">
+
+<!-- ============================================================= -->
+<!-- Books -->
+<!-- ============================================================= -->
+
+<!ENTITY deploy "Deployment Guide">
+<!ENTITY kdeuser "KDE User Guide">
+<!ENTITY gnomeuser "GNOME User Guide">
+<!ENTITY moblinuser "Moblin User Guide">
+<!ENTITY instquick "Installation Quick Start">
+<!ENTITY gnomequick "GNOME Quick Start">
+<!ENTITY kdequick "KDE Quick Start">
+<!ENTITY moblinquick "Moblin Quick Start">
+<!ENTITY oofficequick "&ooo; Quick Start">
+<!ENTITY apps "Application Guide">
+<!ENTITY admin "Administration Guide">
+<!ENTITY reference "Reference">
+<!ENTITY startup "Start-Up">
+<!ENTITY aaadmin "Novell AppArmor Administration Guide">
+<!ENTITY aaquick "Novell AppArmor Quick Start">
+<!ENTITY lfl "Lessons For Lizards">
+<!ENTITY storage "Storage Administration Guide">
+<!ENTITY haguide "High Availability Guide">
+<!ENTITY virtual "Virtualization Guide">
+<!ENTITY xenguide "Virtualization with &xen;">
+<!ENTITY kvmguide "Virtualization with &kvm;">
+<!ENTITY auditguide "The Linux Audit Framework">
+<!ENTITY auditquick "Linux Audit Quick Start">
+<!ENTITY tuning "System Analysis and Tuning Guide">
+<!ENTITY tuningsub "Problem Detection, Resolution, and Optimization">
+<!ENTITY secguide "Security Guide">
+<!ENTITY smtguide "Subscription Management Tool Guide">
+<!ENTITY webyastconfguide "WebYaST Configuration Guide">
+<!ENTITY studioadmin "Administration Guide">
+<!ENTITY studioinstall "Installation & Deployment Guide">
+
+
+<!-- ============================================================= -->
+<!-- Platforms -->
+<!-- ============================================================= -->
+
+<!ENTITY x86 "x86">
+<!ENTITY amd64 "AMD64">
+<!ENTITY s390 "S/390">
+<!ENTITY zseries "System z">
+<!ENTITY ipf "Itanium">
+<!ENTITY ipseries "POWER">
+<!ENTITY ppc "POWER">
+<!ENTITY em64t "Intel EM64T">
+<!ENTITY intel64 "Intel 64">
+
+
+<!-- ============================================================= -->
+<!-- Products -->
+<!-- ============================================================= -->
+
+<!-- please change product to anything that makes sense in your current release -->
+
+<!ENTITY opensuse "openSUSE">
+<!ENTITY opensusereg "openSUSE®">
+<!ENTITY sle "SUSE Linux Enterprise">
+<!ENTITY sas "&sle; Advanced Server">
+<!ENTITY slereg "SUSE® Linux Enterprise">
+<!ENTITY slert "&sle; Real Time">
+<!ENTITY slerte "&slert; Extension">
+<!ENTITY slertreg "&slereg; Real Time">
+<!ENTITY slertereg "&slereg; Real Time Extension">
+<!ENTITY sls "SUSE Linux Enterprise Server">
+<!ENTITY slsa "SLES">
+<!ENTITY slsreg "SUSE® Linux Enterprise Server">
+<!ENTITY sled "SUSE Linux Enterprise Desktop">
+<!ENTITY sleda "SLED">
+<!ENTITY sledreg "SUSE® Linux Enterprise Desktop">
+<!ENTITY productname '<?suse name="productname"?>'>
+<!ENTITY productnamereg '<?suse name="productnamereg"?>'>
+<!ENTITY productnumber '<?suse name="productnumber"?>'>
+<!ENTITY sdk "SUSE Software Development Kit">
+<!ENTITY slreg "SUSE® Linux">
+<!ENTITY slepos "SUSE Linux Enterprise Point of Service">
+<!ENTITY sleposreg "SUSE® Linux Enterprise Point of Service">
+<!ENTITY slert "&sle; Real Time">
+<!ENTITY slertreg "&slereg; Real Time">
+<!ENTITY hasi "High Availability Extension">
+<!ENTITY sletcreg "&slereg; Thin Client">
+<!ENTITY sletc "&sle; Thin Client">
+<!ENTITY sletca "SLETC">
+<!ENTITY tc "Thin Client">
+<!ENTITY nu "NU">
+<!ENTITY ncc "Novell Customer Center">
+<!ENTITY yup "yup">
+<!ENTITY imgcreat "Image Creator">
+<!ENTITY admserv "Administration Server">
+<!ENTITY branchserv "Branch Server">
+<!ENTITY imgserv "Image Building Server">
+<!ENTITY posbranchserv "POSBranch Server">
+<!ENTITY pos "Point of Service">
+<!ENTITY wy "WebYaST">
+<!ENTITY wyclient "&yast;2 Webclient">
+<!ENTITY wyservice "&yast;2 Webservice">
+<!ENTITY slms "SUSE Lifecycle Management Server">
+<!ENTITY slmsreg "SUSE® Lifecycle Management Server">
+
+<!-- ============================================================= -->
+<!-- Applications -->
+<!-- ============================================================= -->
+
+<!ENTITY musicplayer "Banshee">
+<!ENTITY musicplayerreg "Banshee™">
+<!ENTITY zenup "Software Updater">
+<!ENTITY updater "GNOME Update Applet/KDE Software Updater">
+<!ENTITY gupdater "Update Applet"> <!-- GNOME Updater-->
+<!ENTITY kupdater "Software Updater"> <!-- KDE Updater -->
+<!ENTITY aa "AppArmor">
+<!ENTITY aareg "AppArmor®">
+<!ENTITY naa "Novell AppArmor">
+<!ENTITY naareg "Novell® AppArmor">
+<!ENTITY hb "Heartbeat">
+<!ENTITY hbvs "Heartbeat 2">
+<!ENTITY hbgui "Linux HA Management Client">
+<!ENTITY smtool "Subscription Management Tool">
+<!ENTITY smt "SMT">
+<!ENTITY xen "Xen">
+<!ENTITY xenreg "Xen®">
+<!ENTITY kvm "KVM">
+<!ENTITY vmhost "VM Host Server">
+<!ENTITY vmguest "VM Guest">
+<!ENTITY dom0 "Domain0">
+<!ENTITY libvirt '<systemitem class="library">libvirt</systemitem>'>
+<!ENTITY libvirtd '<systemitem class="daemon">libvirtd</systemitem>'>
+<!ENTITY vmm "Virtual Machine Manager">
+<!ENTITY qemu "QEMU">
+<!ENTITY pk "PolicyKit">
+<!ENTITY ha "High Availability">
+<!ENTITY ais "OpenAIS">
+<!ENTITY stonith "STONITH">
+<!ENTITY susefirewall "SuSEFirewall2">
+<!ENTITY pciback "PCI Pass-Through">
+<!ENTITY lvs "Linux Virtual Server">
+<!ENTITY krandr "KRandRTray">
+<!ENTITY amarok "Amarok">
+<!ENTITY digikam "digiKam">
+<!ENTITY postgresql "PostgreSQL">
+<!ENTITY mysql "MySQL">
+<!ENTITY jeos "JeOS"><!-- Just enough OS -->
+<!ENTITY stap "SystemTap">
+<!ENTITY oprof "OProfile">
+<!ENTITY cpufreq "CPUfreq">
+<!ENTITY powertop "powerTOP">
+
+<!-- oddities -->
+<!ENTITY thrdmrk "*">
+
+<!-- ============================================================= -->
+<!-- yast desktop entities -->
+<!-- ============================================================= -->
+
+<!ENTITY ycc_runlevel "System Services (Runlevel)">
+
+<!-- ============================================================= -->
+<!-- Miscellaneous -->
+<!-- ============================================================= -->
+<!ENTITY kiwi "KIWI">
+<!ENTITY cdcreator "CD Creator">
+<!ENTITY addoncreator "Add-on Creator">
+<!ENTITY imgcreator "Image Creator">
+<!ENTITY productcreator "Product Creator">
+<!ENTITY nomad "Nomad">
+<!ENTITY cpufreq "CPUfreq">
+<!ENTITY altf2 '<keycombo><keycap function="alt"/><keycap>F2</keycap></keycombo>'>
+
+<!ENTITY wypublic "/srv/www/yast/public/">
+<!ENTITY mac "<replaceable>MAC</replaceable>">
+<!ENTITY hwmac "hwtype.<replaceable>MAC</replaceable>">
+<!ENTITY confmac "config.<replaceable>MAC</replaceable>">
+
+
+<!-- Additional Entities -->
+<!ENTITY euro "€">
+
+
+<!ENTITY % network-entities SYSTEM "network-decl.ent">
+%network-entities;
+
+<!-- End of file -->
+<!-- ............................................................. -->
+
Modified: branches/tmp/ke/autoinstallation/doc/xml/linuxrc.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/xml/linuxrc.xml?rev=66589&r1=66588&r2=66589&view=diff
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/linuxrc.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/linuxrc.xml Wed Oct 26 10:03:07 2011
@@ -35,7 +35,6 @@
kernel parameter that accidentally is recognized by Linuxrc, too), use
<emphasis>linuxrc=nocmdline</emphasis>.
</para>
- <para>
<note>
<title>Change starting from SUSE Linux 10.2</title>
<para>
@@ -43,7 +42,6 @@
explicit, like 'info=floppy:/info'.
</para>
</note>
- </para>
<para>
Independent of the above, Linuxrc will always look for and parse a file
<filename>/linuxrc.config</filename>. You can use this file to change default
@@ -57,17 +55,16 @@
<title>'info' file format</title>
<para>
Lines starting with '<emphasis>#</emphasis>' are comments, valid entries are of the form
+ </para>
<screen>
key: value
- </screen>
+ </screen><para>
Note that <emphasis>value</emphasis> extends to the end of the line and so may contain spaces.
<emphasis>key</emphasis> is matched case insensitive.
</para>
<para>
You can use the same key - value pairs on the kernel command line using the syntax
- <interface>
- key=value
- </interface>
+ <literal>key=value</literal>.
Lines that don't have the form described above are ignored.
</para>
<para>
Added: branches/tmp/ke/autoinstallation/doc/xml/network-decl.ent
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/xml/network-decl.ent?rev=66589&view=auto
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/network-decl.ent (added)
+++ branches/tmp/ke/autoinstallation/doc/xml/network-decl.ent Wed Oct 26 10:03:07 2011
@@ -0,0 +1,182 @@
+<!-- ...................................................................... -->
+<!-- General Entities -->
+<!-- ...................................................................... -->
+
+<!-- domains -->
+<!ENTITY exampledomain "example.com">
+<!ENTITY exampledomain1 "example.net">
+<!ENTITY exampledomain2 "example.org">
+
+<!-- subnets -->
+<!ENTITY subnetI "192.168.1">
+<!ENTITY subnetImask "&subnetI;.0/24">
+<!ENTITY subnetII "192.168.2">
+<!ENTITY subnetIImask "&subnetII;.0/24">
+<!ENTITY subnetIII "192.168.3">
+<!ENTITY subnetIIImask "&subnetIII;.0/24">
+<!ENTITY subnetIV "192.168.4">
+<!ENTITY subnetIVmask "&subnetIV;.0/24">
+<!ENTITY subnetV "192.168.5">
+<!ENTITY subnetVmask "&subnetV;.0/30">
+<!ENTITY subnetnat "192.168.100">
+<!ENTITY subnetnatmask "&subnetnat;.0/24">
+
+<!ENTITY subnetv6 "2002:c0a8">
+
+<!-- Broadcast addresses -->
+<!ENTITY subnetIbc "&subnetI;.255">
+<!ENTITY subnetIIbc "&subnetII;.255">
+<!ENTITY subnetIIIbc "&subnetIII;.255">
+<!ENTITY subnetIVbc "&subnetIV;.255">
+<!ENTITY subnetVbc "&subnetV;.252">
+
+<!-- Netmask for C class network -->
+<!ENTITY subnetmask "255.255.255.0">
+
+<!-- DNS names (server) -->
+<!ENTITY smbname "smb.&exampledomain;">
+<!ENTITY nfsname "nfs.&exampledomain;">
+<!ENTITY iscsiname "iscsi.&exampledomain;">
+<!ENTITY proxyname "www-proxy.&exampledomain;">
+<!ENTITY ldapname "ldap.&exampledomain;">
+<!ENTITY nisname "nis.&exampledomain;">
+<!ENTITY slpname "slp.&exampledomain;">
+<!ENTITY ntpname "ntp.&exampledomain;">
+<!ENTITY tftpname "tftp.&exampledomain;">
+<!ENTITY pxename "pxe.&exampledomain;">
+<!ENTITY kdcname "kdc.&exampledomain;">
+<!ENTITY dnsname "dns.&exampledomain;">
+<!ENTITY dhcpname "dhcp.&exampledomain;">
+<!ENTITY cupsname "cups.&exampledomain;">
+
+<!-- DNS names (infrastructure) -->
+<!ENTITY wwwname "www.&exampledomain;">
+<!ENTITY wwwname1 "www.&exampledomain1;">
+<!ENTITY wwwname2 "www.&exampledomain2;">
+<!ENTITY ftpname "ftp.&exampledomain;">
+<!ENTITY mailname "mail.&exampledomain;">
+<!ENTITY routerextname "routerext.&exampledomain;">
+<!ENTITY routerintname "routerint.&exampledomain;">
+<!ENTITY fwextname "fwext.&exampledomain;">
+<!ENTITY fwintname "fwint.&exampledomain;">
+<!ENTITY gatename "gate.&exampledomain;">
+
+<!-- DNS names (clients) -->
+<!ENTITY wsIname "jupiter.&exampledomain;">
+<!ENTITY wsIIname "venus.&exampledomain;">
+<!ENTITY wsIIIname "saturn.&exampledomain;">
+<!ENTITY wsIVname "mercury.&exampledomain;">
+
+<!-- names (clients) -->
+<!ENTITY wsI "jupiter">
+<!ENTITY wsII "venus">
+<!ENTITY wsIII "saturn">
+<!ENTITY wsIV "mercury">
+
+<!-- names (Xen) -->
+<!ENTITY xenhostname "earth.&exampledomain;">
+<!ENTITY xenhost "earth">
+<!ENTITY xenhostip "&subnetI;.20">
+<!ENTITY xenguestname "alice.&exampledomain;">
+<!ENTITY xenguest "alice">
+<!ENTITY xenguestip "&subnetI;.21">
+<!ENTITY xennatguest "dolly">
+<!ENTITY xennatip "&subnetnat;.1">
+
+
+<!-- MAC addresses -->
+<!ENTITY wsImac "00:30:6E:08:EC:80">
+<!ENTITY wsIImac "00:00:1C:B5:A4:32">
+<!ENTITY wsIIImac "00:17:31:CA:A3:4A">
+<!ENTITY wsIVmac "00:16:35:AF:94:4B">
+
+<!-- IP addresses (server) -->
+<!ENTITY smbip "&subnetI;.110">
+<!ENTITY smbipv6 "&subnetv6;:16e::">
+<!ENTITY nfsip "&subnetI;.110">
+<!ENTITY nfsipv6 "&subnetv6;:16e::">
+<!ENTITY iscsiip "&subnetI;.111">
+<!ENTITY iscsiipv6 "&subnetv6;:16f::">
+<!ENTITY proxyip "&subnetI;.112">
+<!ENTITY proxyipv6 "&subnetv6;170::">
+<!ENTITY ldapip "&subnetI;.113">
+<!ENTITY ldapipv6 "&subnetv6;:171::">
+<!ENTITY nisip "&subnetI;.113">
+<!ENTITY nisipv6 "&subnetv6;:171::">
+<!ENTITY ntpip "&subnetI;.116">
+<!ENTITY ntpipv6 "&subnetv6:174::;">
+<!ENTITY tftpip "&subnetI;.115">
+<!ENTITY tftpipv6 "&subnetv6;:173::">
+<!ENTITY pxeip "&subnetI;.115">
+<!ENTITY pxeipv6 "&subnetv6;:173::">
+<!ENTITY kdcip "&subnetI;.114">
+<!ENTITY kdcipv6 "&subnetv6;:172::">
+<!ENTITY dnsip "&subnetI;.116">
+<!ENTITY dnsipv6 "&subnetv6;:174::">
+<!ENTITY vpnip "&subnetI;.120">
+
+
+<!ENTITY slpip "&subnetII;.254">
+<!ENTITY slpipv6 "&subnetv6;:2fe::">
+<!ENTITY dhcpip "&subnetII;.254">
+<!ENTITY dhcpipv6 "&subnetv6;:2fe::">
+<!ENTITY cupsip "&subnetII;.253">
+<!ENTITY cupsipv6 "&subnetv6;:2fd::">
+
+<!-- IP addresses (infrastructure) -->
+<!ENTITY routerintipI "&subnetI;.1">
+<!ENTITY routerintipIv6 "&subnetv6;:101::">
+<!ENTITY fwintipI "&subnetI;.1">
+<!ENTITY fwintipIv6 "&subnetv6;:101::">
+
+<!ENTITY routerintipII "&subnetII;.1">
+<!ENTITY routerintipIIv6 "&subnetv6;:201::">
+<!ENTITY fwintipII "&subnetII;.1">
+<!ENTITY fwintipIIv6 "&subnetv6;:201::">
+
+<!ENTITY wwwip "&subnetIII;.100">
+<!ENTITY wwwipv6 "&subnetv6;:364::">
+<!ENTITY wwwip1 "&subnetIII;.101">
+<!ENTITY wwwip1v6 "&subnetv6;:365::">
+<!ENTITY wwwip2 "&subnetIII;.102">
+<!ENTITY wwwip2v6 "&subnetv6;:366::">
+<!ENTITY ftpip "&subnetIII;.105">
+<!ENTITY ftpipv6 "&subnetv6;:369::">
+<!ENTITY mailip "&subnetIII;.108">
+<!ENTITY mailipv6 "&subnetv6;:36c::">
+<!ENTITY routerextipIII "&subnetIII;.2">
+<!ENTITY routerextipIIIv6 "&subnetv6;:302::">
+<!ENTITY fwextipIII "&subnetIII;.2">
+<!ENTITY fwextipIIIv6 "&subnetv6;:302::">
+
+<!ENTITY routerintipIV "&subnetIV;.1">
+<!ENTITY routerintipIVv6 "&subnetv6;:401::">
+<!ENTITY routerextipIV "&subnetIV;.2">
+<!ENTITY routerextipIVv6 "&subnetv6;:402::">
+<!ENTITY fwextipIV "&subnetIV;.2">
+<!ENTITY fwextipIVv6 "&subnetv6;:402::">
+<!ENTITY fwintipIV "&subnetIV;.1">
+<!ENTITY fwintipIVv6 "&subnetv6;:401::">
+
+<!ENTITY routerextipV "&subnetV;.2">
+<!ENTITY routerextipVv6 "&subnetv6;:502::">
+<!ENTITY fwextipV "&subnetV;.2">
+<!ENTITY fwextipVv6 "&subnetv6;:502::">
+<!ENTITY gateip "&subnetV;.1">
+<!ENTITY gateipv6 "&subnetv6;:501::">
+
+<!-- IP addresses (clients) -->
+<!ENTITY wsIip "&subnetII;.100">
+<!ENTITY wsIipv6 "&subnetv6;:264::">
+<!ENTITY wsIIip "&subnetII;.101">
+<!ENTITY wsIIipv6 "&subnetv6;:265::">
+<!ENTITY wsIIIip "&subnetII;.102">
+<!ENTITY wsIIIipv6 "&subnetv6;:266::">
+<!ENTITY wsIVip "&subnetII;.103">
+<!ENTITY wsIVipv6 "&subnetv6;:267::">
+
+<!ENTITY vpnclient1 "&subnetII;.110">
+<!ENTITY vpnclient2 "&subnetII;.111">
+
+<!-- End of file -->
+<!-- ............................................................. -->
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org