documentation-guide Makefile, 1.5, 1.6 documentation-guide-en.xml, 1.18, 1.19

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/docs/documentation-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18070

Modified Files:
	Makefile documentation-guide-en.xml 
Log Message:
Fixed entity file references and Makefile


Index: Makefile
===================================================================
RCS file: /cvs/docs/documentation-guide/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile	24 Feb 2004 19:14:14 -0000	1.5
+++ Makefile	28 Jun 2005 21:46:45 -0000	1.6
@@ -7,18 +7,20 @@
 # Copyright 2003 Tammy Fox, Red Hat, Inc.
 ###############################################################################
 
-XSLPDF         = ../xsl/main-pdf.xsl
-XSLHTML        = ../xsl/main-html.xsl
+XSLPDF         = ../docs-common/xsl/main-pdf.xsl
+XSLHTML        = ../docs-common/xsl/main-html.xsl
 LANG	       = en
 DOCNAME        = documentation-guide-$(LANG)
 XMLFILE        = $(DOCNAME).xml
 
 ######################################################
+include ../docs-common/Makefile.common
+######################################################
 html: 
 	@xmlto html -x $(XSLHTML) -o $(DOCNAME) $(XMLFILE)
 	@mkdir -p $(DOCNAME)/stylesheet-images
-	@cp ../stylesheet-images/*.png $(DOCNAME)/stylesheet-images
-	@cp ../css/fedora.css $(DOCNAME)
+	@cp ../docs-common/stylesheet-images/*.png $(DOCNAME)/stylesheet-images
+	@cp ../docs-common/css/fedora.css $(DOCNAME)
 
 
 pdf:
@@ -26,4 +28,4 @@
 ######################################################
 
 clean: 
-	@rm -rfv *.html *.pdf *.tex $(DOCNAME)
+	@rm -rfv *.html *.pdf *.tex $(DOCNAME) $(DOCNAME).tar.gz


Index: documentation-guide-en.xml
===================================================================
RCS file: /cvs/docs/documentation-guide/documentation-guide-en.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- documentation-guide-en.xml	3 May 2005 18:52:42 -0000	1.18
+++ documentation-guide-en.xml	28 Jun 2005 21:46:45 -0000	1.19
@@ -4,14 +4,14 @@
  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
 <!-- *************** Bring in Fedora entities *************** -->
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../common/fedora-entities-en.xml">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../docs-common/common/fedora-entities-en.ent">
 %FEDORA-ENTITIES-EN;
 
 <!ENTITY VERSION "0.2.6"> <!-- version for this document -->
 
 <!ENTITY BOOKID "documentation-guide-&VERSION; (2005-05-03)"> <!-- change date here and VERSION entity everytime a change is made-->
 
-<!ENTITY LEGALNOTICE SYSTEM "../common/legalnotice-en.xml">
+<!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml">
 
 <!ENTITY INTRODUCTION SYSTEM "docs-intro-en.xml">
 
@@ -23,7 +23,7 @@
 <!ENTITY TAGS SYSTEM "docs-xml-tags-en.xml">
 <!ENTITY TUTORIAL SYSTEM "docs-tutorial-en.xml">
 <!ENTITY CONVERTING SYSTEM "docs-converting-en.xml">
-<!ENTITY CVS SYSTEM "../common/cvs-en.xml">
+<!ENTITY CVS SYSTEM "../docs-common/common/cvs-en.xml">
 <!ENTITY ACKNOWLEDGMENTS SYSTEM "acknowledgments-en.xml">
 <!ENTITY STYLE SYSTEM "docs-style-en.xml">