kinto 19.5.0__tar.gz → 20.0.0__tar.gz

{kinto-19.5.0 → kinto-20.0.0}/.gitignore

@@ -16,7 +16,6 @@ build/
 kinto/plugins/admin/build
 kinto/plugins/admin/kinto-admin-*
 .pytest_cache/
-mail/
 .history/
 .vscode/
 .ruff_cache/

kinto-20.0.0/.readthedocs.yaml

@@ -0,0 +1,12 @@
+version: 2
+
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.12"
+  jobs:
+    install:
+      - make install-docs
+    build:
+      html:
+        - SPHINX_BUILDDIR=$READTHEDOCS_OUTPUT make docs

{kinto-19.5.0 → kinto-20.0.0}/Dockerfile

@@ -20,7 +20,6 @@ RUN cp -r /kinto-admin/kinto/plugins/admin/build kinto/plugins/admin/
 RUN pip install ".[postgresql,memcached,monitoring]" -c constraints.txt && pip install kinto-attachment kinto-emailer httpie
 
 FROM python:3.10-slim-bullseye
-RUN apt-get update && apt-get install -y --no-install-recommends libpq-dev
 RUN groupadd --gid 10001 app && \
     useradd --uid 10001 --gid 10001 --home /app --create-home app
 

{kinto-19.5.0 → kinto-20.0.0}/Makefile

@@ -1,6 +1,6 @@
 SERVER_CONFIG = config/kinto.ini
 
-SPHINX_BUILDDIR = docs/_build
+SPHINX_BUILDDIR := $(shell echo $${SPHINX_BUILDDIR-docs/_build})
 VENV := $(shell echo $${VIRTUAL_ENV-.venv})
 PYTHON = $(VENV)/bin/python3
 DEV_STAMP = $(VENV)/.dev_env_installed.stamp

{kinto-19.5.0/kinto.egg-info → kinto-20.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: kinto
-Version: 19.5.0
+Version: 20.0.0
 Summary: Kinto Web Service - Store, Sync, Share, and Self-Host.
 Author-email: Mozilla Services <developers@kinto-storage.org>
 License: Copyright 2012 - Mozilla Foundation
@@ -33,15 +33,12 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: bcrypt
 Requires-Dist: colander
-Requires-Dist: cornice
-Requires-Dist: cornice_swagger
 Requires-Dist: dockerflow
 Requires-Dist: jsonschema
 Requires-Dist: jsonpatch
 Requires-Dist: logging-color-formatter
 Requires-Dist: python-dateutil
 Requires-Dist: pyramid
-Requires-Dist: pyramid_mailer
 Requires-Dist: pyramid_multiauth
 Requires-Dist: transaction
 Requires-Dist: pyramid_tm
@@ -54,7 +51,7 @@ Provides-Extra: memcached
 Requires-Dist: python-memcached; extra == "memcached"
 Provides-Extra: postgresql
 Requires-Dist: SQLAlchemy<3; extra == "postgresql"
-Requires-Dist: psycopg2; extra == "postgresql"
+Requires-Dist: psycopg2-binary; extra == "postgresql"
 Requires-Dist: zope.sqlalchemy; extra == "postgresql"
 Provides-Extra: monitoring
 Requires-Dist: newrelic; extra == "monitoring"
@@ -108,7 +105,6 @@ Kinto is a minimalist JSON storage service with synchronisation and sharing abil
 * `Tutorial <https://kinto.readthedocs.io/en/latest/tutorials/first-steps.html>`_
 * `Issue tracker <https://github.com/Kinto/kinto/issues>`_
 * `Contributing <https://kinto.readthedocs.io/en/latest/community.html#how-to-contribute>`_
-* `Try our daily flushed instance at: https://demo.kinto-storage.org/v1/ <https://demo.kinto-storage.org/v1/>`_
 * `Docker Hub <https://hub.docker.com/r/kinto/kinto-server>`_
 
 Requirements

{kinto-19.5.0 → kinto-20.0.0}/README.rst

@@ -32,7 +32,6 @@ Kinto is a minimalist JSON storage service with synchronisation and sharing abil
 * `Tutorial <https://kinto.readthedocs.io/en/latest/tutorials/first-steps.html>`_
 * `Issue tracker <https://github.com/Kinto/kinto/issues>`_
 * `Contributing <https://kinto.readthedocs.io/en/latest/community.html#how-to-contribute>`_
-* `Try our daily flushed instance at: https://demo.kinto-storage.org/v1/ <https://demo.kinto-storage.org/v1/>`_
 * `Docker Hub <https://hub.docker.com/r/kinto/kinto-server>`_
 
 Requirements

kinto-20.0.0/SUPPORT.md

@@ -0,0 +1,3 @@
+# Support
+
+If you're looking for support for Kinto, use [Github issues](https://github.com/Kinto/kinto/issues).

{kinto-19.5.0 → kinto-20.0.0}/constraints.in

@@ -1,15 +1,12 @@
 # main dependencies
 bcrypt
 colander
-cornice
-cornice_swagger
 dockerflow
 jsonschema
 jsonpatch
 logging-color-formatter
 python-dateutil
 pyramid
-pyramid_mailer
 pyramid_multiauth
 transaction
 pyramid_tm
@@ -21,7 +18,7 @@ python-rapidjson
 python-memcached
 # postgresql
 SQLAlchemy < 3
-psycopg2
+psycopg2-binary
 zope.sqlalchemy
 # monitoring
 newrelic

{kinto-19.5.0 → kinto-20.0.0}/constraints.txt

@@ -10,7 +10,7 @@ attrs==23.2.0
     # via
     #   jsonschema
     #   referencing
-bcrypt==4.2.1
+bcrypt==4.3.0
     # via -r constraints.in
 beautifulsoup4==4.12.3
     # via webtest
@@ -25,17 +25,9 @@ certifi==2024.7.4
 charset-normalizer==3.3.2
     # via requests
 colander==2.0
-    # via
-    #   -r constraints.in
-    #   cornice-swagger
+    # via -r constraints.in
 colorama==0.4.6
     # via logging-color-formatter
-cornice==6.0.1
-    # via
-    #   -r constraints.in
-    #   cornice-swagger
-cornice-swagger==1.0.1
-    # via -r constraints.in
 coverage==7.6.4
     # via pytest-cov
 dockerflow==2024.4.2
@@ -102,7 +94,7 @@ pluggy==1.5.0
     # via pytest
 prometheus-client==0.21.1
     # via -r constraints.in
-psycopg2==2.9.10
+psycopg2-binary==2.9.10
     # via -r constraints.in
 pyee==12.0.0
     # via playwright
@@ -111,17 +103,13 @@ pyproject-hooks==1.0.0
 pyramid==2.0.2
     # via
     #   -r constraints.in
-    #   cornice
-    #   pyramid-mailer
     #   pyramid-multiauth
     #   pyramid-tm
-pyramid-mailer==0.15.1
-    # via -r constraints.in
 pyramid-multiauth==1.0.2
     # via -r constraints.in
 pyramid-tm==2.6
     # via -r constraints.in
-pytest==8.3.4
+pytest==8.3.5
     # via
     #   -r constraints.in
     #   pytest-cache
@@ -149,8 +137,6 @@ referencing==0.32.1
     # via
     #   jsonschema
     #   jsonschema-specifications
-repoze-sendmail==4.4.1
-    # via pyramid-mailer
 requests==2.32.3
     # via
     #   -r constraints.in
@@ -163,7 +149,7 @@ rpds-py==0.17.1
     # via
     #   jsonschema
     #   referencing
-ruff==0.9.6
+ruff==0.9.9
     # via -r constraints.in
 sentry-sdk==2.8.0
     # via -r constraints.in
@@ -172,12 +158,11 @@ simplejson==3.19.2
 six==1.16.0
     # via
     #   bravado-core
-    #   cornice-swagger
     #   python-dateutil
     #   rfc3339-validator
 soupsieve==2.5
     # via beautifulsoup4
-sqlalchemy==2.0.37
+sqlalchemy==2.0.38
     # via
     #   -r constraints.in
     #   sentry-sdk
@@ -189,9 +174,7 @@ swagger-spec-validator==3.0.3
 transaction==5.0
     # via
     #   -r constraints.in
-    #   pyramid-mailer
     #   pyramid-tm
-    #   repoze-sendmail
     #   zope-sqlalchemy
 translationstring==1.4
     # via
@@ -211,9 +194,7 @@ urllib3==2.2.2
     #   requests
     #   sentry-sdk
 venusian==3.1.0
-    # via
-    #   cornice
-    #   pyramid
+    # via pyramid
 waitress==3.0.2
     # via
     #   -r constraints.in
@@ -233,7 +214,6 @@ zope-deprecation==5.0
 zope-interface==6.1
     # via
     #   pyramid
-    #   repoze-sendmail
     #   transaction
     #   zope-sqlalchemy
 zope-sqlalchemy==3.1

{kinto-19.5.0 → kinto-20.0.0}/docs/api/1.x/accounts.rst

@@ -153,15 +153,6 @@ Alternatively, accounts can be created using POST.  Supply the user id and passw
 
     Depending on the :ref:`configuration <settings-accounts>`, you may not be allowed to create accounts.
 
-.. note::
-
-    If the :ref:`accounts validation <settings-account-validation>` is enabled,
-    you might also need to provide an ``email-context`` in the ``data``: 
-
-    .. sourcecode:: bash
-
-        $ echo '{"data": {"id": "bob@example.com", "password": "azerty123", "email-context": {"name": "Bob Smith", "form-url": "https://example.com/validate/"}}}' | http POST http://localhost:8888/v1/accounts --verbose
-
 
 .. _accounts-update:
 
@@ -303,125 +294,3 @@ Or delete some account:
 ::
 
     $ http DELETE http://localhost:8888/v1/accounts/sam-body --auth admin:s3cr3t
-
-
-
-.. _accounts-validate:
-
-Validate accounts
-=================
-
-When the ``account_validation`` option is enabled in :ref:`the settings
-<settings-account-validation>`, account IDs need to be valid email addresses:
-they need to match the regexp in the ``account_validation.email_regexp``
-setting. The default one is very generic, but you may restrict it to only allow
-certain emails, for example only ones from a specific domain.
-
-To make sure the ``account_validation`` is enabled, you can check if the
-``validation_enabled`` flag is ``true`` in the ``"accounts"`` field on the
-:ref:`root URL <api-utilities-hello>`.
-
-.. http:post:: /accounts/(user_id)/validate/(activation_key)
-
-    :synopsis: Activates a newly created account with the ``account_validation`` option enabled.
-
-    **Anonymous**
-
-    **Example Request**
-
-    .. sourcecode:: bash
-
-        $ http POST http://localhost:8888/v1/accounts/bob@example.com/validate/2fe7a389-3556-4c8f-9513-c26bfc5f160b --verbose
-
-
-    .. sourcecode:: http
-
-        POST /v1/accounts/bob@example.com/validate/2fe7a389-3556-4c8f-9513-c26bfc5f160b HTTP/1.1
-        Accept: */*
-        Accept-Encoding: gzip, deflate
-        Connection: keep-alive
-        Content-Length: 0
-        Host: localhost:8888
-        User-Agent: HTTPie/0.9.8
-
-    **Example Response**
-
-    .. sourcecode:: http
-
-        HTTP/1.1 200 OK
-        Access-Control-Expose-Headers: Content-Length, Retry-After, Backoff, Alert
-        Content-Length: 195
-        Content-Type: application/json
-        Date: Mon, 21 Jan 2019 13:41:17 GMT
-        Server: waitress
-        X-Content-Type-Options: nosniff
-
-        {
-            "id": "bob@example.com",
-            "last_modified": 1548077982793,
-            "password": "$2b$12$zlTlYet5v.v57ak2gEYyoeqKSGzLvwXF/.v3DGpT/q69LecHv68gm",
-            "validated": true
-        }
-
-.. _accounts-reset-password:
-
-Resetting a forgotten password
-==============================
-
-If the ``account_validation`` option in :ref:`the settings
-<settings-account-validation>` has been enabled, a temporary reset password may
-be requested through the endpoint available at ``/accounts/(user
-id)/reset-password``.
-
-.. http:post:: /accounts/(user_id)/reset-password
-
-    :synopsis: Request a temporary reset password for an account with the ``account_validation`` option enabled.
-
-    **Anonymous**
-
-    **Example Request**
-
-    .. sourcecode:: bash
-
-        $ http POST http://localhost:8888/v1/accounts/bob@example.com/reset-password --verbose
-
-
-    .. sourcecode:: http
-
-        POST /v1/accounts/bob@example.com/reset-password HTTP/1.1
-        Accept: */*
-        Accept-Encoding: gzip, deflate
-        Connection: keep-alive
-        Content-Length: 0
-        Host: localhost:8888
-        User-Agent: HTTPie/0.9.8
-
-
-    **Example Response**
-
-    .. sourcecode:: http
-
-        HTTP/1.1 200 OK
-        Access-Control-Expose-Headers: Backoff, Alert, Retry-After, Content-Length
-        Content-Length: 62
-        Content-Type: application/json
-        Date: Fri, 08 Feb 2019 14:04:15 GMT
-        Server: waitress
-        X-Content-Type-Options: nosniff
-
-        {
-            "message": "A temporary reset password has been sent by mail"
-        }
-
-   .. note::
-
-       You might also need to provide an ``email-context`` in the ``data`` to fill
-       in the holes of the email template defined in the :ref:`settings
-       <settings-account-password-reset>`:
-
-       .. sourcecode:: bash
-
-          $ echo '{"data": {"email-context": {"name": "Bob Smith"}}}' | http POST http://localhost:8888/v1/accounts/bob@example.com/reset-password --verbose
-
-Using this temporary reset password, one can
-:ref:`update the account <accounts-update>` providing the new password.

{kinto-19.5.0 → kinto-20.0.0}/docs/api/1.x/authentication.rst

@@ -36,7 +36,7 @@ The currently authenticated *user ID* can be obtained on the :ref:`root URL <api
 
 .. code-block:: bash
 
-    $ http GET https://demo.kinto-storage.org/v1/ --auth admin:s3cr3t
+    $ http GET http://localhost:8888/v1/ --auth admin:s3cr3t
 
 .. code-block:: http
     :emphasize-lines: 6
@@ -44,7 +44,7 @@ The currently authenticated *user ID* can be obtained on the :ref:`root URL <api
     HTTP/1.1 200 OK
 
     {
-        "url": "https://demo.kinto-storage.org/v1/",
+        "url": "http://localhost:8888/v1/",
         "user": {
             "bucket": "4399ed6c-802e-3278-5d01-44f261f0bab4",
             "id": "account:admin",
@@ -76,7 +76,7 @@ In order to know which authentication methods are supported by a *Kinto* server,
 
 .. code-block:: shell
 
-    $ http https://demo.kinto-storage.org/v1/
+    $ http http://localhost:8888/v1/
 
 .. code-block:: http
 

{kinto-19.5.0 → kinto-20.0.0}/docs/api/1.x/index.rst

@@ -24,7 +24,6 @@ Full detailed API documentation:
    pagination
    selecting_fields
    history
-   quotas
    utilities
    admin
    batch

{kinto-19.5.0 → kinto-20.0.0}/docs/api/1.x/openapi.rst

@@ -68,9 +68,9 @@ One way to interact and explore an API is through interactive documentation.
 SwaggerUI is a resource that allows testing and visualizing the behavior
 of an OpenAPI described interface.
 
-You can try the instance running on https://demo.kinto-storage.org/v1/ from you browser
+You can try the instance running on https://your-domain/v1/ from you browser
 accessing this
-`Swagger UI example <http://petstore.swagger.io/?url=https://demo.kinto-storage.org/v1/__api__>`_
+`Swagger UI example <http://petstore.swagger.io/?url=https://your-domain/v1/__api__>`_
 
 Automated client generation
 ===========================

{kinto-19.5.0 → kinto-20.0.0}/docs/api/1.x/openid.rst

@@ -69,7 +69,7 @@ for the configured provider ``name``.
 JavaScript example
 ------------------
 
-Let's go through a simple OpenID login example using the `JavaScript kinto client <https://github.com/Kinto/kinto-http.js>`_.
+Let's go through a simple OpenID login example using the `JavaScript kinto client <https://github.com/Kinto/kinto.js>`_.
 
 When the user clicks a login button, it initiates the login process by redirecting the browser to the
 Identity Provider, which itself redirects it to the application page once successful.

{kinto-19.5.0 → kinto-20.0.0}/docs/api/1.x/permissions.rst

@@ -283,7 +283,7 @@ itself, using the same :ref:`PATCH <record-patch>` and :ref:`PUT
     .. sourcecode:: bash
 
         $ echo '{"permissions": {"read": ["system.Authenticated"]}}' | \
-          http PATCH https://demo.kinto-storage.org/v1/buckets/default/collections/tasks \
+          http PATCH http://localhost:8888/v1/buckets/default/collections/tasks \
           --auth bob:p4ssw0rd
 
     .. sourcecode:: http
@@ -295,7 +295,7 @@ itself, using the same :ref:`PATCH <record-patch>` and :ref:`PUT
         Connection: keep-alive
         Content-Length: 52
         Content-Type: application/json; charset=utf-8
-        Host: demo.kinto-storage.org
+        Host: localhost:8888
         User-Agent: HTTPie/0.8.0
 
         {
@@ -347,7 +347,7 @@ itself, using the same :ref:`PATCH <record-patch>` and :ref:`PUT
     .. sourcecode:: bash
 
         $ echo '{"permissions": {"write": ["groups:writers"]}}' | \
-          http PUT https://demo.kinto-storage.org/v1/buckets/default/collections/tasks \
+          http PUT http://localhost:8888/v1/buckets/default/collections/tasks \
           --auth bob:p4ssw0rd
 
     .. sourcecode:: http
@@ -359,7 +359,7 @@ itself, using the same :ref:`PATCH <record-patch>` and :ref:`PUT
         Connection: keep-alive
         Content-Length: 57
         Content-Type: application/json; charset=utf-8
-        Host: demo.kinto-storage.org
+        Host: localhost:8888
         User-Agent: HTTPie/0.8.0
 
         {
@@ -414,7 +414,7 @@ List every permissions
 
     .. sourcecode:: bash
 
-        $ http GET https://demo.kinto-storage.org/v1/permissions --auth bob:p4ssw0rd
+        $ http GET http://localhost:8888/v1/permissions --auth bob:p4ssw0rd
 
     .. sourcecode:: http
 

{kinto-19.5.0 → kinto-20.0.0}/docs/api/index.rst

@@ -14,12 +14,7 @@ Changelog
 1.22 (2019-03-20)
 '''''''''''''''''
 
-- New ``/accounts/{user id}/validate/{validation key}`` endpoint to validate a
-  created account when the ``account validation`` option is enabled for the
-  accounts plugin. See :ref:`account validation <accounts-validate>` (#1973)
-- New ``/accounts/{user id}/reset-password`` endpoint to request a temporary
-  reset password by email when the ``account validation`` option is enabled for
-  the accounts plugin. See :ref:`account validation <accounts-validate>` (#1973)
+- New endpoints within the ``kinto.plugins.accounts`` plugin (#1973)
 
 
 1.21 (2019-01-10)

{kinto-19.5.0 → kinto-20.0.0}/docs/commandline.rst

@@ -12,7 +12,7 @@ A set of «sub commands» are available.
 
 ::
 
-    usage: kinto [-h] {init,start,migrate,version,rebuild-quotas} ...
+    usage: kinto [-h] {init,start,migrate,version} ...
 
     Kinto Command-Line Interface
 
@@ -22,7 +22,7 @@ A set of «sub commands» are available.
     subcommands:
       Main Kinto CLI commands
 
-      {init,start,migrate,version,rebuild-quotas}
+      {init,start,migrate,version}
                             Choose and run with --help
 
 
@@ -82,34 +82,6 @@ Starts Kinto locally using a simple HTTP server.
 
     This **not** recommended for production. :ref:`See more details <run-production>`.
 
-
-Rebuild quotas
---------------
-
-Recalculate the amount of storage taken up by buckets and collections
-and update quota records to match reality. This can be useful if
-you've been bitten by `bug #1226
-<https://github.com/Kinto/kinto/issues/1226>`_. However, this isn't
-intended to be a reoccurring maintenance task -- if your quota records
-are regularly becoming inaccurate, please file a bug!
-
-::
-
-    usage: kinto rebuild-quotas [-h] [--ini INI_FILE] [-q] [-v] [--dry-run]
-
-    optional arguments:
-      -h, --help      show this help message and exit
-      --ini INI_FILE  Application configuration file
-      -q, --quiet     Show only critical errors.
-      -v, --debug     Show all messages, including debug messages.
-      --dry-run       Simulate the rebuild operation and show information
-
-For example:
-
-::
-
-    kinto rebuild-quotas --ini=config/postgresql.ini
-
 Flush Cache
 -----------
 

{kinto-19.5.0 → kinto-20.0.0}/docs/community.rst

@@ -6,16 +6,6 @@ Community
 
 You can check out Kinto on GitHub at https://github.com/Kinto/kinto/.
 
-.. _communication_channels:
-
-Communication channels
-======================
-
-* Questions tagged ``kinto`` on `Stack Overflow <http://stackoverflow.com/questions/tagged/kinto>`_.
-* Our `Gitter community <https://gitter.im/Kinto/kinto>`_
-* `The Kinto mailing list <https://mail.mozilla.org/listinfo/kinto>`_.
-* Some `#Kinto <https://twitter.com/search?q=%23Kinto>`_ mentions on Twitter :)
-
 .. _how-to-contribute:
 
 How to contribute
@@ -204,7 +194,7 @@ Before we merge a pull request, we check that it meets these guidelines:
 Hack core libraries
 -------------------
 
-If you want to run *Kinto* with some core libraries under development (like *Cornice*),
+If you want to run *Kinto* with some core libraries under development,
 just install them from your local folder using ``pip``.
 
 For example:
@@ -212,9 +202,9 @@ For example:
 ::
 
     cd ..
-    git clone https://github.com/mozilla-services/cornice.git
+    git clone https://github.com/Kinto/kinto-attachment.git
     cd kinto/
-    .venv/bin/pip install -e ../cornice/
+    .venv/bin/pip install -e ../kinto-attachment/
 
 
 Functional Tests
@@ -293,4 +283,3 @@ Step 3
 
 - Check that the version in ReadTheDocs was published
 - Check that a Pypi package was published
-- Tweet about it!

{kinto-19.5.0 → kinto-20.0.0}/docs/concepts.rst

@@ -121,7 +121,7 @@ Technical Architecture
 Every concept of bucket, group, collection or record is a REST
 *resource* and behaves according to the conventions of a resource.
 
-*Kinto* relies on `Cornice <https://cornice.readthedocs.io>`_ and `Pyramid <https://pyramid.readthedocs.io>`_
+*Kinto* relies on `Pyramid <https://pyramid.readthedocs.io>`_
 to implement the endpoints and HTTP request/response handling.
 
 .. image:: images/architecture.svg

{kinto-19.5.0 → kinto-20.0.0}/docs/conf.py

@@ -109,7 +109,7 @@ nitpick_ignore = [
     ("py:class", "str"),
     ("py:class", "tuple"),
     ("py:class", "Exception"),
-    ("py:class", "cornice.Service"),
+    ("py:class", "kinto.core.cornice.Service"),
     # Member autodoc fails with those:
     # kinto.core.resource.schema
     ("py:class", "Integer"),
@@ -163,7 +163,6 @@ def setup(app):
 
 intersphinx_mapping = {
     "colander": ("https://colander.readthedocs.io/en/latest/", None),
-    "cornice": ("https://cornice.readthedocs.io/en/latest/", None),
     "pyramid": ("https://pyramid.readthedocs.io/en/latest/", None),
 }
 

{kinto-19.5.0 → kinto-20.0.0}/docs/configuration/good-practices.rst

@@ -181,26 +181,6 @@ Using Amazon RDS
 * Use Route53 for loadbalancing
 
 
-Authentication service
-======================
-
-Each request contains an ``Authorization`` header that needs to be verified by the authentication service.
-
-In the case of Mozilla, *Kinto* is plugged with the *Firefox Accounts* OAuth service.
-
-
-Fail safe
----------
-
-With the *Firefox Accounts* policy, token verifications are cached for an amount of time.
-
-.. code-block:: ini
-
-    fxa-oauth.cache_ttl_seconds = 300  # 5 minutes
-
-If the remote service is down, the cache will allow the authentication of known token for a while. However new tokens will generate a 401 or 503 error response.
-
-
 Scheduled down time
 ===================
 
@@ -257,10 +237,10 @@ always remains the same.
 At the database level
 ----------------------
 
-PostgreSQL and Redis have sharding support built-in.
+PostgreSQL has sharding support built-in.
 
 The right database node is chosen based on some elements of the data query
-(most probably bucket or collection id) and partionning is then performed
+(most probably bucket or collection id) and partioning is then performed
 automatically.
 
 As an example, see `pgPool <http://www.pgpool.net/mediawiki/index.php/Main_Page>`_