lp://staging/~fallenpegasus/drizzle/drizzle-docfix

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~drizzle-trunk/drizzle/development at revision 2452

Drizzle Merge Team: Pending requested 2011-11-06

Diff: 224 lines (+51/-19)

13 files modified

docs/alter_schema.rst (+1/-3)
docs/clients/drizzledump.rst (+1/-0)
docs/configuration/options.rst (+6/-1)
docs/configuration/values.rst (+4/-1)
docs/configuration/variables.rst (+6/-1)
docs/join.rst (+3/-1)
docs/rename.rst (+1/-2)
plugin/auth_all/docs/index.rst (+0/-2)
plugin/auth_file/docs/index.rst (+7/-2)
plugin/auth_http/docs/index.rst (+4/-1)
plugin/auth_ldap/docs/index.rst (+4/-1)
plugin/auth_pam/docs/index.rst (+10/-3)
plugin/auth_schema/docs/index.rst (+4/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2450. By Mark Atwood on 2011-11-06

RST admonitions like note and warning should have a new line before the content

2449. By Mark Atwood on 2011-10-27

merge lp:~olafvdspek/drizzle/refactor8

2448. By Mark Atwood on 2011-10-27

merge lp:~daniel-nichter/drizzle/7.1-docs

2447. By Mark Atwood on 2011-10-25

merge lp:~olafvdspek/drizzle/refactor7

2446. By Patrick Crews on 2011-10-25

2011.10.28 tarball + translations update

2445. By Mark Atwood on 2011-10-21

merge lp:~olafvdspek/drizzle/refactor6

2444. By Mark Atwood on 2011-10-20

merge lp:~brianaker/drizzle/syslog-refactor

2443. By Mark Atwood on 2011-10-19

merge lp:~olafvdspek/drizzle/refactor5

2442. By Mark Atwood on 2011-10-18

merge lp:~olafvdspek/drizzle/refactor4

2441. By Mark Atwood on 2011-10-17

merge lp:~dshrews/drizzle/bug867866