Merge lp://qastaging/~marisa-plumb/drizzle/doc into lp://qastaging/drizzle/7.0

Proposed by marisa plumb
Status: Merged
Approved by: Lee Bieber
Approved revision: 2069
Merged at revision: 2174
Proposed branch: lp://qastaging/~marisa-plumb/drizzle/doc
Merge into: lp://qastaging/drizzle/7.0
Diff against target: 983 lines (+750/-56)
21 files modified
docs/barriers.rst (+8/-18)
docs/create_table.rst (+1/-1)
docs/drop_schema.rst (+7/-8)
docs/functions/control_flow.rst (+27/-0)
docs/functions/overview.rst (+1/-0)
docs/functions/string.rst (+115/-9)
docs/functions/string/comparative.rst (+67/-0)
docs/functions/string/conversion.rst (+103/-0)
docs/functions/string/length.rst (+37/-0)
docs/functions/string/modification.rst (+71/-0)
docs/functions/string/other.rst (+127/-0)
docs/functions/string/position.rst (+54/-0)
docs/include.am (+1/-3)
docs/index.rst (+1/-0)
docs/installing/ubuntu.rst (+14/-9)
docs/resources/ascii_chart.rst (+103/-0)
docs/resources/index.rst (+8/-0)
docs/schemas.rst (+1/-1)
docs/show.rst (+1/-4)
docs/storage_engines.rst (+1/-1)
docs/update.rst (+2/-2)
To merge this branch: bzr merge lp://qastaging/~marisa-plumb/drizzle/doc
Reviewer Review Type Date Requested Status
Lee Bieber (community) Needs Fixing
Review via email: mp+49762@code.qastaging.launchpad.net

Description of the change

fixes ubuntu install doc according to bug 716062, and includes other doc changes

To post a comment you must log in.
2066. By marisa plumb

edits

Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :
review: Needs Fixing
2067. By marisa plumb

fixes warning

2068. By marisa plumb

drop schema and analyze table edits

2069. By marisa plumb

escaping character with backslash

Revision history for this message
marisa plumb (marisa-plumb) wrote :

warning was caused by a character in a definition that also has meaning as rst markup. in case it's helpful info....one can use backslash to escape such characters & get literal characters instead--http://docutils.sourceforge.net/docs/user/rst/quickref.html#escaping

Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :

Need to re-merge with trunk

Conflict adding file docs/functions/control_flow.rst. Moved existing file to docs/functions/control_flow.rst.moved.
Conflict adding file docs/functions/string. Moved existing file to docs/functions/string.moved.
Conflict adding file docs/resources. Moved existing file to docs/resources.moved.
3 conflicts encountered.

review: Needs Fixing
2070. By marisa plumb

updating to trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches