Hello community, here is the log from the commit of package opensuse-manual_en checked in at Mon May 5 00:26:27 CEST 2008. -------- --- opensuse-manual_en/opensuse-manual_en.changes 2008-01-13 20:45:13.000000000 +0100 +++ /mounts/work_src_done/NOARCH/opensuse-manual_en/opensuse-manual_en.changes 2008-05-02 16:25:59.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 2 16:23:47 CEST 2008 - ke@suse.de + +- 11.0 pre-release. The KDE3 User Guide will get packaged separately as + opensuse-kde3user_en. + +------------------------------------------------------------------- Old: ---- opensuse-kdeuser_en-graphics.tar.bz2 opensuse-kdeuser_en.pdf opensuse-kdeuser_en.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manual_en.spec ++++++ --- /var/tmp/diff_new_pack.C17816/_old 2008-05-05 00:25:59.000000000 +0200 +++ /var/tmp/diff_new_pack.C17816/_new 2008-05-05 00:25:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package opensuse-manual_en (Version 10.3) +# spec file for package opensuse-manual_en (Version 11.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,17 +10,18 @@ # norootforbuild + Name: opensuse-manual_en %define my_lang en %define my_prov_obs suselinux-adminguide_%{my_lang} suselinux-userguide_%{my_lang} suselinux-manual_%{my_lang} %define my_book opensuse-html -Version: 10.3 -Release: 52 +Version: 11.0 +Release: 1 Obsoletes: %{my_prov_obs} Provides: %{my_prov_obs} -Provides: locale(desktop-data-openSUSE:en) -Obsoletes: suselinux-manual_es suselinux-manual_fr suselinux-manual_it suselinux-manual_ja suselinux-manual_pt_BR suselinux-manual_zh_CN suselinux-manual_zh_TW opensuse-quickstart_en -Provides: suselinux-manual_es suselinux-manual_fr suselinux-manual_it suselinux-manual_ja suselinux-manual_pt_BR suselinux-manual_zh_CN suselinux-manual_zh_TW opensuse-quickstart_en +Provides: locale(desktop-data-openSuSE:en) +Obsoletes: suselinux-manual_es suselinux-manual_fr suselinux-manual_it suselinux-manual_ja suselinux-manual_pt_BR suselinux-manual_zh_CN suselinux-manual_zh_TW opensuse-quickstart_en opensuse-gnomeuser_en +Provides: suselinux-manual_es suselinux-manual_fr suselinux-manual_it suselinux-manual_ja suselinux-manual_pt_BR suselinux-manual_zh_CN suselinux-manual_zh_TW opensuse-quickstart_en opensuse-gnomeuser_en #OBS Source00: opensuse-html_en-html.tar.bz2 Source01: opensuse-html_en-desktop.tar.bz2 @@ -31,23 +32,20 @@ Source20: opensuse-kdequick_en.pdf Source21: opensuse-kdequick_en-graphics.tar.bz2 Source22: opensuse-kdequick_en.tar.bz2 -Source30: opensuse-kdeuser_en.pdf -Source31: opensuse-kdeuser_en-graphics.tar.bz2 -Source32: opensuse-kdeuser_en.tar.bz2 -Source40: opensuse-reference_en.pdf -Source41: opensuse-reference_en-graphics.tar.bz2 -Source42: opensuse-reference_en.tar.bz2 -Source50: opensuse-startup_en.pdf -Source51: opensuse-startup_en-graphics.tar.bz2 -Source52: opensuse-startup_en.tar.bz2 -Source60: APPARMOR-admin_en.pdf -Source61: APPARMOR-admin_en-graphics.tar.bz2 -Source62: APPARMOR-admin_en.tar.bz2 +Source30: opensuse-reference_en.pdf +Source31: opensuse-reference_en-graphics.tar.bz2 +Source32: opensuse-reference_en.tar.bz2 +Source40: opensuse-startup_en.pdf +Source41: opensuse-startup_en-graphics.tar.bz2 +Source42: opensuse-startup_en.tar.bz2 +Source50: APPARMOR-admin_en.pdf +Source51: APPARMOR-admin_en-graphics.tar.bz2 +Source52: APPARMOR-admin_en.tar.bz2 #SOURCES BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: update-desktop-files -Group: Documentation/SuSE +Group: Documentation/SUSE License: GNU Free Documentation License, Version 1.2 (GFDL 1.2) Summary: openSUSE Manual (English) %define _defaultdocdir %{_datadir}/doc/manual @@ -62,12 +60,12 @@ %package pdf -Group: Documentation/SuSE +Group: Documentation/SUSE License: GNU Free Documentation License, Version 1.2 (GFDL 1.2) Summary: openSUSE Manual (English) as PDF -#Provides: locale(desktop-data-openSUSE:en) -Obsoletes: suselinux-manual_es-pdf suselinux-manual_fr-pdf suselinux-manual_it-pdf suselinux-manual_ja-pdf suselinux-manual_pt_BR-pdf suselinux-manual_zh_CN-pdf suselinux-manual_zh_TW-pdf opensuse-quickstart_en-pdf -Provides: suselinux-manual_es-pdf suselinux-manual_fr-pdf suselinux-manual_it-pdf suselinux-manual_ja-pdf suselinux-manual_pt_BR-pdf suselinux-manual_zh_CN-pdf suselinux-manual_zh_TW-pdf opensuse-quickstart_en-pdf +#Provides: locale(desktop-data-openSuSE:en) +Obsoletes: suselinux-manual_es-pdf suselinux-manual_fr-pdf suselinux-manual_it-pdf suselinux-manual_ja-pdf suselinux-manual_pt_BR-pdf suselinux-manual_zh_CN-pdf suselinux-manual_zh_TW-pdf opensuse-quickstart_en-pdf opensuse-gnomeuser_en-pdf +Provides: suselinux-manual_es-pdf suselinux-manual_fr-pdf suselinux-manual_it-pdf suselinux-manual_ja-pdf suselinux-manual_pt_BR-pdf suselinux-manual_zh_CN-pdf suselinux-manual_zh_TW-pdf opensuse-quickstart_en-pdf opensuse-gnomeuser_en-pdf #PDFOBS %description pdf @@ -85,12 +83,9 @@ cp %{S:30} . cp %{S:40} . cp %{S:50} . -cp %{S:60} . #PDFPREP %build -find . -name CVS -o -name '.xvpics' -o -name '.cvsignore' \ - | xargs rm -fr # make sure index.html exists for f in $(find html -type f -name 'book.*'); do pushd ${f%/*} @@ -108,23 +103,21 @@ ### install -d $RPM_BUILD_ROOT%{my_desktopdir}/%{name} # product is name without language code -%if %suse_version < 1030 -%define gnome_dir /opt/gnome/share/gnome/help/opensuse-manual -%else %define gnome_dir %{_datadir}/gnome/help/opensuse-manual -%endif install -d $RPM_BUILD_ROOT%{gnome_dir} # if [ -d html/%my_book ]; then mv html/%my_book html/manual pushd desktop # problem writing desktop files on 10.3 +### CHECKIT: still necessary on 11.0? if [ -d index.desktop ]; then for f in $(find index.desktop -mindepth 1 -maxdepth 1); do mv $f . done rmdir index.desktop fi +### CHECKIT: can we fix this for 11.0? Just avoid the subdir... if [ ! -f .directory ]; then # stand-alone book, hidden in sub-directory dir=$(find . -maxdepth 1 -type d -name 'book_*') @@ -174,27 +167,19 @@ sed -i 's:(^DocPath.*/).*:\1index.html: s/^(Name|Comment)(.*)/\1\2 (%{my_lang})/' $f fi + # make sure to sort startup guide first + case %name in + sles-startup*) + [ $f = "./.directory" ] \ + && sed -i "s|^(X-DOC-Weight).*|\1=-2000|" $f ;; + esac done -# # remove the dots from the file names -# for f in $(find . -type f -name '*desktop'); do -# d=${f%/*} -# n=${f##*/}; n=${n/.desktop}; n=${n//./_}; n=${n}.desktop -# [ $f = $d/$n ] || mv -v $f $d/$n -# done -# ren_dir () { -# for d in $(find . -maxdepth $1 -mindepth $1 -type d); do -# n=${d#*/}; n=${n//./_} -# [ $d = $n ] || mv -v $d $n -# done -# } -# ren_dir 1 -# ren_dir 2 -# # cp -a . $RPM_BUILD_ROOT%{my_desktopdir}/%{name} +cp %{S:100} $RPM_BUILD_ROOT%{my_desktopdir}/.directory || : popd # Link it into the Gnome help system (must be found by calling # susehelp help://suselinux-manual/ -pushd $RPM_BUILD_ROOT/%{gnome_dir} +pushd $RPM_BUILD_ROOT%{gnome_dir} if [ %{my_lang} = "en" ]; then target=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/manual install -d $target @@ -223,156 +208,151 @@ %{my_desktopdir} %dir %{_datadir}/susehelp %{gnome_dir} -%if %suse_version > 1020 %dir /usr/share/gnome %dir /usr/share/gnome/help -%else -%dir /opt/gnome -%dir /opt/gnome/share -%dir /opt/gnome/share/gnome -%dir /opt/gnome/share/gnome/help -%endif - %changelog -* Sun Jan 13 2008 - coolo@suse.de +* Fri May 02 2008 ke@suse.de +- 11.0 pre-release. The KDE3 User Guide will get packaged separately as + opensuse-kde3user_en. +* Sun Jan 13 2008 coolo@suse.de - rename desktop-data-SuSE to -openSUSE -* Wed Nov 07 2007 - ke@suse.de +* Wed Nov 07 2007 ke@suse.de - Correct X-DOC-Weight using better style-sheet support. -* Mon Oct 29 2007 - bg@suse.de +* Mon Oct 29 2007 bg@suse.de - Fixing support information. -* Fri Sep 21 2007 - ke@suse.de +* Fri Sep 21 2007 ke@suse.de - Assign X-DOC-Weight manually (-3000) to make it show up right after the release-notes. -* Thu Sep 20 2007 - ke@suse.de +* Thu Sep 20 2007 ke@suse.de - Work around for sorting Quick* book chapters (KDE, GNOME, AppArmor); [#] 326392. -* Wed Sep 19 2007 - ke@suse.de +* Wed Sep 19 2007 ke@suse.de - Remove more X-DOC settings; reported by Stephan Binner [# 325691]. - Make X-DOC-Weight values positive; [# 326392]. -* Mon Sep 17 2007 - ke@suse.de +* Mon Sep 17 2007 ke@suse.de - Remove X-DOC-Identifier from *.desktop files; reported by Stephan Binner [# 325691]. -* Fri Sep 14 2007 - ke@suse.de +* Fri Sep 14 2007 ke@suse.de - Update text files. -* Thu Sep 13 2007 - ke@suse.de +* Thu Sep 13 2007 ke@suse.de - Update text files and images. -* Fri Sep 07 2007 - ke@suse.de +* Fri Sep 07 2007 ke@suse.de - Update text files and images. -* Thu Sep 06 2007 - coolo@suse.de +* Thu Sep 06 2007 coolo@suse.de - As discussed with Tanja and Jana: pdfs should not be installed by default -* Fri Aug 24 2007 - ke@suse.de +* Fri Aug 24 2007 ke@suse.de - Update text files and images. - Add missing spaces in .directory files; reported by Stephan Binner, fixed by Thomas Schraitle; #299605. -* Mon Aug 20 2007 - ke@suse.de +* Mon Aug 20 2007 ke@suse.de - Update text files and images. -* Thu Aug 16 2007 - ke@suse.de +* Thu Aug 16 2007 ke@suse.de - Move coolo's patch to the spec file templates. - Update source files. - Optimize PNGs as implemented by Berthold Gunreben; #299098. -* Wed Aug 15 2007 - coolo@suse.de +* Wed Aug 15 2007 coolo@suse.de - trigger installation on english (or fallback) desktop installations (#296873) -* Thu Aug 09 2007 - ke@suse.de +* Thu Aug 09 2007 ke@suse.de - New 10.3 pre-release for beta2. - Prepare .directory for translation using update-desktop-files; [#252573]. -* Mon Aug 06 2007 - ke@suse.de +* Mon Aug 06 2007 ke@suse.de - New 10.3 pre-release for beta1. - Improve building .desktop files; now the "quick" manual are visible. Thanks to Thomas Schraitle. [# 288788]. -* Wed Aug 01 2007 - ke@suse.de +* Wed Aug 01 2007 ke@suse.de - New 10.3 pre-release for testing. - Add opensuse-quickstart_en the obsoletes. -* Fri Jul 20 2007 - ke@suse.de +* Fri Jul 20 2007 ke@suse.de - 10.3 pre-release for testing. - New method for building .desktop files; thanks to Thomas Schraitle. -* Wed Jun 06 2007 - ro@suse.de +* Wed Jun 06 2007 ro@suse.de - documentation shouldn't be executable -* Wed Jan 31 2007 - ro@suse.de +* Wed Jan 31 2007 ro@suse.de - GNOME moved to /usr -* Fri Nov 24 2006 - ke@suse.de +* Fri Nov 24 2006 ke@suse.de - Update KDE User Guide and parts of the other manuals. - Add language tag to the khelpcenter section title. -* Mon Nov 13 2006 - ro@suse.de +* Mon Nov 13 2006 ro@suse.de - try to fix specfile -* Fri Nov 10 2006 - ke@suse.de +* Fri Nov 10 2006 ke@suse.de - Update XML and image files. -* Wed Nov 08 2006 - ke@suse.de +* Wed Nov 08 2006 ke@suse.de - Update XML and image files. - Avoid dots in desktop files to make navigation links of the khelpcenter work; thanks to Will Stephenson and Cornelius Schumacher [#213573]. -* Tue Nov 07 2006 - ke@suse.de +* Tue Nov 07 2006 ke@suse.de - Update XML and image files. - Move the Quickstarts from here to the opensuse-quickstart_en package. -* Mon Nov 06 2006 - ke@suse.de +* Mon Nov 06 2006 ke@suse.de - Update XML and image files for beta2. - desktop files are still broken. -* Fri Oct 27 2006 - dmueller@suse.de +* Fri Oct 27 2006 dmueller@suse.de - don't build as root -* Thu Oct 26 2006 - ke@suse.de +* Thu Oct 26 2006 ke@suse.de - Update xml and image files and build new output formats; still preliminary. -* Thu Oct 19 2006 - ke@suse.de +* Thu Oct 19 2006 ke@suse.de - Update. - Some desktop file adjustments, but still broken. -* Mon Oct 16 2006 - ke@suse.de +* Mon Oct 16 2006 ke@suse.de - Update the package. - Fix locale provides. -* Fri Oct 13 2006 - ke@suse.de +* Fri Oct 13 2006 ke@suse.de - Update the package. - Add desktop files and make it accessible from the KDE Help Center; there are still issues with the navigation tree. -* Thu Oct 12 2006 - ke@suse.de +* Thu Oct 12 2006 ke@suse.de - Rename for suselinux-manual_en to opensuse-manual_en. - Thus far not at all integrated into the help systems! -* Tue Apr 18 2006 - ke@suse.de +* Tue Apr 18 2006 ke@suse.de - Install the AppArmor manual as AppArmor; reported by Christian Boltz [# 166088] - Provide Name without language code for top level .directory file. -* Tue Apr 11 2006 - ke@suse.de +* Tue Apr 11 2006 ke@suse.de - Adjust locale Provides [# 162525]. -* Fri Apr 07 2006 - ke@suse.de +* Fri Apr 07 2006 ke@suse.de - Update for 10.1 RC1. -* Thu Apr 06 2006 - ke@suse.de +* Thu Apr 06 2006 ke@suse.de - Make it available for yelp on Gnome (call: susehelp help://suselinux-manual/). -* Thu Mar 02 2006 - ke@suse.de +* Thu Mar 02 2006 ke@suse.de - Update for beta7. - Add AppArmor Admin Guide. -* Mon Feb 20 2006 - ke@suse.de +* Mon Feb 20 2006 ke@suse.de - Update for beta5. -* Fri Feb 10 2006 - ke@suse.de +* Fri Feb 10 2006 ke@suse.de - Update for 10.1 betaX. -* Mon Jan 30 2006 - ke@suse.de +* Mon Jan 30 2006 ke@suse.de - Update for 10.1 beta3. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Thu Jan 19 2006 - ke@suse.de +* Thu Jan 19 2006 ke@suse.de - Update for 10.1 beta2 and add XML sources. -* Fri Jan 13 2006 - ke@suse.de +* Fri Jan 13 2006 ke@suse.de - 10.1 preview manuals for testing. -* Mon Sep 12 2005 - ke@suse.de +* Mon Sep 12 2005 ke@suse.de - Update. Last final fixes. -* Wed Sep 07 2005 - ke@suse.de +* Wed Sep 07 2005 ke@suse.de - Update. Both the books are final. -* Mon Sep 05 2005 - ke@suse.de +* Mon Sep 05 2005 ke@suse.de - Update the manuals; the Start-Up Guide is final. -* Fri Sep 02 2005 - ke@suse.de +* Fri Sep 02 2005 ke@suse.de - Update the manuals. -* Mon Aug 29 2005 - ke@suse.de +* Mon Aug 29 2005 ke@suse.de - Update the manuals. -* Fri Aug 12 2005 - ke@suse.de +* Fri Aug 12 2005 ke@suse.de - Update the manuals and adjust the desktop files used by the help system; both HTML manuals are now part of one set. -* Fri Aug 05 2005 - ke@suse.de +* Fri Aug 05 2005 ke@suse.de - Update the manuals. -* Mon Aug 01 2005 - ke@suse.de +* Mon Aug 01 2005 ke@suse.de - Update the manuals. -* Thu Jul 28 2005 - ke@suse.de +* Thu Jul 28 2005 ke@suse.de - Fix desktop files and update the manuals. -* Mon Jul 25 2005 - ke@suse.de +* Mon Jul 25 2005 ke@suse.de - Initial package for testing; it contains the Start-Up and the Reference Manual. ++++++ APPARMOR-admin_en-graphics.tar.bz2 ++++++ ++++++ APPARMOR-admin_en.pdf ++++++ (binary differes) ++++++ APPARMOR-admin_en.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ENV-APPARMOR-admin new/ENV-APPARMOR-admin --- old/ENV-APPARMOR-admin 2007-06-04 14:08:18.000000000 +0200 +++ new/ENV-APPARMOR-admin 2008-04-09 11:26:12.000000000 +0200 @@ -1,5 +1,5 @@ # -*- shell-script -*- -# $Id: ENV-APPARMOR-admin 20938 2007-05-24 08:55:36Z taroth $ +# $Id: ENV-APPARMOR-admin 30038 2008-04-03 14:17:41Z fs $ . .env-profile @@ -7,5 +7,5 @@ export PROFARCH="x86;amd64;em64t" export MAIN=MAIN.opensuse.xml export ROOTID="book.apparmor.admin" -export DISTVER=10.3 +export DISTVER=11.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/.env-profile new/.env-profile --- old/.env-profile 2007-03-16 15:55:01.000000000 +0100 +++ new/.env-profile 2008-04-30 10:07:44.000000000 +0200 @@ -3,5 +3,6 @@ export DTDROOT=$(make dtdroot) echo "Using the DTDROOT ${DTDROOT}" . $DTDROOT/etc/system-profile - +mkdir -p xml profiled tmp images/{print,online} \ + images/src/{fig,png,svg,dia} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xml/apparmor_changehat.xml new/xml/apparmor_changehat.xml --- old/xml/apparmor_changehat.xml 2007-11-07 13:28:28.000000000 +0100 +++ new/xml/apparmor_changehat.xml 2008-05-02 16:19:29.000000000 +0200 @@ -69,7 +69,7 @@ <title>Apache ChangeHat</title> <para> - <phrase os="slpers;slprof">&naa; provides a + <phrase os="slprof">&naa; provides a <literal>mod_apparmor</literal> module (package <systemitem class="resource">apache2-mod_apparmor</systemitem>) for the Apache program.</phrase> This module makes the Apache Web server ChangeHat aware. Install it along with Apache. </para> @@ -100,17 +100,10 @@ <note> <title>Apache Configuration</title> - <para>If you install <phrase os="slprof"><systemitem class="resource">apache2-mod_apparmor</systemitem></phrase> without &naa;, make sure - that the Apache load module has a command in the configuration file that - loads the <literal>mod_apparmor</literal> module by adding - <literal>apparmor</literal> to the list of modules to load in - <filename>/etc/sysconfig/apache2</filename>:</para> - - <screen>APACHE_MODULES="apparmor"</screen> - - <para>Alternatively, add the following line to your Apache configuration - file: </para> - <screen>LoadModule mod_apparmor modules/mod_apparmor.so</screen> + <para>If you install <phrase os="slprof"><systemitem class="resource">apache2-mod_apparmor</systemitem></phrase>, make sure + the module gets loaded in Apache by executing the following command: + </para> +<screen>a2enmod apparmor</screen> </note> <sect2 id="bx5dh03"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xml/apparmor_profiles_man.xml new/xml/apparmor_profiles_man.xml --- old/xml/apparmor_profiles_man.xml 2007-11-07 13:28:30.000000000 +0100 +++ new/xml/apparmor_profiles_man.xml 2008-05-02 16:19:30.000000000 +0200 @@ -1222,7 +1222,7 @@ </step> </procedure> - <para os="sles;nld;slpers">To use the remote &aa; profile repository with + <para os="sles;nld;slprof">To use the remote &aa; profile repository with aa-genprof, proceed as follows:</para> <procedure os="sles;nld;slprof"> <step performance="required"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xml/apparmor_profiles_yast.xml new/xml/apparmor_profiles_yast.xml --- old/xml/apparmor_profiles_yast.xml 2007-11-07 13:28:31.000000000 +0100 +++ new/xml/apparmor_profiles_yast.xml 2008-05-02 16:19:31.000000000 +0200 @@ -31,6 +31,8 @@ for the text-based mode. </para> + + <figure> <title>&yast; Controls for &aa;</title> <mediaobject> @@ -878,7 +880,7 @@ <imagedata format="PNG" fileref="add_2_editentry.png" width="50%"/> </imageobject> <imageobject role="html"> - <imagedata fileref="add_2_editentry.png" width="40" format="PNG"/> + <imagedata fileref="add_2_editentry.png" width="40%" format="PNG"/> </imageobject> </mediaobject> </informalfigure> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xml/entity-decl.ent new/xml/entity-decl.ent --- old/xml/entity-decl.ent 2007-09-07 13:02:30.000000000 +0200 +++ new/xml/entity-decl.ent 2008-04-09 11:26:11.000000000 +0200 @@ -52,10 +52,11 @@ <!ENTITY digikam "digiKam"> <!ENTITY yelp "Yelp"> <!ENTITY khc "KDE help center"> +<!ENTITY umtsmon "UMTSmon"> + <!-- ============================================================= --> <!-- Books --> <!-- ============================================================= --> - <!ENTITY inst "<emphasis>Start-Up Guide</emphasis>"> <!ENTITY prep "<emphasis>Architecture-Specific Information</emphasis>"> <!ENTITY sleddepl "<emphasis>Deployment Guide</emphasis>"> @@ -73,6 +74,9 @@ <!ENTITY apparm_inst "<emphasis>Novell AppArmor Installation and QuickStart Guide</emphasis>"> <!ENTITY apparmqs "<emphasis>Novell AppArmor Quick Start</emphasis>"> <!ENTITY lfl "<emphasis>Lessons For Lizards</emphasis>"> +<!ENTITY stor_guide "<emphasis>Storage Administration Guide</emphasis>"> +<!ENTITY hbguide "<emphasis>Heartbeat Guide</emphasis>"> +<!ENTITY virtuser "<emphasis>Novell Virtualization Technology User Guide</emphasis>"> <!-- ============================================================= --> <!-- Platforms --> @@ -115,7 +119,7 @@ <!ENTITY naa "Novell AppArmor"> <!ENTITY naareg "Novell® AppArmor"> <!ENTITY slreg "SUSE® Linux"> -<!ENTITY version "10.3"> +<!ENTITY version "11.0"> <!ENTITY slepos "SUSE Linux Enterprise Point of Service"> <!ENTITY sleposreg "SUSE® Linux Enterprise Point of Service"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xml/MAIN.opensuse.xml new/xml/MAIN.opensuse.xml --- old/xml/MAIN.opensuse.xml 2007-11-07 13:28:27.000000000 +0100 +++ new/xml/MAIN.opensuse.xml 2008-05-02 16:19:28.000000000 +0200 @@ -20,42 +20,49 @@ - <?provo dirname="opensuse103/startup/"?> + + <?provo dirname="opensuse110/startup/"?> <book lang="en" id="book.opensuse.startup" role="print"> + + <bookinfo> - <title>&userguide;</title> + <title>&userguide;</title> <productname>&product;</productname> <productnumber>&version;</productnumber> <date> <?dbtimestamp format="B d, Y"?> </date> - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" os="slprof" href="copyright_opensuse.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="copyright_opensuse.xml"/> </bookinfo> + + - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intro_print.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intro_print.xml"/> + + + <part id="part.install"> <title>Installation and Setup</title> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inst_yast2.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yast2-hw.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yast2-sw.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yast2-sw.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="internet_access.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yast2-userman.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yast2-lang.xml"/> - </part> + </part> @@ -74,153 +81,65 @@ <part id="part.mobile"> <title>Mobility</title> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mobile.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nm.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="filetransfer.xml"/> - </part> + </part> + + <part id="part.trouble"> - <title>Help and Troubleshooting</title> - - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="help.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="troubleshooting.xml"/> - + <title>Help and Documentation</title> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="help.xml"/> + </part> + - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" os="slprof" href="legal.xml"/> - - - - <index/> - - </book> - - + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="legal.xml"/> + + <index/> + </book> - <?provo dirname="opensuse103/kdeqs/"?> - <book os="nld;slprof" lang="en" id="book.opensuse.kdequick"> - <bookinfo> - <title>&kdeqs;</title> - <productname>&product;</productname> - <productnumber>&version;</productnumber> - <date> - <?dbtimestamp format="B d, Y"?> - - </date> - - - <legalnotice> - <para/> - </legalnotice> - </bookinfo> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde_quick.xml"/> - </book> - - - - - - <?provo dirname="opensuse103/kdeuser/"?> - <book lang="en" id="book.opensuse.kdeuser"> - <bookinfo> - <title>&kdeuser;</title> - <productname>&product;</productname> - <productnumber>&version;</productnumber> - <date> - <?dbtimestamp format="B d, Y"?> - - </date> - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" os="slprof" href="copyright_opensuse.xml"/> - - </bookinfo> - - - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intro_kdeuser.xml"/> - - - - <part id="part.kde.desktop"> - <title>KDE Desktop</title> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-start.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde_customizing.xml"/> - </part> - - - - <part id="part.kde.office"> - <title>Office and Collaboration</title> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="suse-openoffice.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kontact.xml"/> - - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opensync.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kopete.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ekiga.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networking.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="crypto.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kerry.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="basket.xml"/> - - </part> - - - - <part id="part.kde.internet"> - <title>Internet</title> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="konqueror.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="suse-firefox.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kget.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="akregator.xml"/> - </part> - - - - <part id="part.kde.multimedia"> - <title>Multimedia</title> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="suse-gimp2.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="digicam.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sound_ref.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="k3b.xml"/> - - </part> - - - - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lin-win-desk.xml"/> + + + + + <?provo dirname="opensuse110/kdeqs/"?> + + <book lang="en" id="book.opensuse.kdequick"> + <bookinfo> + <title>&kdeqs;</title> + <productname>&product;</productname> + <productnumber>&version;</productnumber> + <date> + <?dbtimestamp format="B d, Y"?> + + </date> - - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" os="slprof" href="legal.xml"/> - - - - <index/> - + <legalnotice><para/></legalnotice> + </bookinfo> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde_quick.xml"/> </book> - <?provo dirname="opensuse103/gnomeqs/"?> + + + <?provo dirname="opensuse110/gnomeqs/"?> <book lang="en" id="book.opensuse.gnomequick"> <bookinfo> @@ -231,25 +150,27 @@ <?dbtimestamp format="B d, Y"?> </date> - - <legalnotice> - <para/> - </legalnotice> + + <legalnotice><para/></legalnotice> </bookinfo> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome_quick.xml"/> </book> + - <?provo dirname="opensuse103/reference/"?> + + <?provo dirname="opensuse110/reference/"?> <book lang="en" id="book.opensuse.reference" role="online"> + + <bookinfo> <title>&adguide;</title> <productname>&product;</productname> @@ -258,17 +179,20 @@ <?dbtimestamp format="B d, Y"?> </date> - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" os="slprof" href="copyright_opensuse.xml"/> - + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="copyright_opensuse.xml"/> </bookinfo> + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intro_online.xml"/> + + <part id="part.special_install"> <title>Advanced Deployment Scenarios</title> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="deployment_remote.xml"/> @@ -277,54 +201,53 @@ + + <part id="part.administration"> <title>Administration</title> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="online_update.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yast_ncurses.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="update.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rpm.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="printing.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x11.xml"/> - - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="virtualization_chapter.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="utilities.xml"/> </part> + + <part id="part.system"> <title>System</title> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64bit_issues.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootkonzept.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="suse-linux.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="filesystems.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fs_acl.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pam.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shell.xml"/> + </part> + + <part id="part.services"> <title>Services</title> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_allgemein.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_slp.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_dns.xml"/> - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_dhcp.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_xntp.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_nis.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_ldap.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ad_support.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_nfs.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_samba.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apache2.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yast2-ftp.xml"/> </part> @@ -332,72 +255,77 @@ + <part id="part.mobility"> <title>Mobility</title> - - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pcmcia-apm.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wireless.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wireless.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tablet.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thinkfinger.xml"/> </part> - - <part id="part.security"> - <title>Security</title> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_fire.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_ssh.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yast_ca.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_kerb.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_kerbadmin.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cryptofs.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apparmor_install.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_secure.xml"/> - </part> - - - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network_scheme.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" os="slprof" href="legal.xml"/> + + <part id="part.security"> + <title>Security</title> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_fire.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_ssh.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yast_ca.xml"/> + + + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cryptofs.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apparmor_install.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="net_secure.xml"/> + </part> + + + + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network_scheme.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="legal.xml"/> + - <index/> + + <index/> </book> + - <?provo dirname="opensuse103/aaqs/"?> + + <?provo dirname="opensuse110/aaqs/"?> - <book lang="en" id="book.opensuse.aaquick"> - <bookinfo> - <title>&aa; Quick Start</title> - <productname>&product;</productname> - <productnumber>2.1</productnumber> - <date> - <?dbtimestamp format="B d, Y"?> - - </date> - - - <legalnotice> - <para/> - </legalnotice> - </bookinfo> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apparmor-refcard-main.xml"/> - </book> + <book lang="en" id="book.opensuse.aaquick"> + <bookinfo> + <title>&aa; Quick Start</title> + <productname>&product;</productname> + <productnumber>2.1</productnumber> + <date> + <?dbtimestamp format="B d, Y"?> + + </date> + + <legalnotice><para/></legalnotice> + </bookinfo> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apparmor-refcard-main.xml"/> + </book> + - <?provo dirname="opensuse103/aaadmin/"?> + + <?provo dirname="opensuse110/aaadmin/"?> <book lang="en" id="book.apparmor.admin"> <bookinfo> @@ -406,18 +334,20 @@ <productnumber>2.1</productnumber> <date><?dbtimestamp format="B d, Y"?> </date> - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" os="slprof" href="copyright_opensuse.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="copyright_opensuse.xml"/> </bookinfo> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apparmor_intro.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apparmor_intro.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apparmor_whatimmunize.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apparmor_profiles.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apparmor_profiles_yast.xml"/> @@ -425,17 +355,20 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apparmor_changehat.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apparmor_managing.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apparmor_support.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apparmor_background.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" os="slprof" href="legal.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="legal.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apparmor_glossary.xml"/> </book> - + </set> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xml/source_code.xml new/xml/source_code.xml --- old/xml/source_code.xml 2007-11-07 13:29:11.000000000 +0100 +++ new/xml/source_code.xml 2008-05-02 16:19:59.000000000 +0200 @@ -10,12 +10,14 @@ --> <sect1 xml:base="source_code.xml"> <title>Source Code</title> - <para>The source code of &product; is publicly available. To download the + <para> + The source code of &product; is publicly available. To download the source code, proceed as outlined under <ulink url="http://www.novell.com/products/suselinux/source_code.html"/>. If requested we send you the source code on a DVD. We need to charge a $15 or €15 fee for creation, handling and postage. To request a DVD of the source code, send an e-mail to <ulink url="mailto:sourcedvd@suse.de">sourcedvd@suse.de</ulink> or mail the request - to:</para> + to: + </para> <screen>SUSE Linux Products GmbH Product Management &product; Maxfeldstr. 5 ++++++ opensuse-gnomequick_en-graphics.tar.bz2 ++++++ Files old/images/src/png/banshee_buttons.png and new/images/src/png/banshee_buttons.png differ Files old/images/src/png/banshee_play.png and new/images/src/png/banshee_play.png differ Files old/images/src/png/banshee_volume.png and new/images/src/png/banshee_volume.png differ Files old/images/src/png/xgl_cube1.png and new/images/src/png/xgl_cube1.png differ Files old/images/src/png/xgl_skydome.png and new/images/src/png/xgl_skydome.png differ ++++++ opensuse-gnomequick_en.pdf ++++++ (binary differes) ++++++ opensuse-gnomequick_en.tar.bz2 ++++++ ++++ 2052 lines of diff (skipped) ++++++ opensuse-html_en-desktop.tar.bz2 ++++++ ++++ 2599 lines of diff (skipped) ++++++ opensuse-html_en-html.tar.bz2 ++++++ opensuse-manual_en/opensuse-html_en-html.tar.bz2 /mounts/work_src_done/NOARCH/opensuse-manual_en/opensuse-html_en-html.tar.bz2 differ: byte 11, line 1 ++++++ opensuse-kdequick_en-graphics.tar.bz2 ++++++ Files old/images/src/png/dolphin_main.png and new/images/src/png/dolphin_main.png differ Files old/images/src/png/firefox_downlman.png and new/images/src/png/firefox_downlman.png differ Files old/images/src/png/firefox_main.png and new/images/src/png/firefox_main.png differ Files old/images/src/png/kde_addicon_desk.png and new/images/src/png/kde_addicon_desk.png differ Files old/images/src/png/kde_addicon_panel.png and new/images/src/png/kde_addicon_panel.png differ Files old/images/src/png/kde_add_widget.png and new/images/src/png/kde_add_widget.png differ Files old/images/src/png/kde_conf_deskback.png and new/images/src/png/kde_conf_deskback.png differ Files old/images/src/png/kde_desktop_effects.png and new/images/src/png/kde_desktop_effects.png differ Files old/images/src/png/kde_desktop_menus.png and new/images/src/png/kde_desktop_menus.png differ Files old/images/src/png/kde_dolphin_splitview.png and new/images/src/png/kde_dolphin_splitview.png differ Files old/images/src/png/kde_firefox_downlman.png and new/images/src/png/kde_firefox_downlman.png differ Files old/images/src/png/kde_kcontrol_main.png and new/images/src/png/kde_kcontrol_main.png differ Files old/images/src/png/kde_kcontrol.png and new/images/src/png/kde_kcontrol.png differ Files old/images/src/png/kde_konqui_web.png and new/images/src/png/kde_konqui_web.png differ Files old/images/src/png/kde_krunner.png and new/images/src/png/kde_krunner.png differ Files old/images/src/png/kde_main_menu.png and new/images/src/png/kde_main_menu.png differ Files old/images/src/png/kde_mm_searchappl.png and new/images/src/png/kde_mm_searchappl.png differ Files old/images/src/png/kde_widget_frame.png and new/images/src/png/kde_widget_frame.png differ Files old/images/src/png/konqui_main.png and new/images/src/png/konqui_main.png differ Files old/images/src/png/konqui_web.png and new/images/src/png/konqui_web.png differ Files old/images/src/png/kontact_kmail.png and new/images/src/png/kontact_kmail.png differ Files old/images/src/png/kontact_main.png and new/images/src/png/kontact_main.png differ Files old/images/src/png/kopete_main.png and new/images/src/png/kopete_main.png differ Files old/images/src/png/kopete_wizard.png and new/images/src/png/kopete_wizard.png differ Files old/images/src/png/okular_main.png and new/images/src/png/okular_main.png differ ++++++ opensuse-kdequick_en.pdf ++++++ (binary differes) ++++++ opensuse-kdequick_en.tar.bz2 ++++++ ++++ 2137 lines of diff (skipped) ++++++ opensuse-reference_en-graphics.tar.bz2 ++++++ ++++ 2152 lines of diff (skipped) ++++++ opensuse-reference_en.pdf ++++++ (binary differes) ++++++ opensuse-reference_en.tar.bz2 ++++++ ++++ 23449 lines of diff (skipped) ++++++ opensuse-startup_en-graphics.tar.bz2 ++++++ ++++ 2182 lines of diff (skipped) ++++++ opensuse-startup_en.pdf ++++++ (binary differes) ++++++ opensuse-startup_en.tar.bz2 ++++++ ++++ 8675 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org