Author: paul
Date: 2006-04-27 05:46:44 +0200 (Thu, 27 Apr 2006)
New Revision: 1949
Log:
r9795@frost: paul | 2006-04-26 22:00:47 -0500
Restructure copyright info.
Added:
trunk/internals/copyright.xml
Modified:
trunk/
trunk/internals/Makefile
trunk/internals/legalnotice.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:6954
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9794
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4590
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:6954
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9795
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4590
Modified: trunk/internals/Makefile
===================================================================
--- trunk/internals/Makefile 2006-04-27 03:46:22 UTC (rev 1948)
+++ trunk/internals/Makefile 2006-04-27 03:46:44 UTC (rev 1949)
@@ -43,7 +43,7 @@
INTERNALS_SRCS_EXTRA = fixedchars.ent
-INTERNALS_SRCS = $(INTERNALS_SRCS_EXTRA) internals.xml legalnotice.xml
+INTERNALS_SRCS = $(INTERNALS_SRCS_EXTRA) internals.xml legalnotice.xml copyright.xml
internals-prepped.xml: $(INTERNALS_SRCS)
Added: trunk/internals/copyright.xml
===================================================================
--- trunk/internals/copyright.xml (rev 0)
+++ trunk/internals/copyright.xml 2006-04-27 03:46:44 UTC (rev 1949)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<para>
+ Copyright 1998-2006 MySQL AB
+</para>
Modified: trunk/internals/legalnotice.xml
===================================================================
--- trunk/internals/legalnotice.xml 2006-04-27 03:46:22 UTC (rev 1948)
+++ trunk/internals/legalnotice.xml 2006-04-27 03:46:44 UTC (rev 1949)
@@ -3,9 +3,11 @@
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
<legalnotice>
+ <xi:include href="copyright.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
<para>
- Copyright 1998-2006 MySQL AB. This document is NOT distributed under
- a GPL style license. Its use is subject to the following terms:
+ This document is NOT distributed under a GPL style license. Its use
+ is subject to the following terms:
</para>
<itemizedlist>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1949 - in trunk: . internals | paul | 27 Apr |
