Merge lp:~hingo/drizzle/7.1-docs-reviewfixes into lp:~drizzle-trunk/drizzle/development

Proposed by Henrik Ingo
Status: Merged
Approved by: Mark Atwood
Approved revision: 2458
Merged at revision: 2460
Proposed branch: lp:~hingo/drizzle/7.1-docs-reviewfixes
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 524 lines (+221/-122)
11 files modified
docs/administration/authentication.rst (+25/-13)
docs/administration/authorization.rst (+22/-4)
docs/administration/drizzled.rst (+12/-4)
docs/administration/logging.rst (+5/-5)
docs/administration/plugins.rst (+66/-31)
docs/configuration/options.rst (+15/-10)
docs/contributing/more_ways.rst (+3/-1)
docs/installing/from_source.rst (+67/-30)
docs/installing/redhat.rst (+0/-20)
plugin/auth_pam/docs/index.rst (+4/-4)
plugin/js/docs/index.rst (+2/-0)
To merge this branch: bzr merge lp:~hingo/drizzle/7.1-docs-reviewfixes
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+82231@code.launchpad.net

Description of the change

Fixes to Daniel's new documentation as discussed / reviewed on drizzle-discuss.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'docs/administration/authentication.rst'
--- docs/administration/authentication.rst 2011-10-23 17:13:20 +0000
+++ docs/administration/authentication.rst 2011-11-14 22:39:27 +0000
@@ -2,26 +2,38 @@
2==============2==============
33
4Authentication is any process by which you verify that someone is who they4Authentication is any process by which you verify that someone is who they
5claim they are. [1]_ Drizzle authentication is handled by plugins; there5claim they are. [1]_
6are no grant or privilege tables.6
77Drizzle authentication is handled by plugins; by default there is no single
8One or more authentication plugin must be loaded, else no connections can8source where users are defined, such as a system user table, but each
9authentication plugin will use different sources to verify the usernames
10and passwords. (The plugin auth_schema does however keep users in a table inside
11Drizzle, much like the familiar MySQL way of authenticating users works.).
12*Choosing an authentication plugin, configuring it, and disabling all other
13authentication plugins should be one of your first administrative tasks.*
14
15One or more authentication plugins must be loaded, else no connections can
9be made to Drizzle. On most systems, the :doc:`/plugins/auth_all/index`16be made to Drizzle. On most systems, the :doc:`/plugins/auth_all/index`
10plugin is loaded by default which, as its name suggests, allows all17plugin is loaded by default which, as its name suggests, allows all
11connections regardless of username or password. (Some distributions enable18connections regardless of username or password. (Some distributions enable
12the :doc:`/plugins/auth_file/index` plugin by default instead).19the :doc:`/plugins/auth_file/index` plugin by default instead).
1320
14`Choosing an authentication plugin, configuring it, and disabling all other21The :doc:`/plugins/auth_schema/index` plugin first shipped with ``Drizzle 7.1
15authentication plugins should be one of your first administrative tasks.`22Beta 2011.10.28``. This plugin provides an authentication method that is
23both secure and easy to use, and it is similar to how MySQL authentication
24works so will be familiar to many users. If you don't know which authentication
25plugin to use, you should start with configuring
26:doc:`/plugins/auth_schema/index`. Likewise we warmly recommend distributors to
27consider enabling this plugin by default.
1628
17The following authentication plugins are included with Drizzle:29The following authentication plugins are included with Drizzle:
1830
19* :doc:`/plugins/auth_all/index`31* :doc:`/plugins/auth_all/index` - Allow all connections without checking username or password.
20* :doc:`/plugins/auth_file/index`32* :doc:`/plugins/auth_file/index` - Define users and passwords in a text file that is read on startup.
21* :doc:`/plugins/auth_http/index`33* :doc:`/plugins/auth_http/index` - Authenticate the username and password against a http server.
22* :doc:`/plugins/auth_ldap/index`34* :doc:`/plugins/auth_ldap/index` - Define users and passwords in a LDAP directory.
23* :doc:`/plugins/auth_pam/index`35* :doc:`/plugins/auth_pam/index` - Authenticate the username and password against system user accounts via PAM.
24* :doc:`/plugins/auth_schema/index`36* :doc:`/plugins/auth_schema/index` - Define users and passwords in a system table.
2537
26Protocols38Protocols
27---------39---------
@@ -48,7 +60,7 @@
48:ref:`auth_all_plugin` Any60:ref:`auth_all_plugin` Any
49:ref:`auth_file_plugin` mysql61:ref:`auth_file_plugin` mysql
50:ref:`auth_http_plugin` mysql-plugin-auth62:ref:`auth_http_plugin` mysql-plugin-auth
51:ref:`auth_ldap_plugin` mysql-plugin-auth63:ref:`auth_ldap_plugin` Any
52:ref:`auth_pam_plugin` mysql-plugin-auth64:ref:`auth_pam_plugin` mysql-plugin-auth
53:ref:`auth_schema_plugin` mysql65:ref:`auth_schema_plugin` mysql
54========================= ==================66========================= ==================
5567
=== modified file 'docs/administration/authorization.rst'
--- docs/administration/authorization.rst 2011-10-23 05:45:09 +0000
+++ docs/administration/authorization.rst 2011-11-14 22:39:27 +0000
@@ -2,13 +2,31 @@
2=============2=============
33
4Authorization is finding out if the person, once identified, is permitted to4Authorization is finding out if the person, once identified, is permitted to
5have the resource. [1]_ Drizzle authorization is handled by plugins; there5have the resource. [1]_
6are no grant or privilege tables.6
7Drizzle authorization is handled by plugins. There is no single
8source where users or access rights are defined, such as a system user table,
9but each auhtorization plugin will use different sources to define or store
10access rights. By default no authorization plugin is loaded, this means that
11any logged in user is authorized to access all database objects and do anything
12he wants (everyone is super user).
713
8The following authorization plugins are included with Drizzle:14The following authorization plugins are included with Drizzle:
915
10* :doc:`/plugins/regex_policy/index`16* :doc:`/plugins/regex_policy/index` - ALLOW or REJECT access by matching a regular expression against the table name.
11* :doc:`/plugins/simple_user_policy/index`17* :doc:`/plugins/simple_user_policy/index` - Allow a user to only access a schema that matches their username.
18
19Limitations
20-----------
21
22At the moment there doesn't exist a plugin which would implement anything
23resembling the traditional SQL standard GRANT and REVOKE type of authorization.
24You are invited to share your opinion on whether that level of authorization
25control is necessary in a modern database.
26
27Note that at the moment there also is no plugin that would distinguish between
28read and write operations, rather access is always granted to schemas and tables
29in an all or nothing fashion.
1230
13-------------------------------------------------------------------------------31-------------------------------------------------------------------------------
1432
1533
=== modified file 'docs/administration/drizzled.rst'
--- docs/administration/drizzled.rst 2011-10-23 05:45:09 +0000
+++ docs/administration/drizzled.rst 2011-11-14 22:39:27 +0000
@@ -77,13 +77,21 @@
7777
78The ``shutdown`` command is case-sensitive.78The ``shutdown`` command is case-sensitive.
7979
80Output80Output and Logging
81------81------------------
8282
83:program:`drizzled` does *not* close or redirect output to ``STDOUT`` or83:program:`drizzled` does *not* close or redirect output to ``STDOUT`` or
84``STDERR`` to a log file or logging facility like :program:`syslog`.84``STDERR`` to a log file or logging facility like :program:`syslog`.
85You should redirect ``STDOUT`` and ``STDERR`` to a log file as in the above85When starting Drizzle, you should redirect ``STDOUT`` and ``STDERR`` to a log
86script example for starting Drizzle manually.86file or to /dev/null, as in the above script example when starting Drizzle.
87
88When running :program:`drizzled` manually from a console, just allowing the
89output to be printed for you can of course be useful.
90
91Note that beginning with the first ``Drizzle 7.1 Beta 2011.10.28`` drizzled
92will also log messages via syslog and this is *in addition* to using ``STDOUT``
93and ``STDERR``.
94
8795
88Signaling96Signaling
89---------97---------
9098
=== modified file 'docs/administration/logging.rst'
--- docs/administration/logging.rst 2011-10-23 16:01:37 +0000
+++ docs/administration/logging.rst 2011-11-14 22:39:27 +0000
@@ -12,11 +12,11 @@
12redirected to a log file when12redirected to a log file when
13:ref:`starting Drizzle <starting_and_stopping_drizzled>`.13:ref:`starting Drizzle <starting_and_stopping_drizzled>`.
1414
15Since :program:`syslog` is the standard UNIX logging facility,15Note that beginning with the first ``Drizzle 7.1 Beta 2011.10.28`` drizzled
16the :ref:`syslog_plugin` plugin is also loaded by default which will log error16will **also** log messages via syslog and this is *in addition* to using
17messages to the system log (:file:`/var/log/syslog` on Ubuntu for example).17``STDOUT`` and ``STDERR``. This functionality is provided by the
18However, you must start :program:`drizzled` with18:ref:`syslog_plugin` plugin. (For example on Ubuntu these messages are written
19:option:`--syslog.errmsg-enable` to enable this feature.19to :file:`/var/log/syslog`).
2020
21Queries21Queries
22-------22-------
2323
=== modified file 'docs/administration/plugins.rst'
--- docs/administration/plugins.rst 2011-10-23 05:45:09 +0000
+++ docs/administration/plugins.rst 2011-11-14 22:39:27 +0000
@@ -14,34 +14,69 @@
1414
15Drizzle loads these plugins by default (see :option:`--plugin-load`):15Drizzle loads these plugins by default (see :option:`--plugin-load`):
1616
17* auth_all (:ref:`auth_all_plugin`)17 * :ref:`ascii_plugin` - Return the ASCII value of a character (ascii)
18* ascii (:ref:`ascii_plugin`)18 * :ref:`auth_all_plugin` - Data Dictionary for utility tables (auth_all)
19* benchmark (:ref:`benchmark_plugin`) 19 * :ref:`benchmark_plugin` - Measure time for repeated calls to a function. (benchmark)
20* charlength (:ref:`charlength_plugin`) 20 * :ref:`catalog_plugin` - Basic Catalog functions, data dictionary, and system. (catalog)
21* compression (:ref:`compression_plugin`) 21 * :ref:`charlength_plugin` - Return the number of characters in a string (charlength)
22* connection_id (:ref:`connection_id_plugin`) 22 * :ref:`collation_dictionary_plugin` - Data Dictionary for schema, table, column, indexes, etc (collation_dictionary)
23* crc32 (:ref:`crc32_plugin`) 23 * :ref:`compression_plugin` - UDFs for compression functions (compression)
24* default_replicator (:ref:`default_replicator_plugin`) 24 * :ref:`connection_id_plugin` - Return the current connection_id (connection_id)
25* drizzle_protocol (:ref:`drizzle_protocol_plugin`)25 * :ref:`console_plugin` - Console Client (console)
26* errmsg_stderr (:ref:`errmsg_stderr_plugin`) 26 * :ref:`crc32_plugin` - CRC32 Function (crc32)
27* filtered_replicator (:ref:`filtered_replicator_plugin`) 27 * :ref:`default_replicator_plugin` - Default Replicator (default_replicator)
28* hex_functions (:ref:`hex_functions_plugin`) 28 * :ref:`drizzle_protocol_plugin` - Drizzle Protocol (drizzle_protocol)
29* innobase (:ref:`innobase_plugin`)29 * :ref:`errmsg_stderr_plugin` - Error Messages to stderr (errmsg_stderr)
30* length (:ref:`length_plugin`) 30 * :ref:`error_dictionary_plugin` - Data Dictionary for Errors. (error_dictionary)
31* logging_stats (:ref:`logging_stats_plugin`)31 * :ref:`function_engine_plugin` - Function Engine provides the infrastructure for Table Functions,etc. (function_engine)
32* math_functions (:ref:`math_functions_plugin`)32 * :ref:`hex_functions_plugin` - Convert a string to HEX() or from UNHEX() (hex_functions)
33* md5 (:ref:`md5_plugin`)33 * :ref:`information_schema_dictionary_plugin` - Data Dictionary for ANSI information schema, etc (information_schema_dictionary)
34* memory (:ref:`memory_plugin`)34 * :ref:`innobase_plugin` - Supports transactions, row-level locking, and foreign keys (innobase)
35* multi_thread (:ref:`multi_thread_plugin`)35 * :ref:`ipv6_function_plugin` - IPV6() function (ipv6_function)
36* myisam (:ref:`myisam_plugin`)36 * :ref:`js_plugin` - Execute JavaScript code with supplied arguments (js)
37* mysql_protocol (:ref:`mysql_protocol_plugin`)37 * :ref:`length_plugin` - Return the byte length of a string (length)
38* mysql_unix_socket_protocol (:ref:`mysql_unix_socket_protocol_plugin`)38 * :ref:`logging_stats_plugin` - User Statistics as DATA_DICTIONARY tables (logging_stats)
39* rand_function (:ref:`rand_function_plugin`)39 * :ref:`math_functions_plugin` - Math Functions. (math_functions)
40* reverse_function (:ref:`reverse_function_plugin`)40 * :ref:`md5_plugin` - UDF for computing md5sum (md5)
41* sleep (:ref:`sleep_plugin`)41 * :ref:`memory_plugin` - Hash based, stored in memory, useful for temporary tables (memory)
42* show_schema_proto (:ref:`show_schema_proto_plugin`)42 * :ref:`multi_thread_plugin` - One Thread Per Session Scheduler (multi_thread)
43* substr_functions (:ref:`substr_functions_plugin`)43 * :ref:`myisam_plugin` - Default engine as of MySQL 3.23 with great performance (myisam)
44* syslog (:ref:`syslog_plugin`)44 * :ref:`mysql_protocol_plugin` - MySQL Protocol Module (mysql_protocol)
45* transaction_log (:ref:`transaction_log_plugin`)45 * :ref:`mysql_unix_socket_protocol_plugin` - MySQL Unix Socket Protocol (mysql_unix_socket_protocol)
46* uuid_function (:ref:`uuid_function_plugin`)46 * :ref:`protocol_dictionary_plugin` - Provides dictionary for protocol counters. (protocol_dictionary)
47* version (:ref:`version_plugin`)47 * :ref:`rand_function_plugin` - RAND Function (rand_function)
48 * :ref:`registry_dictionary_plugin` - Provides dictionary for plugin registry system. (registry_dictionary)
49 * :ref:`replication_dictionary_plugin` - Replication Dictionary (replication_dictionary)
50 * :ref:`reverse_function_plugin` - reverses a string (reverse_function)
51 * :ref:`schema_dictionary_plugin` - Data Dictionary for schema, table, column, indexes, etc (schema_dictionary)
52 * :ref:`schema_engine_plugin` - This implements the default file based Schema engine. (schema_engine)
53 * :ref:`session_dictionary_plugin` - Dictionary for session information, aka proccesslist, user defined variables, etc. (session_dictionary)
54 * :ref:`show_dictionary_plugin` - Dictionary for show commands. (show_dictionary)
55 * :ref:`show_schema_proto_plugin` - Shows text representation of schema definition proto (show_schema_proto)
56 * :ref:`signal_handler_plugin` - Default Signal Handler (signal_handler)
57 * :ref:`sleep_plugin` - SLEEP Function (sleep)
58 * :ref:`status_dictionary_plugin` - Dictionary for status, statement, and variable information. (status_dictionary)
59 * :ref:`string_functions_plugin` - String Functions. (string_functions)
60 * :ref:`substr_functions_plugin` - SUBSTR and SUBSTR (substr_functions)
61 * :ref:`syslog_plugin` - Syslog (syslog)
62 * :ref:`table_cache_dictionary_plugin` - Data Dictionary for table and table definition cache. (table_cache_dictionary)
63 * :ref:`transaction_log_plugin` - Transaction Log (transaction_log)
64 * :ref:`user_locks_plugin` - User level locking and barrier functions (user_locks)
65 * :ref:`utility_functions_plugin` - Utility Functions. (utility_functions)
66 * :ref:`uuid_function_plugin` - UUID() function using libuuid (uuid_function)
67 * :ref:`version_plugin` - Print Drizzle version (version)
68
69You can list information about the loaded plugins with:
70
71.. code-block:: mysql
72
73 SELECT * FROM DATA_DICTIONARY.MODULES;
74
75Note to editors: The above list of functions can be regenerated at any time with:
76
77.. code-block:: mysql
78
79 drizzle --silent -e "SELECT CONCAT(' * ', ':ref:\`', MODULE_LIBRARY, '_plugin\` - ', MODULE_DESCRIPTION, ' (', MODULE_LIBRARY, ')')
80 FROM DATA_DICTIONARY.MODULES ORDER BY MODULE_LIBRARY;"
81
82
4883
=== modified file 'docs/configuration/options.rst'
--- docs/configuration/options.rst 2011-11-06 00:00:03 +0000
+++ docs/configuration/options.rst 2011-11-14 22:39:27 +0000
@@ -23,7 +23,7 @@
23``drizzled --plugin-add PLUGIN --help`` where ``PLUGIN`` is the name of any23``drizzled --plugin-add PLUGIN --help`` where ``PLUGIN`` is the name of any
24plugin. For example:24plugin. For example:
2525
26.. code-block:: bash26.. code-block:: none
2727
28 $ drizzled --plugin-add query_log --help28 $ drizzled --plugin-add query_log --help
29 sbin/drizzled Ver 2011.08.25.2411 for pc-linux-gnu on i686 (Source distribution (trunk))29 sbin/drizzled Ver 2011.08.25.2411 for pc-linux-gnu on i686 (Source distribution (trunk))
@@ -149,9 +149,9 @@
149in this directory.)149in this directory.)
150150
151A good strategy for configuring Drizzle with multiple config files is to151A good strategy for configuring Drizzle with multiple config files is to
152put :ref:`drizzled_options` in :file:`/etc/drizzle/drizzled.cnf`152put general :ref:`drizzled_options` in :file:`/etc/drizzle/drizzled.cnf`
153(:file:`/etc/drizzle` is the default :option:`--config-dir` value)153(:file:`/etc/drizzle` is the default :option:`--config-dir` value)
154and plugin options in spearate config files in154and any options related to a plugin in a separate config file in
155:file:`/etc/drizzle/conf.d/`. For example:155:file:`/etc/drizzle/conf.d/`. For example:
156156
157.. code-block:: bash157.. code-block:: bash
@@ -168,15 +168,20 @@
168168
169.. code-block:: ini169.. code-block:: ini
170170
171 server-id=42
172 core-file
173
174.. code-block:: bash
175
176 $ cat /etc/drizzle/conf.d/auth-file
177
178.. code-block:: ini
179
180 # drizzled option to load the auth_file plugin
171 plugin-remove=auth_all181 plugin-remove=auth_all
172 plugin-add=auth_file182 plugin-add=auth_file
173183
174.. code-block:: bash184 # Options for the plugin itself
175
176 $ cat /etc/drizzle/conf.d/auth-file
177
178.. code-block:: ini
179
180 [auth-file]185 [auth-file]
181 users=/etc/drizzle/users186 users=/etc/drizzle/users
182187
183188
=== modified file 'docs/contributing/more_ways.rst'
--- docs/contributing/more_ways.rst 2011-10-23 05:45:09 +0000
+++ docs/contributing/more_ways.rst 2011-11-14 22:39:27 +0000
@@ -18,4 +18,6 @@
1818
19Drizzle is an Associated Project at the19Drizzle is an Associated Project at the
20`Software in the Public Interest (SPI) <http://spi-inc.org/>`_. You20`Software in the Public Interest (SPI) <http://spi-inc.org/>`_. You
21can make a financial donation to Drizzle through the SPI.21can `make a financial donation to Drizzle
22<https://co.clickandpledge.com/advanced/default.aspx?wid=46722>`_ through the
23SPI.
2224
=== modified file 'docs/installing/from_source.rst'
--- docs/installing/from_source.rst 2011-10-23 05:45:09 +0000
+++ docs/installing/from_source.rst 2011-11-14 22:39:27 +0000
@@ -1,11 +1,38 @@
1Installing Drizzle from Source1Installing Drizzle from Source
2==============================2==============================
33
4* :ref:`obtain-source`
5* :ref:`compile-source`
4* :ref:`dependencies`6* :ref:`dependencies`
5* :ref:`ubuntu-install`7* :ref:`ubuntu-install`
6* :ref:`debian-install`8* :ref:`debian-install`
7* :ref:`obtain-source`9* :ref:`redhat-install`
8* :ref:`compile-source`10
11.. _obtain-source:
12
13Obtaining the Source
14--------------------
15The latest source release can always be found on our `LaunchPad site
16<https://launchpad.net/drizzle>`_. Alternatively, the bzr source from our stable
17trunk can be obtained by doing:
18
19.. code-block:: bash
20
21 bzr branch lp:drizzle
22
23.. _compile-source:
24
25Compiling the Source
26--------------------
27Compiling is done by performing the standard automake commands from the top level directory inside the source:
28
29.. code-block:: bash
30
31 ./config/autorun.sh
32 ./configure
33 make
34 make install
35
936
10.. _dependencies:37.. _dependencies:
1138
@@ -53,6 +80,7 @@
53 * libpam0g-dev80 * libpam0g-dev
54 * libprotobuf-dev (>= 2.1.0)81 * libprotobuf-dev (>= 2.1.0)
55 * libtokyocabinet-dev (>= 1.4.23)82 * libtokyocabinet-dev (>= 1.4.23)
83 * libv8-dev
56 * systemtap-sdt-dev84 * systemtap-sdt-dev
57 * libnotifymm-dev85 * libnotifymm-dev
58 * doxygen86 * doxygen
@@ -60,8 +88,8 @@
6088
61.. _ubuntu-install:89.. _ubuntu-install:
6290
63Ubuntu Install Commands91Installing Build Dependencies on Ubuntu
64-----------------------92---------------------------------------
6593
66The following commands work on Ubuntu to install the tools and libraries needed to build Drizzle:94The following commands work on Ubuntu to install the tools and libraries needed to build Drizzle:
6795
@@ -74,8 +102,8 @@
74102
75.. _debian-install:103.. _debian-install:
76104
77Debian Install Commands105Installing Build Dependencies on Debian
78-----------------------106---------------------------------------
79107
80Since apt-repository isn't in Debian, you can instead add the Maverick PPA to /etc/apt/sources.list as follows:108Since apt-repository isn't in Debian, you can instead add the Maverick PPA to /etc/apt/sources.list as follows:
81109
@@ -109,28 +137,37 @@
109137
110 apt-get install drizzle 138 apt-get install drizzle
111139
112.. _obtain-source:140.. _redhat-install:
113141
114Obtaining the Source142Installing Build Dependencies on Red Hat or Fedora
115--------------------143--------------------------------------------------
116The latest source release can always be found on our `LaunchPad site144
117<https://launchpad.net/drizzle>`_. Alternatively, the bzr source from our stable145Depending on whether you use Red Hat (RHEL) or Fedora, you should add the
118trunk can be obtained by doing:146repositories as explained in :doc:`redhat`.
119147
120.. code-block:: bash148After that, install the following packages:
121149
122 bzr branch lp:drizzle150 * bzr
123151 * boost-devel
124.. _compile-source:152 * autoconf
125153 * automake
126Compiling the Source154 * gcc
127--------------------155 * gcc-c++
128Compiling is done by performing the standard automake commands from the top level directory inside the source:156 * libtool
129157 * gperf
130.. code-block:: bash158 * libuuid-devel (part of e2fsprogs-devel on older RedHat based distributions)
131159 * zlib-devel
132 ./config/autorun.sh160 * pcre-devel
133 ./configure161 * readline-devel
134 make162 * flex
135 make install163 * bison
164
165Note that you should be able to install all of the above simply with
166
167.. code-block:: bash
168
169 yum-builddep drizzle
170
171
172
136173
137174
=== modified file 'docs/installing/redhat.rst'
--- docs/installing/redhat.rst 2011-10-23 05:45:09 +0000
+++ docs/installing/redhat.rst 2011-11-14 22:39:27 +0000
@@ -73,23 +73,3 @@
7373
74 sudo yum install drizzle7-server drizzle7-client74 sudo yum install drizzle7-server drizzle7-client
7575
76Compiling from Source
77---------------------
78To compile from source you will need to add the repositories described above, and then install the following packages:
79
80 * bzr
81 * boost-devel
82 * autoconf
83 * automake
84 * gcc
85 * gcc-c++
86 * libtool
87 * gperf
88 * libuuid-devel (part of e2fsprogs-devel on older RedHat based distributions)
89 * zlib-devel
90 * pcre-devel
91 * readline-devel
92 * flex
93 * bison
94
95You will then be able to compile from source in the normal way.
9676
=== modified file 'plugin/auth_pam/docs/index.rst'
--- plugin/auth_pam/docs/index.rst 2011-11-06 00:00:03 +0000
+++ plugin/auth_pam/docs/index.rst 2011-11-14 22:39:27 +0000
@@ -81,7 +81,7 @@
8181
82Then connect to Drizzle like:82Then connect to Drizzle like:
8383
84.. code-block:: bash84.. code-block:: none
8585
86 $ bin/drizzle -P --protocol mysql-plugin-auth86 $ bin/drizzle -P --protocol mysql-plugin-auth
87 Enter password: [Enter your system password here]87 Enter password: [Enter your system password here]
@@ -99,9 +99,9 @@
99protocol sends the password in plaintext to Drizzle, which99protocol sends the password in plaintext to Drizzle, which
100is required for PAM based authentication.100is required for PAM based authentication.
101101
102Note that you don't need to specify the ``-u`` or ``--user`` argument, since102Note that you typically don't need to specify the ``-u`` or ``--user`` argument,
103Drizzle will default to using your system username, which is exactly what we103since Drizzle will default to using your system username, which is exactly what
104want when using auth_pam.104we want when using auth_pam.
105105
106.. _auth_pam_security:106.. _auth_pam_security:
107107
108108
=== modified file 'plugin/js/docs/index.rst'
--- plugin/js/docs/index.rst 2011-10-01 10:06:00 +0000
+++ plugin/js/docs/index.rst 2011-11-14 22:39:27 +0000
@@ -1,3 +1,5 @@
1.. _js_plugin:
2
1JS3JS
2===========4===========
35