Merge branch 'ocelot-master' into 1.6
Conflicts: doc/sphinx/book/connectors/__c.rst
No related branches found
No related tags found
Showing
- doc/sphinx/book/administration.rst 186 additions, 1 deletiondoc/sphinx/book/administration.rst
- doc/sphinx/book/app/a-errcodes.rst 44 additions, 62 deletionsdoc/sphinx/book/app/a-errcodes.rst
- doc/sphinx/book/app/c-lua_tutorial.rst 1 addition, 1 deletiondoc/sphinx/book/app/c-lua_tutorial.rst
- doc/sphinx/book/app/d-plugins.rst 5 additions, 2 deletionsdoc/sphinx/book/app/d-plugins.rst
- doc/sphinx/book/box/authentication.rst 2 additions, 2 deletionsdoc/sphinx/book/box/authentication.rst
- doc/sphinx/book/box/box_introspection.rst 1 addition, 1 deletiondoc/sphinx/book/box/box_introspection.rst
- doc/sphinx/book/box/box_schema.rst 20 additions, 18 deletionsdoc/sphinx/book/box/box_schema.rst
- doc/sphinx/book/box/box_space.rst 199 additions, 162 deletionsdoc/sphinx/book/box/box_space.rst
- doc/sphinx/book/box/index.rst 94 additions, 115 deletionsdoc/sphinx/book/box/index.rst
- doc/sphinx/book/box/limitations.rst 1 addition, 1 deletiondoc/sphinx/book/box/limitations.rst
- doc/sphinx/book/box/sophia_diff.rst 13 additions, 12 deletionsdoc/sphinx/book/box/sophia_diff.rst
- doc/sphinx/book/box/triggers.rst 15 additions, 14 deletionsdoc/sphinx/book/box/triggers.rst
- doc/sphinx/book/configuration/cfg-replication.rst 4 additions, 2 deletionsdoc/sphinx/book/configuration/cfg-replication.rst
- doc/sphinx/book/configuration/index.rst 3 additions, 1 deletiondoc/sphinx/book/configuration/index.rst
- doc/sphinx/book/connectors/__c.rst 1 addition, 1 deletiondoc/sphinx/book/connectors/__c.rst
- doc/sphinx/book/connectors/__php.rst 5 additions, 7 deletionsdoc/sphinx/book/connectors/__php.rst
- doc/sphinx/book/connectors/__results.rst 80 additions, 76 deletionsdoc/sphinx/book/connectors/__results.rst
- doc/sphinx/book/replication/index.rst 65 additions, 70 deletionsdoc/sphinx/book/replication/index.rst
- doc/sphinx/book/user_guide_getting_started.rst 1 addition, 1 deletiondoc/sphinx/book/user_guide_getting_started.rst
- doc/sphinx/reference/box_once.rst 17 additions, 0 deletionsdoc/sphinx/reference/box_once.rst
Loading
Please register or sign in to comment