Merge lp:~drizzle-developers/drizzle/major-docs-cleanup into lp:drizzle

[Henrik Ingo]

Removing most of what Marisa wrote for the manual, as discussed on Drizzle Day. Marking the missing parts with 'TODO'. Someone else than me needs to rewrite the missing parts. See commit message for details.

Unfortunately we need to push this to trunk (and the published manual) now. Hopefully someone can get some basic content back in soon.

This also needs to be backported to 7.1 and 7.0.

[Brian Aker (brianaker)]

Will it merge with 7.1?

[Brian Aker (brianaker)]

And it does :)

=== modified file 'docs/alter_schema.rst'
--- docs/alter_schema.rst	2011-11-06 00:00:03 +0000
+++ docs/alter_schema.rst	2012-06-19 08:53:18 +0000
@@ -1,12 +1,7 @@
 ALTER SCHEMA
 ============
 
-ALTER SCHEMA changes the definition of a schema.
-
-You must own the schema to use ALTER SCHEMA. To rename a schema you
-must also have the CREATE privilege for the database. To alter the
-owner, you must also be a direct or indirect member of the new owning
-role, and you must have the CREATE privilege for the database:
+'TODO'
 
 .. code-block:: mysql
 
 
=== modified file 'docs/alter_table.rst'
--- docs/alter_table.rst	2011-02-13 20:11:55 +0000
+++ docs/alter_table.rst	2012-06-19 08:53:18 +0000
@@ -1,16 +1,4 @@
 ALTER TABLE
 ===========
 
-An ALTER statement modifies the definition (structure) of a table inside Drizzle. 
-The types of objects that can be altered depends on which RDBMS is being used. 
-
-The ALTER TABLE statement is used to change a table definition by: 
-
-1) Adding, dropping, modifying table columns 
-2) Adding and dropping constraints 
-3) Enabling and Disabling constraints 
-4) Rename a table
-
-.. todo::
-
-   add something about current implementation: i.e. write blocking copying alter table.
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/commit.rst'
--- docs/commit.rst	2011-03-08 03:47:42 +0000
+++ docs/commit.rst	2012-06-19 08:53:18 +0000
@@ -3,45 +3,4 @@
 
 COMMIT [WORK] [AND [NO] CHAIN] [[NO] RELEASE]
 
-Calling COMMIT will cause the current transaction to save itself.
-
-A COMMIT statement ends a transaction within Drizzle and makes all
-changes visible to other users. The order of events is typically to
-issue a START TRANSACTION statement, execute one or more SQL
-statements, and then issue a COMMIT statement. Alternatively, a
-ROLLBACK statement can be issued, which undoes all the work performed
-since START TRANSACTION was issued. A COMMIT statement will also
-release any existing savepoints that may be in use.
-
-For example, DML statements do not implicitly commit the current
-transaction. If a user's DML statements have been used to update some
-data objects, and the updates need to be permanently recorded in the
-database, you can use the COMMIT command.
-
-An example:
-
-.. code-block:: mysql
-
-	START TRANSACTION;
-
-	INSERT INTO popular_sites (url, id)
-   		VALUES ('flickr.com', 07);
-
-	INSERT INTO popular_sites (url, id)
-   		VALUES ('twitter.com', 10);
-
-	SELECT * FROM popular_sites;
-
-+-----+---------------+-------+---------------------+
-| id  | url           | notes | accessed            |
-+=====+===============+=======+=====================+
-| 07  | flickr.com    | NULL  | 2011-02-03 08:33:31 |
-+-----+---------------+-------+---------------------+
-| 10  | twitter.com   | NULL  | 2011-02-03 08:39:16 |
-+-----+---------------+-------+---------------------+
-
-Then to save the information just inserted, simply issue the COMMIT command:
-
-.. code-block:: mysql
-
-	COMMIT;
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/create_index.rst'
--- docs/create_index.rst	2011-03-08 03:47:42 +0000
+++ docs/create_index.rst	2012-06-19 08:53:18 +0000
@@ -5,15 +5,4 @@
 
    CREATE [UNIQUE] INDEX index_name [USING {BTREE | HASH}] ON table_name (column_name [length] [ASC | DESC], ...);
 
-An example:
-
-.. code-block:: mysql
-
-	CREATE INDEX table_1_index ON table_1 (a,b);
-
-This would create an index on table_t named table_1_index that converged
-columns a and b.
-
-Fast index creation (where a storage engine can create or drop indexes
-without copying and rebuilding the contents of the entire table) is
-not implemented yet for Drizzle, but it is slated for the future.
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/create_schema.rst'
--- docs/create_schema.rst	2011-07-13 02:17:59 +0000
+++ docs/create_schema.rst	2012-06-19 08:53:18 +0000
@@ -1,7 +1,8 @@
 CREATE SCHEMA
 ==============
 
-CREATE SCHEMA enters a new schema into the current database. The schema name used must be distinct from the name of any existing schema.
+TODO
+
 
 .. code-block:: mysql
 
@@ -11,7 +12,7 @@
 engine_options
 --------------
 
-You can specify the storage engine to use for creating the schema. Please note, there is currently only one engine.
+TODO
 
 ::
 
@@ -20,7 +21,7 @@
 collate
 -------
 
-There are default settings for character sets and collations at four levels: server, database, table, and column. The COLLATE clause specifies the default database collation.
+TODO
 
 ::
 
 
=== modified file 'docs/create_table.rst'
--- docs/create_table.rst	2011-07-13 02:17:59 +0000
+++ docs/create_table.rst	2012-06-19 08:53:18 +0000
@@ -1,8 +1,7 @@
 CREATE TABLE
 ============
 
-A CREATE statement in SQL creates an object inside of Drizzle. One of
-the most common CREATE commands is the CREATE TABLE command.
+'TODO'
 
 .. code-block:: mysql
 
 
=== modified file 'docs/ddl.rst'
--- docs/ddl.rst	2010-12-04 02:38:29 +0000
+++ docs/ddl.rst	2012-06-19 08:53:18 +0000
@@ -1,7 +1,7 @@
-Data Description Language
+Data Definition Language
 =========================
 
-The Data Definition Language (DDL) is used to define data and their relationships to other data. It is primarily used to create and destroy databases and database objects.
+'TODO'
 
 .. toctree::
    :maxdepth: 2
 
=== modified file 'docs/delete.rst'
--- docs/delete.rst	2011-02-23 13:08:09 +0000
+++ docs/delete.rst	2012-06-19 08:53:18 +0000
@@ -1,10 +1,4 @@
 Deleting Data
 =============
 
-In Drizzle you can make use of DELETE in order to delete a single record (or multiple records) of data from a table.
-
-A typical query might be:
-
-.. code-block:: mysql
-
-	DELETE FROM table_1;
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/distinct.rst'
--- docs/distinct.rst	2011-10-23 16:01:37 +0000
+++ docs/distinct.rst	2012-06-19 08:53:18 +0000
@@ -1,9 +1,7 @@
 DISTINCT
 ========
 
-In a table, columns may contain more than one of the same value. 
-
-Sometimes it's helpful to list only the different, distinct values in a table; in this case the DISTINCT keyword can be used.
+'TODO'
 
 SQL SELECT DISTINCT Syntax: 
 
@@ -12,32 +10,4 @@
 	SELECT DISTINCT column_name(s)
 	FROM table_name
 
-**SELECT DISTINCT Example**
-
-The "Persons" table:
-
-+---------+------------+----------+----------+--------+
-|Id 	  |LastName    |FirstName |Address   |  City  |
-+=========+============+==========+==========+========+
-| 1 	  | Larson     | Sue      |3 Cherry  | Chicago|
-+---------+------------+----------+----------+--------+
-| 2 	  | Roberts    | Teri 	  |21 Brown  | Chicago|
-+---------+------------+----------+----------+--------+
-| 3 	  | Peterson   | Kari 	  |30 Mell   | Reno   |
-+---------+------------+----------+----------+--------+
-
-In order to select distinct values from the column named "City" from the table above, use the following SELECT statement:
-
-.. code-block:: mysql
-
-	SELECT DISTINCT City FROM Persons;
-
-The result-set will look like this:
-
-+--------+
-|City    |
-+========+
-|Chicago |
-+--------+
-|Reno    |
-+--------+
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/dml.rst'
--- docs/dml.rst	2011-03-17 16:33:45 +0000
+++ docs/dml.rst	2012-06-19 08:53:18 +0000
@@ -1,7 +1,7 @@
 Data Manipulation Language
 ==========================
 
-The Data Manipulation Language (DML) is made up of SQL statements that modify stored data but not the database schema or database objects. Each SQL DML statement is a declarative command, rather than imperative.
+'TODO'
 
 .. toctree::
    :maxdepth: 2
 
=== modified file 'docs/drop_index.rst'
--- docs/drop_index.rst	2011-02-23 13:08:09 +0000
+++ docs/drop_index.rst	2012-06-19 08:53:18 +0000
@@ -1,10 +1,6 @@
 DROP INDEX
 ============
 
-This drops a given index on the named table.
-
-.. code-block:: mysql
-
-	DROP INDEX table_1_index ON table_1;
+'TODO'
 
 Drizzle does not currently support fast drop index.
 
=== modified file 'docs/flush.rst'
--- docs/flush.rst	2011-02-23 14:17:23 +0000
+++ docs/flush.rst	2012-06-19 08:53:18 +0000
@@ -1,7 +1,7 @@
 FLUSH
 =====
 
-The FLUSH statement clears or reloads different internal caches. One variant acquires a lock.
+'TODO'
 
 .. code-block:: mysql
 
@@ -12,18 +12,18 @@
 
 * TABLES table_name [, table_name]
 	
-(closes all specified tables, forces those tables in use to be closed, and flushes the query cache for the named tables)
+'TODO'
 
 * TABLES WITH READ LOCK
 	
-(closes all open tables and locks all tables for all databases with a global read lock*)
+'TODO'
 
 * LOGS
 	
-(closes and reopens all log files--if binary logging is enabled, the sequence number of the binary log file is incremented by one relative to the previous file)
+'TODO'
 
 * STATUS
 	
-(adds the current thread's session status variable values to the global values and resets the session values to zero)
+'TODO'
     
-To release a FLUSH TABLES WITH READ LOCK, you must issue an UNLOCK TABLES.
+'TODO' (how to release a lock)
 
=== modified file 'docs/functions/aggregatefunctions.rst'
--- docs/functions/aggregatefunctions.rst	2011-02-28 14:09:50 +0000
+++ docs/functions/aggregatefunctions.rst	2012-06-19 08:53:18 +0000
@@ -1,27 +1,20 @@
 Aggregate Functions
 ===================
 
-SQL group (aggregate) functions operate on sets of values. If you use an aggregate function in a statement containing no GROUP BY clause, it is equivalent to grouping on all rows.
-
-General syntax for aggregate functions is:
-
-.. code-block:: mysql
-
-	SELECT "function type" ("column_name")
-	FROM "table_name";
+'TODO'
 
 The following are examples of aggregate functions:
 
-:ref:`avg`:  Return the average value of the argument. (Does not work with temporal values unless first converted to numeric values.)
+:ref:`avg`:  'TODO'
 
 :ref:`count`
-(DISTINCT):  Return the count of a number of different values
+(DISTINCT):  'TODO'
 
-:ref:`count`:  Return a count of the number of rows returned
+:ref:`count`:  'TODO'
 	
-:ref:`group_concat`:  Return a concatenated string
+:ref:`group_concat`:  'TODO'
 
-:ref:`max`:  Return the maximum or minim values
+:ref:`max`:  'TODO'
 
 
 .. _avg:
@@ -29,113 +22,25 @@
 AVG
 ---
 
-The AVG function returns the average value for the specified column in a table. To find the average session time for users and GROUP BY last_name:
-
-.. code-block:: mysql
-
-	SELECT last_name, AVG(session_length)
-    	-> FROM session_details GROUP BY last_name;
-
-AVG() returns NULL if there are no matching rows.  
-
+'TODO'
 
 .. _count:
 
 COUNT
 -----
 
-Take the following "Nodes" table, where 'nodes' are user-contributed content:
-
-+--------+-------------------+------------+----------------+-------------------+
-|NodeID  |ContributionDate   |NodeSize    |NodePopularity  |UserName           |
-+========+===================+============+================+===================+
-|1	 |12/22/2010         |160	  |2	           |Smith              |
-+--------+-------------------+------------+----------------+-------------------+
-|2	 |08/10/2010	     |190	  |2	           |Johnson            |
-+--------+-------------------+------------+----------------+-------------------+
-|3  	 |07/13/2010	     |500	  |5	           |Baldwin            |
-+--------+-------------------+------------+----------------+-------------------+
-|4	 |07/15/2010         |420	  |2               |Smith              |
-+--------+-------------------+------------+----------------+-------------------+
-|5	 |12/22/2010         |1000	  |4               |Wood               |
-+--------+-------------------+------------+----------------+-------------------+
-|6       |10/2/2010          |820	  |4	           |Smith              |
-+--------+-------------------+------------+----------------+-------------------+
-
-The SQL COUNT function returns the number of rows in a table satisfying the criteria specified in the WHERE clause. If we want to count the number of nodes made by user Smith, we will use the following SQL COUNT expression:
-
-.. code-block:: mysql
-
-	SELECT COUNT * FROM Nodes
-	WHERE UserName = "Smith";
-
-In the above statement, the COUNT keyword returns the number 3, because the user Smith has 3 total nodes.
-
-If you don't specify a WHERE clause when using the COUNT keyword, your statement will simply return the total number of rows in the table, which would be 6 in this example:
-
-.. code-block:: mysql
-
-	SELECT COUNT * FROM Nodes;
-
+'TODO'
 
 .. _group_concat:
 
 GROUP CONCAT
 -------------
 
-GROUP_CONCAT returns a string result with the concatenated non-NULL values from a group.
-
-For example, without GROUP_CONCAT, this query:
-
-.. code-block:: mysql
-
-	SELECT id,client_id FROM services WHERE id = 3;
-
-Returns:
-
-+----+-----------+
-| id | client_id |
-+====+===========+
-|  3 |         7 |
-+----+-----------+
-|  3 |         8 |
-+----+-----------+
-|  3 |         9 |
-+----+-----------+
-
-But using GROUP_CONCAT in an alternate query:
-
-.. code-block:: mysql
-
-	SELECT id,GROUP_CONCAT(client_id) FROM services WHERE id = 3 GROUP BY id;
-
-Will return:
-
-+----+-------------------------+
-| id | GROUP_CONCAT(client_id) |
-+====+=========================+
-|  3 | 7,8,9                   |
-+----+-------------------------+
-
+'TODO'
 
 .. _max:
 
 MAX and MIN
 ------------
 
-MAX returns the maximum value in a group. In cases where MAX is passed a string argument, it will return the maximum string value.
-
-MIN returns the minimum value of a group. Like MAX, MIN returns the minimum string value string value. 
-
-MAX and MIN return NULL if there are no matching rows.
-
-.. code-block:: mysql
-
-	SELECT product_id, MIN(price), MAX(price)
-		FROM inventory
-		GROUP BY product_id;
-
-.. note::
-
-   For ``ENUM`` columns :program:`Drizzle` uses the highest and lowest string
-   values for ``MIN`` and ``MAX`` rather than relative position.
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/functions/control_flow.rst'
--- docs/functions/control_flow.rst	2011-09-15 13:23:48 +0000
+++ docs/functions/control_flow.rst	2012-06-19 08:53:18 +0000
@@ -1,80 +1,4 @@
 Control Flow Functions
 ======================
 
-There are four control flow functions: 
-
-* CASE
-* IF/ELSE
-* IFNULL
-* NULLIF
-
-Control flow functions return a value for each row processed, which represents the result of the comparison or condition specified. They can be used in ``SELECT``, ``WHERE``, ``ORDER BY``, and ``GROUP BY`` statements.
-
-CASE
-----
-
-There are two basic examples of the ``CASE`` statment:
-
- 1. ::
-
-	CASE value WHEN [compare_value] THEN result [WHEN [compare_value] THEN result ...] [ELSE result] END
-
-In this version, result is returned when value is equal to compare_value. If nothing is matched, the result after ``ELSE`` is returned, or ``NULL`` is returned if there is no ``ELSE`` part.
-
- 2. ::
-
-	CASE WHEN [condition] THEN result [WHEN [condition] THEN result ...] [ELSE result] END
-
-In this version, if [condition] is true, result is returned. If nothing is matched, the result after ``ELSE`` is returned, or ``NULL`` is returned if there is no ``ELSE`` part.
-
-When [condition] is for equal comparison (=), this example syntax returns the same result as the first example.
-
-IF/ELSE
----------
-
-This type of control flow function checks IF a condition is satisfied (i.e. the Boolean expression returns TRUE), the IF SQL statement will execute. IF the condition is not satisfied (i.e. the Boolean expression returns FALSE), the ELSE SQL statement is executed.
-
-Syntax for IF/ELSE: ::
-
-	IF ( Boolean_expression ) 
-	BEGIN
-	SQL statement
-	END
-	ELSE
-	BEGIN
-	SQL statement
-	END
-
-
-IFNULL
--------
-
-Given IFNULL(arg1,arg2), if arg1 is not NULL, IFNULL() returns arg1; it otherwise returns arg2. IFNULL() returns a numeric or string value, depending on how it's used.
-
-.. code-block:: mysql
-
-	SELECT IFNULL(2,0);
-        -> 2
-	
-	SELECT IFNULL(NULL,1);
-        -> 1
-	
-	SELECT IFNULL(1/0,10);
-        -> 10
-	
-	SELECT IFNULL(1/0,'yes');
-        -> 'yes'
-
-NULLIF
--------
-
-NULLIF(arg1,arg2) returns NULL if arg1 = arg2 is true, otherwise returns arg1.
-
-.. code-block:: mysql
-
-	SELECT NULLIF(1,1);
-        -> NULL
-
-	SELECT NULLIF(1,2);
-        -> 1
-
+'TODO'
 
=== modified file 'docs/functions/current_time_functions.rst'
--- docs/functions/current_time_functions.rst	2012-03-06 00:19:38 +0000
+++ docs/functions/current_time_functions.rst	2012-06-19 08:53:18 +0000
@@ -1,81 +1,4 @@
 CURRENT TIME FUNCTIONS
 =======================
 
-
-current_date
--------------
-
-Returns the current date as a value in 'YYYY-MM-DD' or YYYYMMDD format, depending on whether the function is used in a string or numeric context.
-
-.. code-block:: mysql
-
-	SELECT CURDATE();
-        	-> '2011-02-13'
-	SELECT CURDATE() + 0;
-        	-> 20110213
-
-.. _now:
-
-now()	                            
-------
-
-NOW returns the current date and time. The return value will be expressed as 'YYYY-MM-DD HH:MM:SS:mmmmmm' or YYYYMMDDHHMMSS.uuuuuu, depending on whether the function is used in a string or numeric context. The value is expressed in the current time zone (Drizzle timezone is always UTC).
-
-.. code-block:: mysql
-
-	SELECT NOW();
-        	-> '2011-02-15 13:40:06:002203'
-	SELECT NOW() + 0;
-        	-> 20110215134006.002203
-
-NOW returns a constant time that indicates the time at which the statement began to execute. 
-
-.. code-block:: mysql
-
-	SELECT NOW(), SLEEP(2), NOW();
-
-Returns:
-
-+----------------------------+----------+----------------------------+
-| NOW()                      | SLEEP(2) | NOW()                      |
-+============================+==========+============================+
-| 2011-02-20 20:15:09:002203 |        0 | 2011-02-20 20:15:09:002203 |
-+----------------------------+----------+----------------------------+
-
-SYSDATE, however, returns the exact time at which the function was invoked.
-
-.. code-block:: mysql
-
-	SELECT SYSDATE(), SLEEP(2), SYSDATE();
-
-Returns:
-
-+---------------------+----------+---------------------+
-| SYSDATE()           | SLEEP(2) | SYSDATE()           |
-+=====================+==========+=====================+
-| 2011-02-20 20:15:09 |        0 | 2011-02-20 20:15:11 |
-+---------------------+----------+---------------------+
-
-When using replication, the binary log will include SET TIMESTAMP entries so that a database can be restored from the binary log. In doing this, values from NOW will be adjusted to the same times as when the original SQL statements were executed. SYSDATE entries will be unaffected by SET TIMESTAMP entries.
-
-current_timestamp
-------------------
-
-See :ref:`now`
-
-CURRENT_TIMESTAMP() is a synonym for NOW(). 
-
-localtime
------------
-
-See :ref:`now`
-
-LOCALTIME() is a synonym for NOW(). 
-
-localtimestamp	                   
----------------
-
-See :ref:`now`
-
-LOCALTIMESTAMP() is a synonym for NOW(). 
-
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/functions/date_trunc.rst'
--- docs/functions/date_trunc.rst	2011-03-11 15:54:41 +0000
+++ docs/functions/date_trunc.rst	2012-06-19 08:53:18 +0000
@@ -1,30 +1,4 @@
 DATE TRUNC
 ===========
 
-DATE_TRUNC truncates a date to a specified precision. The idea is similar to the trunc function for numbers.
-
-The syntax is: date_trunc(text, source)
-
-Valid values for *text* are:
-
-* microseconds
-* milliseconds
-* second
-* minute
-* hour
-* day
-* week
-* month
-* quarter
-* year
-* decade
-* century
-* millennium
-
-In this example, 'source' is a TIMESTAMP value with microsecond precision:
-
-.. code-block:: mysql
-
-	date_trunc('hour', timestamp '2011-02-26 10:35:44:712005')
-
-Returns: 2011-02-26 10:00:00
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/functions/datetime.rst'
--- docs/functions/datetime.rst	2012-03-23 21:25:52 +0000
+++ docs/functions/datetime.rst	2012-06-19 08:53:18 +0000
@@ -13,21 +13,7 @@
 
 For examples of the following, see :doc:`current_time_functions`.
 
-+-----------------------------------+-------------------------------------+-----------------------------------------------------------------+
-|Name                               |Return Type                          |Description                                                      |
-+===================================+=====================================+=================================================================+
-|current_date                       |date                                 |Current date                                                     |
-+-----------------------------------+-------------------------------------+-----------------------------------------------------------------+
-|current_timestamp                  |timestamp with time zone*	          |Current date and time (start of current transaction)             |
-+-----------------------------------+-------------------------------------+-----------------------------------------------------------------+
-|localtime	                    |time	                          |Current time of day	 	                                    |
-+-----------------------------------+-------------------------------------+-----------------------------------------------------------------+
-|localtimestamp	                    |timestamp	                          |Current date and time (start of current transaction)             |
-+-----------------------------------+-------------------------------------+-----------------------------------------------------------------+
-|now()	                            |timestamp with time zone*	          |Current date and time (start of current transaction)             |
-+-----------------------------------+-------------------------------------+-----------------------------------------------------------------+
-|statement_timestamp()	            |timestamp with time zone*	          |Current date and time (start of current statement)               |
-+-----------------------------------+-------------------------------------+-----------------------------------------------------------------+
+'TODO'
 
 Drizzle timezone is always UTC.
 
@@ -36,17 +22,7 @@
 
 For examples of the following, see :doc:`extract_date_functions`.
 
-+--------------------------------+-----------------------+---------------------------------------+
-|Name                            |Return Type            |Description                            |
-+================================+=======================+=======================================+
-|extract(field from timestamp)	 |double precision       |Get subfield 	                         |
-+--------------------------------+-----------------------+---------------------------------------+
-|extract(field from interval)	 |double precision       |Get subfield	                         |
-+--------------------------------+-----------------------+---------------------------------------+
-|date_part(text, timestamp)	 |double precision       |Get subfield (equivalent to extract)   |
-+--------------------------------+-----------------------+---------------------------------------+
-|date_part(text, interval)	 |double precision	 |Get subfield (equivalent to extract)   |
-+--------------------------------+-----------------------+---------------------------------------+
+'TODO'
 
 
 DATE TRUNC
@@ -54,13 +30,4 @@
 
 For an example of the following, see :doc:`date_trunc`.
 
-+--------------------------------+-----------------------+---------------------------------------+
-|Name                            |Return Type            |Description                            |
-+================================+=======================+=======================================+
-|date_trunc(text, timestamp)     |timestamp	         |Truncate to specified precision	 |
-+--------------------------------+-----------------------+---------------------------------------+
-
-
-
-
-
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/functions/extract_date_functions.rst'
--- docs/functions/extract_date_functions.rst	2011-09-15 18:01:36 +0000
+++ docs/functions/extract_date_functions.rst	2012-06-19 08:53:18 +0000
@@ -8,153 +8,4 @@
 
 	EXTRACT(field FROM source)
 
-The EXTRACT function retrieves subfields such as day or hour from date/time values. The source value has to be a value expression of type *timestamp*, *time*, *date*, or *interval*. 
-
-*Field* is an identifier or string that identifies the field to extract from the source value. The extract function returns values of type *double precision*. 
-
-Examples
---------
-
-The following field names are available:
-
-day
-^^^
-
-.. code-block:: mysql
-	
-	SELECT EXTRACT(DAY FROM TIMESTAMP '2011-02-16 20:38:40');
-
-Day of the month.
-
-*Result: 16*
-
-decade
-^^^^^^
-
-.. code-block:: mysql
-	
-	SELECT EXTRACT(DECADE FROM TIMESTAMP '2001-02-16 20:38:40');
-
-The year, divided by 10.
-
-*Result: 200*
-
-dow
-^^^
-
-.. code-block:: mysql
-	
-	SELECT EXTRACT(DOW FROM TIMESTAMP '2001-02-16 20:38:40');
-
-The day of the week (Sunday is 0, Saturday is 6)
-
-*Result: 5*
-
-doy
-^^^
-
-.. code-block:: mysql
-
-	SELECT EXTRACT(DOY FROM TIMESTAMP '2001-02-16 20:38:40');
-
-The day of the year (1 - 365/366)
-
-*Result: 47*
-
-hour
-^^^^
-
-.. code-block:: mysql
-
-	SELECT EXTRACT(HOUR FROM TIMESTAMP '2001-02-16 20:38:40');
-
-The hour field (0 - 23)
-
-*Result: 20*
-
-minute
-^^^^^^
-
-.. code-block:: mysql
-
-	SELECT EXTRACT(MINUTE FROM TIMESTAMP '2001-02-16 20:38:40');
-
-The minutes field (0 - 59)	
-
-*Result: 38*
-
-month
-^^^^^
-
-For timestamp values, the number of the month within the year (1 - 12). 
-For interval values, the number of months (0 - 11).
-
-.. code-block:: mysql
-
-	SELECT EXTRACT(MONTH FROM TIMESTAMP '2010-12-29 08:45:27');
-
-*Result: 12*
-
-.. code-block:: mysql
-
-	SELECT EXTRACT(MONTH FROM INTERVAL '3 years 4 months');
-
-*Result: 4*
-
-.. code-block:: mysql
-
-	SELECT EXTRACT(MONTH FROM INTERVAL '3 years 13 months');
-
-*Result: 1*
-
-quarter
-^^^^^^^
-
-.. code-block:: mysql
-
-	SELECT EXTRACT(QUARTER FROM TIMESTAMP '2010-12-29 08:45:27');
-
-The quarter of the year (1 - 4) containing the date.
-	
-*Result: 4*
-
-second
-^^^^^^
-
-.. code-block:: mysql
-
-	SELECT EXTRACT(SECOND FROM TIMESTAMP '2010-12-29 08:45:27');
-
-The seconds field, including fractional parts (0 - 59)
-	
-*Result: 27*
-
-timezone
-^^^^^^^^
-
-The time zone offset from UTC, measured in seconds.
-
-week
-^^^^
-
-Returns the week number that a day is in. Weeks are numbered according to ISO 8601:1988.
-
-ISO 8601:1988 means that if the week containing January 1 has four or more days in the new year, then it is week 1; otherwise it is the last week of the previous year, and the next week is week 1. The ISO-8601 week starts on Monday.
-
-It's possible for early January dates to be part of the 52nd or 53rd week of the previous year. For example, 2011-01-01 was part of the 52nd week of year 2010.
-
-.. code-block:: mysql
-
-	SELECT EXTRACT(WEEK FROM TIMESTAMP '2010-01-25 12:44:06');
-
-*Result: 4*
-
-year
-^^^^
-
-.. code-block:: mysql
-
-	SELECT EXTRACT(YEAR FROM TIMESTAMP '2009-02-16 20:38:40');
-
-*Result: 2009*
-
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/functions/logical.rst'
--- docs/functions/logical.rst	2011-02-23 13:08:09 +0000
+++ docs/functions/logical.rst	2012-06-19 08:53:18 +0000
@@ -17,167 +17,28 @@
 ==============================     ================================
 
 
+'TODO'
+
 .. _and:
 
 AND
 ---
 
-This logical operator AND:
-
-* evaluates to 1 if all operands are nonzero and not NULL
-* evaluates to 0 if one or more operands are 0 
-* otherwise returns NULL 
-
-.. code-block:: mysql
-
-	SELECT 1 && 1;
-	        -> 1
-	SELECT 1 && 0;
-        	-> 0
-	SELECT 1 && NULL;
-        	-> NULL
-	SELECT 0 && NULL;
-        	-> 0
-	SELECT NULL && 0;
-        	-> 0
-
-AND can be used to select rows that satisfy all the conditions given in a statement. For Example, to find the names of the students between the age 20 to 25 years, the query would be like:
-
-.. code-block:: mysql
-
-	SELECT first_name, last_name, age
-	FROM user_details
-	WHERE age >= 20 AND age <= 25;
-
-The output would be:
-
-+---------------+------------------+-------+
-|first_name 	|last_name 	   |age    |
-+===============+==================+=======+
-|Mary 	        |Bean   	   |20     |
-+---------------+------------------+-------+
-|Henry  	|Catson 	   |22     |
-+---------------+------------------+-------+
-|Sheila 	|Donaldson         |25     |
-+---------------+------------------+-------+  
-
-The logical "AND" operator selects rows only if the data in all relevant columns is satisfied. In this case, 'first_name' and 'last_name' simply need to have non-NULL values, and 'age' needs to be a value between 20 and 25.
-
 .. _or:
 
 OR
 --
 
-This logical operator OR:
-
-* returns 1 if any operand is nonzero and both operands are non-NULL, and returns 0 otherwise
-* returns 1 with a NULL operand if the other operand is nonzero, and retunes NULL otherwise
-* returns NULL if both operands are NULL
-
-.. code-block:: mysql
-
-	SELECT 1 || 1;
-        	-> 1
-	SELECT 1 || 0;
-        	-> 1
-	SELECT 0 || 0;
-        	-> 0
-	SELECT 1 || NULL;
-        	-> 1
-	SELECT 0 || NULL;
-        	-> NULL
-
-In other words, OR is used to select rows that satisfy at least one of the given conditions.
-
-For example, the following query could be used to find the user_id for people that live in either California or Texas:
-
-.. code-block:: mysql
-
-	SELECT user_id, state
-	FROM user_location
-	WHERE state = 'California' OR state = 'Texas';
-
-The result set could be something like:
-
-+---------------+------------------+-----------+
-|user_id 	|city   	   |state      |
-+===============+==================+===========+
-|608            |Sacremento   	   |California |
-+---------------+------------------+-----------+
-|844     	|Austin 	   |Texas      |
-+---------------+------------------+-----------+
-|917    	|Oakland           |California |
-+---------------+------------------+-----------+  
-
-
 .. _xor:
 
 XOR
 ---
 
-* returns NULL if either operand is NULL
-* evaluates to 1 for non-NULL operands (if an odd number of operands is nonzero)
-* otherwise 0 is returned
-
-.. code-block:: mysql
-
-	SELECT 1 XOR NULL;
-        	-> NULL
-	SELECT 1 XOR 0;
-        	-> 1
-	SELECT 1 XOR 1 XOR 1;
-        	-> 1
-	SELECT 1 XOR 1;
-        	-> 0
-
-Note that "a XOR b" is the mathematical equivalent of (a AND (NOT b)) OR ((NOT a) and b). 
-
-
 .. _not:
 
 NOT
 ---
 
-This logical operator NOT:
-
-* evaluates to 1 if the operand is 0
-* evaluates to 0 if the operand is nonzero
-* NOT NULL returns NULL
-
-.. code-block:: mysql
-
-	SELECT NOT 10;
-        	-> 0
-	SELECT NOT 0;
-        	-> 1
-	SELECT NOT NULL;
-        	-> NULL
-	SELECT ! (1+1);
-        	-> 0
-	SELECT ! 1+1;
-        	-> 1
-
-If you want to find rows that do not satisfy a condition, you can use the logical operator, NOT. NOT results in the reverse of a condition. That is, if a condition is satisfied, then the row is not returned.
-
-For example: If you want to find out the user_id for people who do not practice medicine as their profession, the query would be like:
-
-.. code-block:: mysql
-
-	SELECT user_id, title, occupation
-	FROM user_occupations
-	WHERE NOT occupation = 'Doctor';
-
-The result set would be something like:
-
-+---------------+------------------+--------------+
-|user_id 	|degree   	   |occupation    |
-+===============+==================+==============+
-|322            |PhD    	   |Professor     |
-+---------------+------------------+--------------+
-|579     	|PhD    	   |Writer        |
-+---------------+------------------+--------------+
-|681     	|MD                |Consultant    |
-+---------------+------------------+--------------+  
 
 
 .. _less_than:
@@ -185,12 +46,6 @@
 LESS THAN
 ----------
 
-Less than:
-
-.. code-block:: mysql
-
-	SELECT 2 < 2;
-        	-> 0
 
 
 .. _greater_than:
@@ -198,72 +53,26 @@
 GREATER THAN
 -------------
 
-Greater than:
-
-.. code-block:: mysql
-
-	SELECT 2 > 2;
-        	-> 0
 
 .. _less_or_equal:
 
 LESS THAN OR EQUAL
 -------------------
 
-Less than or equal:
-
-.. code-block:: mysql
-
-	SELECT 0.1 <= 2;
-        	-> 1
-
 
 .. _greater_or_equal:
 
 GREATER THAN OR EQUAL
 ----------------------
 
-Greater than or equal:
-
-.. code-block:: mysql
-
-	SELECT 2 >= 2;
-        	-> 1
-
 .. _equal:
 
 EQUAL
 -----
 
-Equal:
-
-.. code-block:: mysql
-
-	SELECT 1 = 0;
-        	-> 0
-	SELECT '0' = 0;
-        	-> 1
-	SELECT '0.0' = 0;
-       		-> 1
-	SELECT '0.01' = 0;
-        	-> 0
-	SELECT '.01' = 0.01;
-        	-> 1
-
 
 .. _not_equal:
 
 NOT EQUAL
 ----------
 
-Not equal:
-
-.. code-block:: mysql
-
-	SELECT '.01' <> '0.01';
-        	-> 1
-	SELECT .01 <> '0.01';
-        	-> 0
-	SELECT 'zing' <> 'zingg';
-        	-> 1
-
 
=== modified file 'docs/functions/overview.rst'
--- docs/functions/overview.rst	2011-08-13 20:41:38 +0000
+++ docs/functions/overview.rst	2012-06-19 08:53:18 +0000
@@ -1,7 +1,7 @@
 SQL Functions
 =============
 
-Several SQL functions are built into Drizzle--functions perform calculations on data. They can be be understood in categories: 
+'TODO' 
    
 .. toctree::
    :maxdepth: 2
 
=== modified file 'docs/functions/string.rst'
--- docs/functions/string.rst	2011-08-13 20:41:38 +0000
+++ docs/functions/string.rst	2012-06-19 08:53:18 +0000
@@ -18,18 +18,21 @@
 Summary of Functions
 --------------------
 
+'TODO' descriptions
+'TODO' "regular functions" ...there are no regular or irregular functions!!!
+
 Comparative and regular functions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 ===================     ====================================================================================================
 Operator                  Description
 ===================     ==================================================================================================== 
-LIKE 	                  Matches a simple pattern
-NOT LIKE 	          Negation of simple pattern matching
-STRCMP() 	          Compare two strings
-NOT REGEXP 	          Negation of REGEXP
-REGEXP 	                  Returns values that match a regular expression pattern
-RLIKE 	                  Synonym for REGEXP
+LIKE 	              
+NOT LIKE 	          
+STRCMP() 	          
+NOT REGEXP 	        
+REGEXP 	            
+RLIKE 	            
 ===================     ====================================================================================================
 
 
@@ -38,15 +41,15 @@
 ===================     ====================================================================================================
 Operator                  Description
 ===================     ====================================================================================================
-ASCII() 	          Return numeric value of left-most character
-BIN() 	                  Return a string representation of the argument
-CHAR() 	                  Return the character for each integer passed
-HEX()  	                  Return a hexadecimal representation of a decimal or string value
-LOWER() 	          Return the argument in lowercase
-LCASE() 	          Synonym for LOWER()
-UCASE() 	          Synonym for UPPER()
-UNHEX() 	          Convert each pair of hexadecimal digits to a character
-UPPER() 	          Convert to uppercase
+ASCII() 	          
+BIN() 	            
+CHAR() 	            
+HEX()  	            
+LOWER() 	          
+LCASE() 	          
+UCASE() 	          
+UNHEX() 	          
+UPPER() 	          
 ===================     ====================================================================================================
 
 
@@ -55,10 +58,10 @@
 ===================     ====================================================================================================
 Operator                  Description
 ===================     ====================================================================================================
-BIT_LENGTH() 	          Return length of argument in bits
-CHAR_LENGTH()             Return number of characters in argument
-LENGTH() 	          Return the length of a string in bytes
-OCTET_LENGTH() 	          A synonym for LENGTH()
+BIT_LENGTH() 	      
+CHAR_LENGTH()       
+LENGTH() 	          
+OCTET_LENGTH() 	    
 ===================     ====================================================================================================
 
 
@@ -67,10 +70,10 @@
 ===================     ====================================================================================================
 Operator                  Description
 ===================     ====================================================================================================
-CONCAT() 	          Returns a concatenated string
-TRIM() 	                  Remove leading and trailing spaces
-LTRIM() 	          Remove leading spaces
-RTRIM() 	          Remove trailing spaces
+CONCAT() 	          
+TRIM() 	            
+LTRIM() 	          
+RTRIM() 	          
 ===================     ====================================================================================================
 
 
@@ -80,13 +83,13 @@
 ===================     ====================================================================================================
 Operator                  Description
 ===================     ==================================================================================================== 
-FIELD() 	          Return the index (position) of the first argument in the sequent arguments
-FIND_IN_SET() 	          Return the index position of the first argument within the second argument
-INSTR() 	          Return the index of the first occurrence of substring
-LEFT() 	                  Return the leftmost number of characters as specified
-INSERT() 	          Insert a substring at the specified position up to the specified number of characters
-LOCATE() 	          Return the position of the first occurrence of substring
-POSITION() 	          A synonym for LOCATE()
+FIELD() 	          
+FIND_IN_SET() 	    
+INSTR() 	          
+LEFT() 	            
+INSERT() 	          
+LOCATE() 	          
+POSITION() 	          
 ===================     ==================================================================================================== 
 
 
@@ -96,24 +99,24 @@
 ===================     ====================================================================================================
 Operator                  Description
 ===================     ==================================================================================================== 
-ELT() 	                  Return string at index number
-EXPORT_SET() 	          Return a string
-FORMAT() 	          Return a number formatted to specified number of decimal places
-LOAD_FILE() 	          Load the named file
-LPAD() 	                  Return the string argument, left-padded with the specified string
-MAKE_SET() 	          Return a set of comma-separated strings that have the corresponding bit in bits set
-MATCH 	                  Perform full-text search
-MID() 	                  Return a substring starting from the specified position
-ORD() 	                  Return character code for leftmost character of the argument
-QUOTE() 	          Escape the argument for use in an SQL statement
-REPEAT() 	          Repeat a string the specified number of times
-REPLACE() 	          Replace occurrences of a specified string
-REVERSE() 	          Reverse the characters in a string
-RIGHT() 	          Return the specified rightmost number of characters
-RPAD() 	                  Append string the specified number of times
-SOUNDEX() 	          Return a soundex string
-SUBSTR() 	          Return the substring as specified
-SUBSTRING_INDEX() 	  Return a substring from a string before the specified number of occurrences of the delimiter
-SUBSTRING() 	          Return the substring as specified
+ELT() 	                 
+EXPORT_SET() 	          
+FORMAT() 	          
+LOAD_FILE() 	          
+LPAD() 	                  
+MAKE_SET() 	          
+MATCH 	              
+MID() 	              
+ORD() 	             
+QUOTE() 	          
+REPEAT() 	          
+REPLACE() 	        
+REVERSE() 	        
+RIGHT() 	          
+RPAD() 	            
+SOUNDEX() 	        
+SUBSTR() 	          
+SUBSTRING_INDEX() 	  
+SUBSTRING() 	        
 ===================     ====================================================================================================
 
 
=== modified file 'docs/functions/string/comparative.rst'
--- docs/functions/string/comparative.rst	2011-08-13 20:41:38 +0000
+++ docs/functions/string/comparative.rst	2012-06-19 08:53:18 +0000
@@ -1,72 +1,31 @@
 Comparative Functions
 =====================
 
+'TODO'
+
 .. _like-function:
 
-LIKE 	        
+LIKE            
 ----
 
-The LIKE operator is used to check if field values match a specified pattern, and searches for less-than-exact but similar values.
-
-The LIKE operator supports the use of two wildcards. (Wildcards provide more flexibility by allowing any character or group of characters in a string to be acceptable as a match for another string):
-
-    * Percentage (%): Represents zero or more values.
-    * Underscore (_): Matches exactly one character value.
-
-In accordance the SQL standard, LIKE performs matching on a per-character basis. It therefore provides results different from the = comparison operator.
-
-The following SELECT statement includes a WHERE clause in order to search for job titles that start with "DIRECTOR", by using the percentage wildcard after the lookup value.
-
-For example:
-
-.. code-block:: mysql
-
-	SELECT title, field
-	FROM job_detail
-	WHERE title LIKE 'DIRECTOR%'
-	ORDER BY field, title;
+
+
 
 .. _regex-function:
 
 REGEX
 -----
 
-Undocumented.
 
 .. _regexp-function:
 
 REGEXP
 ------
 
-Returns values that match a regular expression pattern; they are commonly used for creating complex searches. Here is an example of using a REGEXP (Regular Expression) match:
-
-.. code-block:: mysql
-
-	SELECT title, category_name
-	FROM film_detail
-	WHERE title REGEXP '^AIRP[LO]'
-	ORDER BY title;
-
-Other REGEXP examples:
-
-.. code-block:: mysql
-
-	SELECT 'abcabc' REGEXP 'abc',    
-	'abcabc' REGEXP 'cb';
-
-The search pattern may describe only a part of string. To match entire string, use ^ and $ in the search:
-
-.. code-block:: mysql
-
-	SELECT 'abc' REGEXP '^abc$', 'abcabc' REGEXP '^abc$';
-
-	SELECT 'cde' REGEXP '[a-c]+', 'efg' REGEXP '[a-c]+';
-
-	SELECT 'abcabc' REGEXP 'ABC', 'abcabc' REGEXP BINARY 'ABC';
+
 
 .. _strcmp-function:
 
 STRCMP
 ------
 
-The purpose of STRCMP is also to compare two strings. This function returns 0 if two strings are the same, -1 if the first argument is smaller than the second according to the current sort order, and 1 otherwise.
 
=== modified file 'docs/functions/string/conversion.rst'
--- docs/functions/string/conversion.rst	2011-08-13 20:41:38 +0000
+++ docs/functions/string/conversion.rst	2012-06-19 08:53:18 +0000
@@ -1,145 +1,59 @@
 Conversion Functions
 ====================
 
+'TODO'
+
 .. _ascii-function:
 
 ASCII
 -----
 
-The ASCII(str) function returns the numeric value of the leftmost character of the string ’str’. It returns NULL if str is NULL. It works for 8-bit characters.
-
-For example:
-
-.. code-block:: mysql
-
-	SELECT ASCII('0');
-
-Returns 48
-
-.. code-block:: mysql
-
-	SELECT ASCII('d');
-
-Returns 100
 
 .. _bin-function:
 
 BIN
 ---
 
-The BIN string function returns a string value that represents the binary value of N, where N is a longlong(BIGINT) number. This function is equivalent to CONV(N, 10 , 0). If the function return the null then N is null. 
-
-Syntax:
-
-BIN (N);
-
-For exempt:
-
-.. code-block:: mysql
-
-	SELECT BIN(12);
-
-Returns: '1100'
-
-
 .. _char-function:
 
 CHAR
 ----
 
-SQL CHAR function is the opposite of the ASCII function. It converts an integer in range 0-255 into a ASCII character. It returns a string (the character), given the integer value. This function skips NULL values.   
 
-For example:
-
-.. code-block:: mysql
-
-	SELECT CHAR(65) AS ch_65;
-
-Returns "A"
 
 
 .. _hex-function:
 
 HEX
 ---
 
-This string function returns the hexadecimal (base-16) representation of a string or decicmal argument. Each character in the string argument is converted to two hexadecimal digits. If the argument is numeric, HEX() returns a hexadecimal string representation of the value as a BIGINT number.
-
-Using HEX for numeric values:
-
-.. code-block:: mysql
-
-	SELECT HEX(255);
-
-Returns: FF
-
-Using HEX for string values:
-
-.. code-block:: mysql
-
-	SELECT HEX('Drizzle');
-
-Returns: 4452495A5AHc45
-
-(To better understand this output, you can use an :doc:`../../resources/ascii_chart` that includes both Hexadecimal and character values.)
 
 .. _unhex-function:
 
 UNHEX
 -----
 
-UNHEX converts each pair of hexadecimal digits to a character. For a string argument, UNHEX() is the inverse operation of HEX(str).
-
-Instead of converting each character in the string argument to hex digits, it interprets each pair of characters in the argument as a hexadecimal number and converts it to the character represented by the number. The return value is a binary string.
-
-.. code-block:: mysql
-
-	SELECT UNHEX('4452495A5AHc45');
-
-Returns 'drizzle'
-
-.. code-block:: mysql
-
-	SELECT UNHEX(HEX('string'));
-
-Returns 'string'
-
-.. code-block:: mysql
-
-	SELECT HEX(UNHEX('1267'));
-
-Returns '1267'
-
-The characters in the argument string must be legal hexadecimal digits: '0' .. '9', 'A' .. 'F', 'a' .. 'f'. If the argument contains any non-hexadecimal digits, the result is NULL:
-
-.. code-block:: mysql
-
-	SELECT UNHEX('GG');
-
-Returns NULL
+
 
 .. _lower-function:
 
 LOWER
 -----
 
-Return the argument in lowercase.
 
 .. _lcase-function:
 
 LCASE
 -----
 
-Synonym for LOWER().
 
 .. _ucase-function:
 
 UCASE
 -----
 
-Synonym for UPPER()
 
 .. _upper-function:
 
 UPPER
 -----
 
-Convert to uppercase.
+
 
=== modified file 'docs/functions/string/length.rst'
--- docs/functions/string/length.rst	2011-09-15 13:23:48 +0000
+++ docs/functions/string/length.rst	2012-06-19 08:53:18 +0000
@@ -1,43 +1,28 @@
 Length and Size Functions
 =========================
 
+'TODO'
+
 .. _char-length-function:
 
 CHAR_LENGTH
 -----------
-The CHAR_LENGTH(str) function returns string length measured in characters. 
-
-A multi-byte character counts as single character such as a string contains 5 two-byte characters, then LENGTH() function returns 10, but the CHAR_LENGTH() returns 5. ::
-
-	CHARACTER_LENGTH(str)
-
-This function is same as CHAR_LENGTH().
+
 
 .. _character-length-function:
 
 CHARACTER_LENGTH
 ----------------
 
-Synonym for CHAR_LENGTH.
 
 .. _length-function:
 
 LENGTH
 ------
 
-The LENGTH function returns the length of the string argument in bytes. A multi-byte character counts as multiple bytes. This means that for a string containing a three-byte character, LENGTH() returns 3, whereas CHAR_LENGTH() returns 1. For example:
-
-.. code-block:: mysql
-
-	select length('€');
-
-Returns 3
-
-The is because the Euro sign is encoded as 0xE282AC in UTF-8 and thereby occupies 3 bytes.
 
 .. _octet-length-function:
 
 OCTET_LENGTH
 -------------
 
-A synonym for LENGTH().
 
=== modified file 'docs/functions/string/modification.rst'
--- docs/functions/string/modification.rst	2011-09-15 13:44:31 +0000
+++ docs/functions/string/modification.rst	2012-06-19 08:53:18 +0000
@@ -1,117 +1,4 @@
 String Modification Functions
 =============================
 
-.. _concat-function:
-
-CONCAT
-------
-
-The SQL standard defines a concatenation operator ( || ), which joins two or more strings into one string value.
-The CONCAT(str1, str2...) function can have one or more arguments. It returns a string that is the result of concatenating the arguments.
-
-* If arguments are non-binary strings, the result is also a non-binary string.
-* If any argument is a binary string, then the result will also be a binary string. 
-* Numeric arguments are converted to their equivalent in binary string format. 
-* If any argument is NULL then it also returns NULL. 
-
-Syntax:
-
-CONCAT(str1, str2, [,...n])
-For example:
-
-.. code-block:: mysql
-
-	SELECT CONCAT('Dr', 'izzl', 'ed');
-
-Returns: 'Drizzled'
-
-.. code-block:: mysql
-
-	SELECT CONCAT('micro', NULL, 'nel');
-
-Returns: NULL
-
-.. code-block:: mysql
-
-	SELECT CONCAT(14.8);
-
-Returns: '14.8'
-
-.. _concat-ws-function:
-
-CONCAT_WS
----------
-CONCAT WS (With Separator) [1]_ allows you to specify that the first argument is treated as a separator for the rest of the arguments. This argument is added between the strings to be concatenated.
-
-Syntax:
-
-CONCAT_WS(separator, str1, str2,....)
-
-For example:
-
-.. code-block:: mysql
-
-	SELECT CONCAT_WS(',', ' Occupation', 'First name', 'Last Name');
-
-Returns: 'Occupation, First name, Last Name'
-
-.. code-block:: mysql
-
-	SELECT CONCAT_WS(',', 'First name', NULL, 'Last Name');
-
-Returns: 'First name, Last Name'
-
-.. _trim-function:
-
-TRIM
-----
-
-The TRIM function remove specified prefixes or suffixes from a string (typically leading and trailing spaces), and returns the resulting string. If none of the specifiers BOTH, LEADING, or TRAILING is given, BOTH is assumed.
-
-Syntax:
-
-TRIM([{BOTH | LEADING | TRAILING} [remstr] FROM] str), TRIM([remstr FROM] str)
-
-[remstr] is optional (if it's not specified, spaces are removed).
-
-For example:
-
-.. code-block:: mysql
-
-	SELECT TRIM(BOTH 'hello,' FROM 'hello,Drizzlehello,');
-
-Returns: 'Drizzle'
-
-.. _ltrim-function:
-
-LTRIM 
------
-
-This version of the TRIM function removes leading spaces from the beginning of a string.
-
-For example:
-
-.. code-block:: mysql
-
-	SELECT LTRIM('   Drizzle');
-
-Returns: 'Drizzle'
-
-.. _rtrim-function:
-
-RTRIM
------
-
-This version of the TRIM function removes trailing spaces from the end of a function. 
-
-For example:
-
-.. code-block:: mysql
-
-	SELECT RTRIM('Drizzle   ');
-
-Returns: 'Drizzle'
-
-.. rubric:: Footnotes
-
-.. [1] If the separator is NULL then the result is NULL.
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/functions/string/other.rst'
--- docs/functions/string/other.rst	2011-09-15 13:58:14 +0000
+++ docs/functions/string/other.rst	2012-06-19 08:53:18 +0000
@@ -1,171 +1,126 @@
 Other String Functions
 ======================
 
+'TODO'
+
 .. _coercibility-function:
 
 COERCIBILITY
 ------------
 
-Gets coercibility for an expression.
+
 
 .. _elt-function:
 
 ELT
 ---
 
-Return string at index number.
 
 .. _export-set-function:
 
 EXPORT_SET
 ----------
 
-Return a string
 
 .. _format-function:
 
 FORMAT
 ------
 
-Return a number formatted to specified number of decimal places.
 
 .. _load-file-function:
 
 LOAD_FILE
 ---------
 
-Load the named file.
 
 .. _lpad-function:
 
 LPAD
 ----
 
-Return the string argument, left-padded with the specified string.
 
 .. _make-set-function:
 
 MAKE_SET
 --------
 
-Return a set of comma-separated strings that have the corresponding bit in bits set.
+
 
 .. _match-function:
 
 MATCH
 -----
 
-Perform full-text search.
 
 .. _mid-function:
 
 MID
 ---
 
-Return a substring starting from the specified position.
 
 .. _quote-function:
 
 QUOTE
 -----
 
-Escape the argument for use in an SQL statement.
 
 .. _repeat-function:
 
 REPEAT
 ------
 
-Repeat a string the specified number of times.
 
 .. _replace-function:
 
 REPLACE
 -------
 
-The REPLACE() function returns a string with all occurrences of the 'from_str' replaced by 'to_str'. REPLACE is case-sensitive when searching for 'from_str'.
-
-Syntax:
-
-REPLACE(str,from_str,to_str)
-
-For example:
-
-.. code-block:: mysql
-	
-	SELECT REPLACE('www.google.com', 'w', 'v');
-
-Returns: vvv.google.com
+
 
 .. _reverse-function:
 
 REVERSE
 -------
 
-This function returns a string argument with the characters in reverse order.
-
-.. code-block:: mysql
-
-	SELECT REVERSE('abcd');
-
-Returns: dcba
+
+
 
 .. _right-function:
 
 RIGHT
 -----
 
-Return the specified rightmost number of characters
+
 
 .. _rpad-function:
 
 RPAD
 ----
 
-Append string the specified number of times
+
+
 
 .. _soundex-function:
 
 SOUNDEX
 -------
 
-Return a soundex string
+
+
 
 .. _substr-function:
 
 SUBSTR
 ------
 
-Synonym for SUBSTRING().
+
 
 .. _substring-function:
 
 SUBSTRING
 ---------
 
-Returns the substring as specified
-
-Examples that use SUBSTRING() in the SELECT clause:
-
-The SUBSTRING() function is used to extract a character string (using a given starting position and a given length).
-
-.. code-block:: mysql
-
-	SELECT  
-        SUBSTRING(course_designater,6,3) as 'Course number'                   
-	FROM Courses
-	WHERE course_designater LIKE 'Excel%' 
-	LIMIT 10;    
-
-You can also format a column using SUBSTRING() in combination with functions like LOWER() and UPPER().
-
-.. code-block:: mysql
-
-	SELECT 
-	CONCAT(UPPER(SUBSTRING(lastname,1,1)),
-  	LOWER(SUBSTRING(lastname,2,29)))
-	FROM Students
-	LIMIT 10;
 
 .. _substring-index-function:
 
@@ -173,4 +128,4 @@
 SUBSTRING_INDEX
 ---------------
 
-Return a substring from a string before the specified number of occurrences of the delimiter.
+
 
=== modified file 'docs/functions/string/position.rst'
--- docs/functions/string/position.rst	2011-09-15 13:56:15 +0000
+++ docs/functions/string/position.rst	2012-06-19 08:53:18 +0000
@@ -1,114 +1,5 @@
 Position Functions
 ==================
 
-.. _field-function:
-
-FIELD
------
-
-The FIELD function returns the index (position) of string arguments (str1, str2, str3, ...) 
-
-It returns 0 if the str value is not found.
-
-If each argument is a string, all arguments will be compared as strings, whereas if arguments are numbers, they will be compared as numbers.
-
-Otherwise, the arguments are compared as double.
-
-If str is NULL, the return value is 0 because NULL fails equality comparison with any value. FIELD() is the complement of ELT().
-
-.. code-block:: mysql
-
-	SELECT FIELD('ej', 'Hej', 'ej', 'Heja', 'hej', 'foo');
-
-Returns 2
-
-.. code-block:: mysql
-	
-	SELECT FIELD('fo', 'Hej', 'ej', 'Heja', 'hej', 'foo');
-
-Returns 0
-
-.. _find-in-set-function:
-
-FIND_IN_SET
------------
-
-Return the index position of the first argument within the second argument
-
-.. code-block:: mysql
-
-	SELECT FIND_IN_SET('2', '1,2,3,4');
-        	-> 2
-	SELECT FIND_IN_SET('1', '123');
-        	-> 0
-        	
-.. _instr-function:
-
-INSTR
------
-
-INSTR(str, substr) returns the index of the first occurrence of substring str in string substr. Note that this works like LOCATE except the order of the arguments is reversed:
-
-.. code-block:: mysql
-
-	SELECT INSTR('tacosalad', 'salad');
-        	-> 5
-	SELECT INSTR('burger', 'salad');
-        	-> 0
-
-.. _left-function:
-
-LEFT
-----
-
-Return the leftmost number of characters as specified
-
-.. code-block:: mysql
-
-	SELECT LEFT('drizzled', 7);
-        	-> 'drizzle'
-
-.. _insert-function:
-
-INSERT
-------
-
-This function inserts a substring at the specified position up to the specified number of characters.
-
-INSERT(str,pos,len,newstr)
-
-It returns str (a string), with the substring beginning at pos (position) and len (how many characters long) replaced by the newstr. 
-
-* INSERT returns the original string if pos is not within the length of the string
-* It replaces the rest of the string from position pos if len is not within the length of the rest of the string
-* It returns NULL if any argument is NULL
-
-.. code-block:: mysql
-
-	SELECT INSERT('Aquatic', 3, 2, 'Me');
-       		-> 'AqMetic'
-	SELECT INSERT('Aquatic', -1, 4, 'This');
-        	-> 'Aquatic'
-	SELECT INSERT('Aquatic', 3, 100, 'This');
-        	-> 'AqThis'
-
-.. _locate-function:
-
-LOCATE
-------
-
-Return the position of the first occurrence of substring.
-
-.. code-block:: mysql
-
-	SELECT LOCATE('salad', 'tacosalad');
-        	-> 5
-	SELECT LOCATE('burger', 'salad');
-        	-> 0
-
-.. _position-function:
-
-POSITION
---------
-
-A synonym for LOCATE()
+
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/groupby.rst'
--- docs/groupby.rst	2011-10-23 16:01:37 +0000
+++ docs/groupby.rst	2012-06-19 08:53:18 +0000
@@ -1,9 +1,7 @@
 GROUP BY
 ========
 
-The GROUP BY clause is used to extract only those records that fulfill a specified criterion.
-
-SQL GROUP BY Syntax
+'TODO'
 
 .. code-block:: mysql
 
@@ -12,78 +10,4 @@
 	WHERE column_name operator value
 	GROUP BY column_name
 
-**GROUP BY Clause Example**
-
-The "Activities" table:
-
-+---------+--------------+--------------+-------------+----------+
-|Id       |ActivityDate  |ActivityType  |ActivityCost | userID   |
-+=========+==============+==============+=============+==========+
-| 1       |2011-01-02    | Sport        |45           |131       |
-+---------+--------------+--------------+-------------+----------+
-| 2       |2011-01-02    | Art          |10           |256       |
-+---------+--------------+--------------+-------------+----------+
-| 3       |2011-01-02    | Music        |25           |022       |
-+---------+--------------+--------------+-------------+----------+
-| 4       |2011-01-02    | Food         |125          |022       |
-+---------+--------------+--------------+-------------+----------+
-| 5       |2011-01-03    | Music        |40           |131       |
-+---------+--------------+--------------+-------------+----------+
-| 6       |2011-01-03    | Food         |20           |175       |
-+---------+--------------+--------------+-------------+----------+
-
-Running the following simple query
-
-.. code-block:: mysql
-
-	SELECT userID
-	FROM activities
-	GROUP BY userID;
-
-Returns:
-
-+---------+
-| userID  |
-+=========+
-| 131     |
-+---------+
-| 256     |
-+---------+
-| 022     |
-+---------+
-| 175     |
-+---------+
-
-(This shows that GROUP BY accepts a column_name and consolidates like customer values.)
-
-However, GROUP BY is much more powerful when used with an aggregate function. Let's say you want to find the total amount spent by each unique User.
-
-You could use the following SQL statement:
-
-.. code-block:: mysql
-
-	SELECT userID,SUM(ActivityCost) AS "Activity Total"
-	FROM Activities
-	GROUP BY userID;
-
-The result-set will look like this:
-
-======    ==============
-userID    Activity Total
-======    ==============
-131       85
-256       10
-022       150
-175       20
-======    ==============
-
-With the aggregate SUM() function, SQL can calculate how much each unique user has spent on activities over time.
-
-We can also use the GROUP BY statement on more than one column, like this:
-
-.. code-block:: mysql
-
-	SELECT userID,ActivityDate,SUM(ActivityCost)
-	FROM Activities
-	GROUP BY userID,ActivityDate;
-
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/having.rst'
--- docs/having.rst	2011-10-23 16:01:37 +0000
+++ docs/having.rst	2012-06-19 08:53:18 +0000
@@ -1,9 +1,7 @@
 HAVING
 ======
 
-The WHERE keyword cannot be used with aggregate functions, but the HAVING clause can be; this is its primary use.
-
-SQL HAVING Syntax:
+'TODO'
 
 .. code-block:: mysql
 
@@ -13,58 +11,4 @@
 	GROUP BY column_name
 	HAVING aggregate_function(column_name) operator value
 
-**SQL HAVING Example**
-
-Take a look at the "Activities" table:
-
-+---------+--------------+--------------+-------------+----------+
-|Id       |ActivityDate  |ActivityType  |ActivityCost | userID   |
-+=========+==============+==============+=============+==========+
-| 1       |2011-01-02    | Sport        |45           |131       |
-+---------+--------------+--------------+-------------+----------+
-| 2       |2011-01-02    | Art          |10           |256       |
-+---------+--------------+--------------+-------------+----------+
-| 3       |2011-01-02    | Music        |25           |022       |
-+---------+--------------+--------------+-------------+----------+
-| 4       |2011-01-02    | Food         |125          |022       |
-+---------+--------------+--------------+-------------+----------+
-| 5       |2011-01-03    | Music        |40           |131       |
-+---------+--------------+--------------+-------------+----------+
-| 6       |2011-01-03    | Food         |20           |175       |
-+---------+--------------+--------------+-------------+----------+
-
-In order to find if any users have spent more than $100 on recreational activities, use the following SQL statement:
-
-.. code-block:: mysql
-
-	SELECT userID,SUM(ActivityCost) FROM Activities
-	GROUP BY userID
-	HAVING SUM(ActivityCost)>100;
-
-The result-set will look like this:
-
-======    ===============
-userID    SUM(OrderPrice)
-======    ===============
-022       150
-======    ===============
-
-Now we want to find if userIDs "131", "256", or "175" spent less than $50 on Activities.
-
-We add an ordinary WHERE clause to the SQL statement:
-
-.. code-block:: mysql
-
-	SELECT userID,SUM(ActivityCost) FROM Activities
-	WHERE userID='131' OR userID='256' OR userID="175"
-	GROUP BY userID
-	HAVING SUM(ActivityCost)<50;
-
-The result-set would be:
-
-======    ===============
-userID    SUM(OrderPrice)
-======    ===============
-256       10
-175       20
-======    ===============
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/insert.rst'
--- docs/insert.rst	2011-03-30 03:12:02 +0000
+++ docs/insert.rst	2012-06-19 08:53:18 +0000
@@ -1,37 +1,4 @@
 Inserting Data
 ==============
 
-In Drizzle you can make use of INSERT in order to insert data into a table.
-
-A type query:
-
-.. code-block:: mysql
-
-   INSERT INTO A VALUES ("1");
-
-INSERT statements that use VALUES syntax can insert multiple rows. To do this, use the multi row VALUES syntax (include multiple lists of column values, each enclosed within parentheses and separated by commas):
-
-.. code-block:: mysql
-
-	INSERT INTO music (artist, album, date_prod, genre) VALUES
-    	('Beatles', 'Abbey Road', '1969-09-26', 'rock'),
-   	('The Velvet Underground', 'The Velvet Underground', '1969-03-05', 'rock');
-
-or:
-
-.. code-block:: mysql
-	
-	INSERT INTO table_1 (a,b,c) VALUES(1,2,3),(4,5,6),(7,8,9);
-
-The following statement is incorrect since the number of values in the list does not match the number of column names:
-
-.. code-block:: mysql
-
-	INSERT INTO table_1 (a,b,c) VALUES(1,2,3,4,5,6,7,8,9);
-
-VALUE is a synonym for VALUES where performing a single or multirow INSERT.
-
-Performance
------------
-
-A multi-row INSERT involving three rows will require roughly one third of the time required to execute the three single-row statements. This performance improvement can become quite significant over a large number of statements. 
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/join.rst'
--- docs/join.rst	2011-11-06 00:00:03 +0000
+++ docs/join.rst	2012-06-19 08:53:18 +0000
@@ -1,60 +1,7 @@
 JOIN
 ====
 
-The JOIN keyword is used in an SQL statement to query data from two or more tables, based on a relationship between certain columns in these tables.
-
-Queries can access multiple tables at once, or access the same table in such a way that multiple rows of the table are being processed at the same time. For instance, in order to list all the 'interest' records together with the location of the associated city. To do this, it's necessary to compare the city column of each row of the 'Interests" table with the name column of all rows in the cities table, and select the pairs of rows where these values match. As such, a JOIN statement involves combining records from two tables by using values common to each. 
-
-Take the "Interests" table:
-
-+---------+--------------+--------------+-------------+----------+
-|Id       |DateAdded     |InterestType  |Name         | userID   |
-+=========+==============+==============+=============+==========+
-| 1       |2011-01-02    | Sport        |45           |2         |
-+---------+--------------+--------------+-------------+----------+
-| 2       |2011-01-02    | Art          |10           |4         |
-+---------+--------------+--------------+-------------+----------+
-| 3       |2011-01-02    | Music        |25           |1         |
-+---------+--------------+--------------+-------------+----------+
-| 4       |2011-01-02    | Food         |125          |1         |
-+---------+--------------+--------------+-------------+----------+
-| 5       |2011-01-03    | Music        |40           |2         |
-+---------+--------------+--------------+-------------+----------+
-| 6       |2011-01-03    | Food         |20           |3         |
-+---------+--------------+--------------+-------------+----------+
-
-
-Note that the "Id" column is the primary key in the "Persons" table. This means that no two rows can have the same "Id"; it distinguishes two interests even if they have the same name or userID.
-
-Next, we have the "Persons" table:
-
-+---------+------------+----------+----------+--------+
-|userId	  |LastName    |FirstName |Address   |  City  |
-+=========+============+==========+==========+========+
-| 1 	  | Larson     | Sue      |3 Cherry  | Chicago|
-+---------+------------+----------+----------+--------+
-| 2 	  | Roberts    | Teri 	  |21 Brown  | Chicago|
-+---------+------------+----------+----------+--------+
-| 3 	  | Peterson   | Kari 	  |30 Mell   | Reno   |
-+---------+------------+----------+----------+--------+
-| 4	  | Anderson   | Kyle 	  |435 Tyler | Dayton |
-+---------+------------+----------+----------+--------+
-
-The "userID" column is the primary key in the "Persons" table; in the "Persons" table, it can be used to identify users without using their names. Therefore, the relationship between the two tables above is the "userId" column.
-
-Different kinds of SQL JOINs
-----------------------------
-
-Here are the types of JOIN you can use, and the differences between them:
-
-	**JOIN:** Return rows when there is at least one match in both tables
-
-	**LEFT JOIN:** Return all rows from the left table, even if there are no matches in the right table
-
-	**RIGHT JOIN:** Return all rows from the right table, even if there are no matches in the left table
-
-	**CROSS JOIN:** Return rows when there is a match in one of the tables
-
+'TODO'
 
 .. note::
    Implicit cartesian products of the form ``SELECT * FROM t1, t2``
 
=== modified file 'docs/load_data_infile.rst'
--- docs/load_data_infile.rst	2011-03-17 16:54:26 +0000
+++ docs/load_data_infile.rst	2012-06-19 08:53:18 +0000
@@ -1,39 +1,4 @@
 LOAD DATA INFILE
 =================
 
-While the INSERT statement loads one record at a time into a table, LOAD DATA INFILE imports data from an external text file into a table, and does so very rapidly. The file name must be given as a literal string.
-
-For example:
-
-.. code-block:: mysql
-
-	LOAD DATA LOCAL INFILE '/home/user/names.txt' INTO TABLE names;
-
-Then check that your data was loaded correctly:
-
-.. code-block:: mysql
-
-	SELECT * FROM names;
-
-Options
---------
-
-LOAD DATA INFILE has some options that can be used to specify the format for the text file and how the data is imported. Above, the LOCAL option specifies the client machine as the location of the text file. When connecting to a Drizzle server, the file will be read directly from the server as long as the LOCAL option is omitted.
-
-The REPLACE option replaces table rows with the same primary key in the text file. For example:
-
-.. code-block:: mysql
-
-	LOAD DATA LOCAL INFILE '/home/user/names.txt' REPLACE INTO TABLE names;
-
-The IGNORE option says to skip any rows that duplicate existing rows with the same primary key, and follows the same syntax as REPLACE. The IGNORE number LINES option can be used to ignore lines at the start of the file. For example, you can use IGNORE 1 LINES to skip over a row containing column names:
-
-.. code-block:: mysql
-
-	LOAD DATA LOCAL INFILE '/home/user/names.txt' INTO TABLE names IGNORE 1 LINES;
-
-The FIELDS TERMINATED BY option can be used when importing from a comma separated value (CSV) file. (It specifies that the fields will be separated by a character other than a tab, such as a comma.) For example:
-
-.. code-block:: mysql
-
-	LOAD DATA LOCAL INFILE '/home/user/names.csv' REPLACE INTO TABLE names FIELDS TERMINATED BY ',';
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/orderby.rst'
--- docs/orderby.rst	2011-10-23 16:01:37 +0000
+++ docs/orderby.rst	2012-06-19 08:53:18 +0000
@@ -1,7 +1,7 @@
 ORDER BY
 ========
 
-The ORDER BY keyword is used to sort the result-set by column; by default, it sorts the records in ascending order.
+'TODO'
 
 SQL ORDER BY Syntax:
 
@@ -11,49 +11,4 @@
 	FROM table_name
 	ORDER BY column_name(s) ASC|DESC;
 
-**ORDER BY Example**
-
-The "Persons" table:
-
-+---------+------------+----------+----------+--------+
-|Id 	  |LastName    |FirstName |Address   |  City  |
-+=========+============+==========+==========+========+
-| 1 	  | Larson     | Sue      |3 Cherry  | Chicago|
-+---------+------------+----------+----------+--------+
-| 2 	  | Roberts    | Teri 	  |21 Brown  | Chicago|
-+---------+------------+----------+----------+--------+
-| 3 	  | Peterson   | Kari 	  |30 Mell   | Reno   |
-+---------+------------+----------+----------+--------+
-
-To select all the persons from the table above, and also sort them by their last name, use the following SELECT statement:
-
-.. code-block:: mysql
-
-	SELECT * FROM Persons
-	ORDER BY LastName;
-
-The result-set will look like this:
-
-+---------+------------+----------+----------+--------+
-|Id 	  |LastName    |FirstName |Address   |  City  |
-+=========+============+==========+==========+========+
-| 1 	  | Larson     | Sue      |3 Cherry  | Chicago|
-+---------+------------+----------+----------+--------+
-| 3 	  | Peterson   | Kari 	  |30 Mell   | Reno   |
-+---------+------------+----------+----------+--------+
-| 2 	  | Roberts    | Teri 	  |21 Brown  | Chicago|
-+---------+------------+----------+----------+--------+
-
-Without using "ORDERBY" in the following query, the result-set will be non-deterministic, and could returned matching rows in a different order for each query. 
-
-ORDER BY DESC can be used to reverse the order of the result set.
-
-.. code-block:: mysql
-
-	SELECT * FROM Persons
-	ORDER BY LastName DESC;
-
-
-.. todo::
-
-   add something about how ORDER BY is executed. index scan vs filesort
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/queries.rst'
--- docs/queries.rst	2011-02-15 22:03:42 +0000
+++ docs/queries.rst	2012-06-19 08:53:18 +0000
@@ -1,18 +1,13 @@
 Executing Queries
 =================
 
-Queries retrieve data from a database based on specific criteria. They
-are performed with the declarative SELECT statement, which has no
-persistent effects on the database. SELECT simply retrieves data from
-one or more tables, or expressions.
-
-A query includes a list of columns to be included in a result set; an example of this would be:
+'TODO'
 
 .. code-block:: mysql
 
 	SELECT * FROM table_name;
 
-SELECT * FROM is an example of using SELECT with clauses. The select clause specifies the columns you want to retrieve. The from clause specifies the tables to search. 
+'TODO' 
 
 Keywords and clauses include:
 
@@ -34,8 +29,4 @@
 	FROM table_name
 	WHERE first_column_name > 1000;
 
-The column names that follow the SELECT keyword determine the columns that will be returned in the results. You can select as many column names that you'd like, or you can use a * to select all columns (as shown in the first example above). The order in which they are specified will be reflected in your query results.
-
-The table name that follows the keyword FROM specifies the table that will be queried to retrieve the desired results.
-
-The WHERE clause (optional) specifies the data values or rows to be returned or displayed, based on the criteria described after the keyword WHERE.
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/rename.rst'
--- docs/rename.rst	2011-11-06 00:00:03 +0000
+++ docs/rename.rst	2012-06-19 08:53:18 +0000
@@ -1,23 +1,13 @@
 RENAME
 ======
 
-Rename a table, or group of tables.
-
-If you have an existing table old_name, you can create another table new_name; it will be empty but reptant he same structure, and then replace the existing table with the empty one as follows (assuming backup_table does not already exist):
+'TODO'
 
 .. code-block:: mysql
 
 	CREATE TABLE new_name (...);
 	RENAME TABLE old_name TO backup_table, new_name TO old_name;
 
-When using a statement to rename more than one table, the order of operations are done from left to right. To swap two table names, use the following (assuming tmp_table does not already exist):
-
-.. code-block:: mysql
-
-	RENAME TABLE old_name TO tmp_table,
-        new_name TO old_name,
-        tmp_table TO new_name;
-
-While RENAME is running, no other session can access any of the involved tables. 
+'TODO'
 
 .. seealso:: :doc:`/alter_table`
 
=== modified file 'docs/resources/ascii_chart.rst'
--- docs/resources/ascii_chart.rst	2011-02-23 15:33:37 +0000
+++ docs/resources/ascii_chart.rst	2012-06-19 08:53:18 +0000
@@ -1,103 +1,4 @@
 ASCII Conversion Chart
 =======================
 
-==========  ===========  =============  =================  ==================  
- Binary      Octal 	  Decimal        Hexadecimal 	    Character
-==========  ===========  =============  =================  ==================  
-100000	     40	          32	         20	            ``space character``
-100001	     41	          33	         21	            ``!``
-100010	     42	          34	         22	            ``"``
-100011	     43	          35	         23	            ``#``
-100100	     44 	  36	         24	            ``$``
-100101	     45	          37	         25	            ``%``
-100110	     46	          38	         26	            ``&``
-100111	     47	          39	         27	            ``'``
-101000	     50	          40	         28	            ``(``
-101001	     51	          41	         29	            ``)``
-101010	     52	          42	         2A	            ``*``
-101011	     53	          43	         2B	            ``+``
-101100	     54	          44	         2C	            ``,``
-101101	     55	          45	         2D		    ``-``
-101110	     56	          46	         2E		    ``.``
-101111	     57	          47	         2F		    ``/``
-110000	     60	          48	         30		    ``0``
-110001	     61	          49	         31		    ``1``
-110010	     62	          50	         32		    ``2``
-110011	     63	          51	         33		    ``3``
-110100	     64	          52	         34		    ``4``
-110101	     65	          53	         35	 	    ``5``
-110110	     66	          54	         36		    ``6``
-110111	     67	          55	         37		    ``7``
-111000	     70	          56	         38		    ``8``
-111001       71	          57	         39		    ``9``
-111010	     72	          58	         3A		    ``:``
-111011	     73	          59	         3B		    ``;``
-111100	     74	          60	         3C		    ``<``
-111101	     75	          61	         3D		    ``=``
-111110	     76	          62	         3E		    ``>``
-111111	     77	          63 	         3F		    ``?``
-1000000	     100	  64	         40		    ``@``
-1000001	     101	  65	         41		    ``A``
-1000010	     102	  66	         42		    ``B``
-1000011	     103	  67	         43		    ``C``
-1000100	     104	  68	         44		    ``D``
-1000101	     105	  69	         45		    ``E``
-1000110	     106	  70	         46		    ``F``
-1000111	     107	  71	         47		    ``G``
-1001000	     110	  72	         48		    ``H``
-1001001	     111	  73 	         49		    ``I``
-1001010	     112	  74	         4A		    ``J``
-1001011	     113	  75	         4B		    ``K``
-1001100	     114	  76	         4C		    ``L``
-1001101	     115	  77	         4D		    ``M``
-1001110	     116	  78 	         4E		    ``N``
-1001111	     117	  79	         4F		    ``O``
-1010000	     120	  80	         50		    ``P``
-1010001	     121	  81	         51		    ``Q``
-1010010	     122	  82	         52		    ``R``
-1010011	     123	  83	         53		    ``S``
-1010100	     124	  84	         54		    ``T``
-1010101	     125	  85	         55		    ``U``
-1010110	     126	  86	         56		    ``V``
-1010111	     127	  87	         57		    ``W``
-1011000	     130	  88	         58		    ``X``
-1011001	     131	  89	         59		    ``Y``
-1011010	     132	  90	         5A		    ``Z``
-1011011	     133	  91	         5B		    ``[``
-1011100	     134	  92	         5C		    ``\``
-1011101	     135	  93	         5D		    ``]``
-1011110	     136	  94	         5E		    ``^``
-1011111	     137	  95	         5F		    ``_``
-1100000	     140	  96	         60		    :literal:`\``
-1100001	     141	  97	         61		    ``a``
-1100010	     142	  98	         62		    ``b``
-1100011	     143	  99	         63		    ``c``
-1100100	     144	 100	         64		    ``d``
-1100101	     145	 101	         65		    ``e``
-1100110	     146	 102	         66		    ``f``
-1100111	     147 	 103	         67		    ``g``
-1101000	     150	 104	         68		    ``h``
-1101001	     151	 105	         69		    ``i``
-1101010	     152	 106	         6A		    ``j``
-1101011	     153	 107	         6B		    ``k``
-1101100	     154	 108	         6C		    ``l``
-1101101	     155	 109	         6D		    ``m``
-1101110	     156	 110	         6E		    ``n``
-1101111	     157	 111	         6F		    ``o``
-1110000	     160	 112	         70		    ``p``
-1110001	     161	 113	         71		    ``q``
-1110010	     162	 114	         72		    ``r``
-1110011	     163	 115	         73		    ``s``
-1110100	     164	 116	         74		    ``t``
-1110101	     165	 117	         75		    ``u``
-1110110	     166	 118	         76		    ``v``
-1110111	     167	 119	         77		    ``w``
-1111000	     170	 120	         78		    ``x``
-1111001	     171	 121	         79		    ``y``
-1111010	     172	 122	         7A		    ``z``
-1111011	     173	 123	         7B		    ``{``
-1111100	     174	 124	         7C		    ``|``
-1111101	     175	 125	         7D		    ``}``
-1111110	     176	 126	         7E		    ``~``
-==========  ===========  =============  =================  ==================  
-	 
+'TODO'	 
 
=== modified file 'docs/savepoints.rst'
--- docs/savepoints.rst	2011-02-15 22:03:42 +0000
+++ docs/savepoints.rst	2012-06-19 08:53:18 +0000
@@ -1,11 +1,11 @@
 SAVEPOINT
 =========
 
-A savepoint is a marker inside a transaction that allows all commands that are executed after it was established to be rolled back. It effectively restores the transaction state to what it was at the time of the savepoint. ::
+'TODO' ::
 
 	SAVEPOINT identifier
 
-This sets a savepoint that can be returned to in the current transaction. The "identifier" is the name given to the new savepoint. If the identifier has already been used then the original identifier is replaced. Example:
+'TODO'
 
 .. code-block:: mysql
 
@@ -15,4 +15,4 @@
      INSERT INTO t1 values (2);
      ROLLBACK TO SAVEPOINT A;
 
-Will only roll back the second insert statement.
+'TODO'
 
=== modified file 'docs/start_transaction.rst'
--- docs/start_transaction.rst	2011-02-23 13:08:09 +0000
+++ docs/start_transaction.rst	2012-06-19 08:53:18 +0000
@@ -1,7 +1,7 @@
 START TRANSACTION
 ======================
 
-A transaction can be started with either the BEGIN or START TRANSACTION statements. It can also be started by any statement when AUTOCOMMIT is disabled. A transaction can then run until either the connection to the database is dropped (in which case it is rolled back), or an explicit rollback or a commit command is sent.
+'TODO'
 
 .. code-block:: mysql
 
 
=== modified file 'docs/string_data_types.rst'
--- docs/string_data_types.rst	2011-03-17 17:15:30 +0000
+++ docs/string_data_types.rst	2012-06-19 08:53:18 +0000
@@ -1,12 +1,11 @@
 String Data Types
 =================
 
-The string types in Drizzle are explained in the following groupings:
 
 VARCHAR and VARBINARY
 ---------------------
 
-A VARCHAR or VARBINARY type is used to store variable length data. Indexes on these types are by default the full length of the data stored. The only difference between the two types is the COLLATION which is used. VARBINARY uses a binary collation for all index usage.
+'TODO'
 
 .. note::
 
@@ -16,15 +15,15 @@
 TEXT and BLOB
 -------------
 
-A TEXT or BLOB type is used to store data which is over XXX in size. Indexes on these types must specify the number of character or bytes which should be used. The only difference between the two types is the COLLATION which is used. A BLOB uses a binary collation for all index usage.
+'TODO'
 
 ENUM
 ----
 
-Enum (enumerated) types are static lists of strings that are defined on table creation. They can be used to represent a collection of string types that are sorted based on the order that they are created.
+'TODO'
 
 
 UTF-8
 ------
 
-Drizzle stores its string data in an UTF-8 format, and does not support a multitude of language encodings and collations.
 \ No newline at end of file
+'TODO'
 \ No newline at end of file
 
=== modified file 'docs/tables.rst'
--- docs/tables.rst	2011-01-14 05:11:22 +0000
+++ docs/tables.rst	2012-06-19 08:53:18 +0000
@@ -1,17 +1,7 @@
 Tables
 ======
 
-A table makes up a collection of :doc:`/columntypes` that
-can be joined together in order to create relational result sets. 
-
-Each record in the table is called a row, and a table can have an infinite
-set of rows. Each row represents one piece of data, and each column can
-be thought of as representing a component of that piece of data. 
-
-So, for example, if we have a table for a customer information, then
-the columns may include information such as First Name, Last Name,
-Address, City, Country, Birth Date, and so on. As a result, tables have
-column headers, which specify the data types for that particular column.
+'TODO'
 
 .. toctree:: 
 	:maxdepth: 2
 
=== modified file 'docs/transactional.rst'
--- docs/transactional.rst	2011-02-23 13:08:09 +0000
+++ docs/transactional.rst	2012-06-19 08:53:18 +0000
@@ -9,7 +9,7 @@
    rollback
    savepoints
 
-The essence of a transaction is that it groups multiple steps into a single, all-or-nothing operation. Drizzle is a transactional database by default and by design, meaning that changes and queries to the database appear to be Atomic, Consistent, Isolated, and Durable (ACID). This means that Drizzle implements `serializable <http://en.wikipedia.org/wiki/Serializability>`_, ACID transactions, even if the transaction is interrupted.
+Drizzle is a transactional database by default and by design, meaning that changes and queries to the database appear to be Atomic, Consistent, Isolated, and Durable (ACID). This means that Drizzle implements `serializable <http://en.wikipedia.org/wiki/Serializability>`_, ACID transactions, even if the transaction is interrupted.
 
 NOTE: Drizzle still supports non-transactional storage engines, and if these are used then you will not get transactional behaviour with them. The default engine is transactional.
 
 
=== modified file 'docs/update.rst'
--- docs/update.rst	2011-02-16 22:57:39 +0000
+++ docs/update.rst	2012-06-19 08:53:18 +0000
@@ -1,20 +1,4 @@
 Updating Data
 =============
 
-In Drizzle you can make use of UPDATE to modify an existing record in a table.
-
-An example query:
-
-.. code-block:: mysql
-
-   UPDATE TABLE_1 SET a="1" WHERE <condition>;
-
-Multi-table delete and multi-table update code was removed from Drizzle.
-
-Multi-update/delete can be accomplished through subqueries. For example:
-
-.. code-block:: mysql
-
-	UPDATE tableX SET tableXfield = (SELECT MAX(tableY.tableYfield) FROM tableY WHERE tableX.tableXfield = tableY.tableYfield)
-
-In other database frameworks, multi-update and multi-delete are used to change information in *one* table, but the rows to change are determined by using more than one table. In that case, subqueries work to address the issue of changing information in one table based on information in more than one table.
+'TODO'
 
=== modified file 'docs/uuid_data_type.rst'
--- docs/uuid_data_type.rst	2011-02-24 14:52:15 +0000
+++ docs/uuid_data_type.rst	2012-06-19 08:53:18 +0000
@@ -1,16 +1,6 @@
 UUID Data Type
 ==============
 
-The data type uuid stores Universally Unique Identifiers (UUID). Some systems refer to this data type as "globally unique identifier", or GUID, instead. 
-
-This identifier is a 128-bit quantity that is generated by an algorithm designed to make it very unlikely that the same identifier will be generated by anyone else in the world using the same algorithm. The purpose of UUIDs is to enable distributed systems to uniquely identify information without significant central coordination. 
-
-sequence generators, which are only unique within a single database.
-
-A UUID consists of 32 hexadecimal digits, displayed in 5 groups separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 digits and 4 hyphens). For example:
-
-550e8400-e29b-41d4-a716-446655440000
-
-UUIDs are documented as part of ISO/IEC 11578:1996 "Information technology – Open Systems Interconnection – Remote Procedure Call (RPC)" and more recently in ITU-T Rec. X.667 | ISO/IEC 9834-8:2005. The IETF published Standards Track :rfc:`4122` that is technically equivalent with ITU-T Rec. X.667 | ISO/IEC 9834-8.
+'TODO'
 
 Drizzle uses libuuid to generate UUID values.
 
=== modified file 'docs/where.rst'
--- docs/where.rst	2011-10-23 16:01:37 +0000
+++ docs/where.rst	2012-06-19 08:53:18 +0000
@@ -1,9 +1,7 @@
 WHERE
 =====
 
-The WHERE clause is used to extract only those records that fulfill a specified criterion.
-
-Simple SQL WHERE Syntax:
+'TODO'
 
 .. code-block:: mysql
 
@@ -11,33 +9,4 @@
 	FROM table_name
 	WHERE column_name operator value
 	
-**Simple WHERE Clause Example**
-
-The "Persons" table:
-
-+---------+------------+----------+----------+--------+
-|Id 	  |LastName    |FirstName |Address   |  City  |
-+=========+============+==========+==========+========+
-| 1 	  | Larson     | Sue      |3 Cherry  | Chicago|
-+---------+------------+----------+----------+--------+
-| 2 	  | Roberts    | Teri 	  |21 Brown  | Chicago|
-+---------+------------+----------+----------+--------+
-| 3 	  | Peterson   | Kari 	  |30 Mell   | Reno   |
-+---------+------------+----------+----------+--------+
- 
-If you want to select only the persons living in the city "Chicago" from the table above, use the following SELECT statement:
-
-.. code-block:: mysql
-
-	SELECT * FROM Persons
-	WHERE City='Chicago'
-
-The result-set will look like this:
-
-+---------+------------+----------+----------+--------+
-| Id 	  |LastName    |FirstName |Address   |City    |
-+=========+============+==========+==========+========+
-|1 	  | Larson     | Sue 	  |3 Cherry  | Chicago|
-+---------+------------+----------+----------+--------+
-|2 	  | Roberts    | Teri 	  |21 Brown  | Chicago|
-+---------+------------+----------+----------+--------+
+'TODO' (examples)
 \ No newline at end of file