Author: paul
Date: 2006-03-24 20:03:17 +0100 (Fri, 24 Mar 2006)
New Revision: 1664
Log:
r4100@kite-hub: paul | 2006-03-24 12:22:10 -0600
timezone -> time zone
Modified:
trunk/
trunk/refman-4.1/connector-j.xml
trunk/refman-5.0/connector-j.xml
trunk/refman-5.1/connector-j.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8925
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4099
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8925
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4100
Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml 2006-03-24 19:03:03 UTC (rev 1663)
+++ trunk/refman-4.1/connector-j.xml 2006-03-24 19:03:17 UTC (rev 1664)
@@ -1232,7 +1232,7 @@
<property>noDatetimeStringSync=true</property> ' (the
default value is 'false') so that you can get retrieve the
unaltered all-zero value as a String. It should be noted
- that this also precludes using any timezone conversions,
+ that this also precludes using any time zone conversions,
therefore the driver will not allow you to enable
<property>noDatetimeStringSync</property> and
<property>useTimezone</property> at the same time.
@@ -2340,7 +2340,7 @@
</row>
<row>
<entry>noTimezoneConversionForTimeType</entry>
- <entry>Don't convert TIME values using the server timezone if
+ <entry>Don't convert TIME values using the server time zone if
'useTimezone'='true'</entry>
<entry>No</entry>
<entry>false</entry>
@@ -2430,8 +2430,8 @@
</row>
<row>
<entry>serverTimezone</entry>
- <entry>Override detection/mapping of timezone. Used when timezone from server
- doesn't map to Java timezone</entry>
+ <entry>Override detection/mapping of time zone. Used when time zone from server
+ doesn't map to Java time zone</entry>
<entry>No</entry>
<entry></entry>
<entry>3.0.2</entry>
@@ -2480,7 +2480,7 @@
</row>
<row>
<entry>useGmtMillisForDatetimes</entry>
- <entry>Convert between session timezone and GMT before creating Date and
+ <entry>Convert between session time zone and GMT before creating Date and
Timestamp instances (value of "false" is legacy
behavior, "true" leads to more JDBC-compliant behavior.</entry>
<entry>No</entry>
@@ -2507,8 +2507,8 @@
<row>
<entry>useJDBCCompliantTimezoneShift</entry>
<entry>Should the driver use JDBC-compliant rules when converting
- TIME/TIMESTAMP/DATETIME values' timezone information for
- those JDBC arguments which take a java.util.Calendar
+ TIME/TIMESTAMP/DATETIME values' time zone information
+ for those JDBC arguments which take a java.util.Calendar
argument? (Notice that this option is exclusive of the
"useTimezone=true" configuration option.)</entry>
<entry>No</entry>
@@ -2558,8 +2558,8 @@
</row>
<row>
<entry>useTimezone</entry>
- <entry>Convert time/date types between client and server timezones (true/false,
- defaults to 'false')?</entry>
+ <entry>Convert time/date types between client and server time zones
+ (true/false, defaults to 'false')?</entry>
<entry>No</entry>
<entry>false</entry>
<entry>3.0.2</entry>
Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml 2006-03-24 19:03:03 UTC (rev 1663)
+++ trunk/refman-5.0/connector-j.xml 2006-03-24 19:03:17 UTC (rev 1664)
@@ -1232,7 +1232,7 @@
<property>noDatetimeStringSync=true</property> ' (the
default value is 'false') so that you can get retrieve the
unaltered all-zero value as a String. It should be noted
- that this also precludes using any timezone conversions,
+ that this also precludes using any time zone conversions,
therefore the driver will not allow you to enable
<property>noDatetimeStringSync</property> and
<property>useTimezone</property> at the same time.
@@ -2340,7 +2340,7 @@
</row>
<row>
<entry>noTimezoneConversionForTimeType</entry>
- <entry>Don't convert TIME values using the server timezone if
+ <entry>Don't convert TIME values using the server time zone if
'useTimezone'='true'</entry>
<entry>No</entry>
<entry>false</entry>
@@ -2430,8 +2430,8 @@
</row>
<row>
<entry>serverTimezone</entry>
- <entry>Override detection/mapping of timezone. Used when timezone from server
- doesn't map to Java timezone</entry>
+ <entry>Override detection/mapping of time zone. Used when time zone from server
+ doesn't map to Java time zone</entry>
<entry>No</entry>
<entry></entry>
<entry>3.0.2</entry>
@@ -2480,7 +2480,7 @@
</row>
<row>
<entry>useGmtMillisForDatetimes</entry>
- <entry>Convert between session timezone and GMT before creating Date and
+ <entry>Convert between session time zone and GMT before creating Date and
Timestamp instances (value of "false" is legacy
behavior, "true" leads to more JDBC-compliant behavior.</entry>
<entry>No</entry>
@@ -2507,8 +2507,8 @@
<row>
<entry>useJDBCCompliantTimezoneShift</entry>
<entry>Should the driver use JDBC-compliant rules when converting
- TIME/TIMESTAMP/DATETIME values' timezone information for
- those JDBC arguments which take a java.util.Calendar
+ TIME/TIMESTAMP/DATETIME values' time zone information
+ for those JDBC arguments which take a java.util.Calendar
argument? (Notice that this option is exclusive of the
"useTimezone=true" configuration option.)</entry>
<entry>No</entry>
@@ -2558,8 +2558,8 @@
</row>
<row>
<entry>useTimezone</entry>
- <entry>Convert time/date types between client and server timezones (true/false,
- defaults to 'false')?</entry>
+ <entry>Convert time/date types between client and server time zones
+ (true/false, defaults to 'false')?</entry>
<entry>No</entry>
<entry>false</entry>
<entry>3.0.2</entry>
Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml 2006-03-24 19:03:03 UTC (rev 1663)
+++ trunk/refman-5.1/connector-j.xml 2006-03-24 19:03:17 UTC (rev 1664)
@@ -1235,7 +1235,7 @@
<property>noDatetimeStringSync=true</property> ' (the
default value is 'false') so that you can get retrieve the
unaltered all-zero value as a String. It should be noted
- that this also precludes using any timezone conversions,
+ that this also precludes using any time zone conversions,
therefore the driver will not allow you to enable
<property>noDatetimeStringSync</property> and
<property>useTimezone</property> at the same time.
@@ -2343,7 +2343,7 @@
</row>
<row>
<entry>noTimezoneConversionForTimeType</entry>
- <entry>Don't convert TIME values using the server timezone if
+ <entry>Don't convert TIME values using the server time zone if
'useTimezone'='true'</entry>
<entry>No</entry>
<entry>false</entry>
@@ -2433,8 +2433,8 @@
</row>
<row>
<entry>serverTimezone</entry>
- <entry>Override detection/mapping of timezone. Used when timezone from server
- doesn't map to Java timezone</entry>
+ <entry>Override detection/mapping of time zone. Used when time zone from server
+ doesn't map to Java time zone</entry>
<entry>No</entry>
<entry></entry>
<entry>3.0.2</entry>
@@ -2483,7 +2483,7 @@
</row>
<row>
<entry>useGmtMillisForDatetimes</entry>
- <entry>Convert between session timezone and GMT before creating Date and
+ <entry>Convert between session time zone and GMT before creating Date and
Timestamp instances (value of "false" is legacy
behavior, "true" leads to more JDBC-compliant behavior.</entry>
<entry>No</entry>
@@ -2510,8 +2510,8 @@
<row>
<entry>useJDBCCompliantTimezoneShift</entry>
<entry>Should the driver use JDBC-compliant rules when converting
- TIME/TIMESTAMP/DATETIME values' timezone information for
- those JDBC arguments which take a java.util.Calendar
+ TIME/TIMESTAMP/DATETIME values' time zone information
+ for those JDBC arguments which take a java.util.Calendar
argument? (Notice that this option is exclusive of the
"useTimezone=true" configuration option.)</entry>
<entry>No</entry>
@@ -2561,8 +2561,8 @@
</row>
<row>
<entry>useTimezone</entry>
- <entry>Convert time/date types between client and server timezones (true/false,
- defaults to 'false')?</entry>
+ <entry>Convert time/date types between client and server time zones
+ (true/false, defaults to 'false')?</entry>
<entry>No</entry>
<entry>false</entry>
<entry>3.0.2</entry>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1664 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 24 Mar |
