Skip to content

Commit

Permalink
Merge pull request #329
Browse files Browse the repository at this point in the history
  • Loading branch information
jmikola committed Jan 17, 2017
2 parents 0b1e0f3 + 0690308 commit 318d4b9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 18 deletions.
12 changes: 6 additions & 6 deletions docs/index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MongoDB PHP Library
.. default-domain:: mongodb

The |php-library| provides a high-level abstraction around the lower-level
`PHP Driver <https://php.net/mongodb>`_, also known as the ``mongodb``
`PHP driver <https://php.net/mongodb>`_, also known as the ``mongodb``
extension.

While the ``mongodb`` extension provides a limited API for executing commands,
Expand All @@ -18,11 +18,11 @@ collection management.
If you are developing a PHP application with MongoDB, you should consider using
this library, or another high-level abstraction, instead of the extension alone.

For additional information about the MongoDB PHP Library and the ``mongodb``
extension, see the `Architecture Overview
<http://php.net/manual/en/mongodb.overview.php>`_ article in the extension
documentation. `Derick Rethans <http://derickrethans.nl/>`_ has also written a
series of blog posts entitled *New MongoDB Drivers for PHP and HHVM*:
For additional information about this library and the ``mongodb`` extension, see
the `Architecture Overview <http://php.net/manual/en/mongodb.overview.php>`_
article in the extension documentation. `Derick Rethans
<http://derickrethans.nl/>`_ has also written a series of blog posts entitled
*New MongoDB Drivers for PHP and HHVM*:

- `Part One: History <https://derickrethans.nl/new-drivers.html>`_

Expand Down
18 changes: 6 additions & 12 deletions docs/tutorial/install-php-library.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,13 @@ Install the |php-library|
Prerequisites
-------------

The MongoDB PHP Library is a high-level abstraction for the
MongoDB PHP driver. As such, you must install the `mongodb`
extension to use the |php-library|:
The |php-library| is a high-level abstraction for the MongoDB PHP driver. As
such, you must install the `mongodb` extension to use the library.

.. code-block:: sh

pecl install mongodb
echo "extension=mongodb.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`

Instructions for installing the `mongodb` extension on HHVM may be
found in the :php:`Installation with HHVM
<mongodb.installation.hhvm>` article
in the driver documentation.
:php:`Installing the MongoDB PHP Driver <manual/en/mongodb.installation.php>`
describes how to install the `mongodb` extension for PHP. Instructions for
installing the driver for HHVM may be found in the :php:`Installation with HHVM
<manual/en/mongodb.installation.hhvm>` article.

Procedure
---------
Expand Down

0 comments on commit 318d4b9

Please sign in to comment.