Author: paul
Date: 2007-10-31 21:24:05 +0100 (Wed, 31 Oct 2007)
New Revision: 8446
Log:
r32081@polar: paul | 2007-10-31 15:19:28 -0500
Rename file.
Added:
trunk/refman-6.0/reserved-new-6.0.xml
Removed:
trunk/refman-6.0/reserved-new-5.2.xml
Modified:
trunk/refman-6.0/Makefile.depends
trunk/refman-6.0/language-structure.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:32060
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:26370
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:21581
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:32081
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:26370
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:21581
Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends 2007-10-31 20:23:51 UTC (rev 8445)
+++ trunk/refman-6.0/Makefile.depends 2007-10-31 20:24:05 UTC (rev 8446)
Changed blocks: 3, Lines Added: 14, Lines Deleted: 14; 2366 bytes
@@ -1045,7 +1045,7 @@
../common/phrases.ent \
../refman-common/urls.ent \
all-entities.ent \
- reserved-new-5.2.xml \
+ reserved-new-6.0.xml \
reservedwords.xml \
versions.ent
language_structure_IMAGES =
@@ -1262,7 +1262,7 @@
replication-notes.xml \
replication-solutions.xml \
replication.xml \
- reserved-new-5.2.xml \
+ reserved-new-6.0.xml \
reservedwords.xml \
restrictions.xml \
se-archive.xml \
@@ -2206,18 +2206,18 @@
replication-manprepped.xml: $(replication_SOURCES) $(replication_IDMAPS)
replication-remprepped.xml: $(replication_SOURCES) $(replication_IDMAPS)
-reserved_new_5_2_INCLUDES =
-reserved_new_5_2_IMAGES =
-reserved_new_5_2_SOURCES = reserved-new-5.2.xml $(reserved_new_5_2_INCLUDES)
-reserved_new_5_2_IDMAPS =
-reserved-new-5.2.validpure: $(reserved_new_5_2_SOURCES)
-reserved-new-5.2.titles: $(reserved_new_5_2_SOURCES)
-reserved-new-5.2.useless: $(reserved_new_5_2_SOURCES)
-reserved-new-5.2.valid: $(reserved_new_5_2_SOURCES) $(reserved_new_5_2_IDMAPS)
-reserved-new-5.2.validwarn: $(reserved_new_5_2_SOURCES) $(reserved_new_5_2_IDMAPS)
-reserved-new-5.2-prepped.xml: $(reserved_new_5_2_SOURCES) $(reserved_new_5_2_IDMAPS)
-reserved-new-5.2-manprepped.xml: $(reserved_new_5_2_SOURCES) $(reserved_new_5_2_IDMAPS)
-reserved-new-5.2-remprepped.xml: $(reserved_new_5_2_SOURCES) $(reserved_new_5_2_IDMAPS)
+reserved_new_6_0_INCLUDES =
+reserved_new_6_0_IMAGES =
+reserved_new_6_0_SOURCES = reserved-new-6.0.xml $(reserved_new_6_0_INCLUDES)
+reserved_new_6_0_IDMAPS =
+reserved-new-6.0.validpure: $(reserved_new_6_0_SOURCES)
+reserved-new-6.0.titles: $(reserved_new_6_0_SOURCES)
+reserved-new-6.0.useless: $(reserved_new_6_0_SOURCES)
+reserved-new-6.0.valid: $(reserved_new_6_0_SOURCES) $(reserved_new_6_0_IDMAPS)
+reserved-new-6.0.validwarn: $(reserved_new_6_0_SOURCES) $(reserved_new_6_0_IDMAPS)
+reserved-new-6.0-prepped.xml: $(reserved_new_6_0_SOURCES) $(reserved_new_6_0_IDMAPS)
+reserved-new-6.0-manprepped.xml: $(reserved_new_6_0_SOURCES) $(reserved_new_6_0_IDMAPS)
+reserved-new-6.0-remprepped.xml: $(reserved_new_6_0_SOURCES) $(reserved_new_6_0_IDMAPS)
reservedwords_INCLUDES =
reservedwords_IMAGES =
Modified: trunk/refman-6.0/language-structure.xml
===================================================================
--- trunk/refman-6.0/language-structure.xml 2007-10-31 20:23:51 UTC (rev 8445)
+++ trunk/refman-6.0/language-structure.xml 2007-10-31 20:24:05 UTC (rev 8446)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 642 bytes
@@ -2154,7 +2154,7 @@
<xi:include href="reservedwords.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="reserved-new-5.2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="reserved-new-6.0.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<para>
MySQL allows some keywords to be used as unquoted identifiers
Added: trunk/refman-6.0/reserved-new-6.0.xml
===================================================================
--- trunk/refman-6.0/reserved-new-6.0.xml (rev 0)
+++ trunk/refman-6.0/reserved-new-6.0.xml 2007-10-31 20:24:05 UTC (rev 8446)
Changed blocks: 1, Lines Added: 10, Lines Deleted: 0; 713 bytes
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<!-- START_OF_NEW_RESERVED_WORDS_INFO -->
+<!-- DO NOT EDIT THIS FILE. It is generated automatically. -->
+<!-- To regenerate, use ../tools/make-reserved-words-new.rb -->
+<para>
+<!-- There are no new reserved words in this version -->
+</para>
+<!-- END_OF_NEW_RESERVED_WORDS_INFO -->
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r8446 - in trunk: . refman-6.0 | paul | 31 Oct |
