Author: nixternal
Date: Fri Jul 20 06:53:46 2007
New Revision: 4166
Added:
trunk/kubuntu/index.xml
- copied, changed from r4165, /trunk/kubuntu/kubuntu-index.xml
Removed:
trunk/kubuntu/kubuntu-index.xml
Modified:
trunk/kubuntu/Makefile
trunk/kubuntu/network/C/network.xml
Log:
Kubuntu builds again
Modified: trunk/kubuntu/Makefile
==============================================================================
--- trunk/kubuntu/Makefile (original)
+++ trunk/kubuntu/Makefile Fri Jul 20 06:53:46 2007
@@ -85,10 +85,11 @@
for doc in about-kubuntu add-applications basic-concepts \
config-desktop files-and-docs games getting-help hardware \
internet keeping-safe musicvideophotos network newtokubuntu \
- office printing programming sysdocs-index system-settings; do \
+ office printing programming system-settings; do \
xsltproc --xinclude -o $(KBASE)$$doc/C/index.html $(KUBUNTUXSL) \
$$doc/C/$$doc.xml; done
+ xsltproc --xinclude -o $(KBASE)idnex.html $(KUBUNTUXSL) index.xml
# Cleanup
clean:
Copied: trunk/kubuntu/index.xml (from r4165, /trunk/kubuntu/kubuntu-index.xml)
==============================================================================
--- /trunk/kubuntu/kubuntu-index.xml (original)
+++ trunk/kubuntu/index.xml Fri Jul 20 06:53:46 2007
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"; [
-<!ENTITY % globalent SYSTEM "../../../libs/global.ent">
+<!ENTITY % globalent SYSTEM "../libs/global.ent">
%globalent;
-<!ENTITY % cdo-C SYSTEM "../../../libs/cdo-C.ent">
+<!ENTITY % cdo-C SYSTEM "../libs/cdo-C.ent">
%cdo-C;
-<!ENTITY % kde-menus-C SYSTEM "../../libs/kde-menus-C.ent">
+<!ENTITY % kde-menus-C SYSTEM "libs/kde-menus-C.ent">
%kde-menus-C;
-<!ENTITY % kde SYSTEM "../../libs/kde.ent">
+<!ENTITY % kde SYSTEM "libs/kde.ent">
%kde;
<!ENTITY % kde-general SYSTEM
"/usr/share/apps/ksgmltools2/customization/obsolete/general.entities">
%kde-general;
-<!ENTITY % xinclude SYSTEM "../../../libs/xinclude.mod">
+<!ENTITY % xinclude SYSTEM "../libs/xinclude.mod">
%xinclude;
<!ENTITY language "en">
]>
@@ -153,4 +153,4 @@
</itemizedlist>
</para>
-</article>
\ No newline at end of file
+</article>
Modified: trunk/kubuntu/network/C/network.xml
==============================================================================
--- trunk/kubuntu/network/C/network.xml (original)
+++ trunk/kubuntu/network/C/network.xml Fri Jul 20 06:53:46 2007
@@ -35,17 +35,12 @@
<title>Introduction to networking in Kubuntu</title>
<para>
-<<<<<<< .mine
-Networking in Kubuntu has gotten much easier for everyone. The days of
configuring your settings via the command line are almost gone completely. A
majority of
-=======
Networking in Kubuntu has gotten much easier for everyone. The days of
configuring your settings via the command line are almost gone completely. A
-majority of
->>>>>>> .r3999
-users will never have to use the command line when configuring their network
-settings in order to share files between PCs or to gain access to the Internet.
-There are those select few who might be utilizing hardware that is not Linux
-certified as of yet. For those, there might be the possibility of making
+majority of users will never have to use the command line when configuring
their
+network settings in order to share files between PCs or to gain access to the
+Internet. There are those select few who might be utilizing hardware that is
not
+Linux certified as of yet. For those, there might be the possibility of making
changes via the command line.
</para>
--
ubuntu-doc-commits mailing list
ubuntu-doc-commits@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc-commits
