Merge branch 'hotfix-0.10.7' into develop

akira-dev · akira-dev · commit 8adee3686886 · 2017-03-14T18:10:43.000+01:00
diff --git a/docs/index.rst b/docs/index.rst
@@ -12,7 +12,7 @@ Main concepts
    :width: 600px
    :alt: Architecture
 
-| * `**JSON API 1.0** specification <http://jsonapi.org/>`_: it is a very popular specification about client server interactions for REST JSON API. It helps you to work in team because it is a very precise and sharable. Thanks to this specification your server will offer lot a features for clients like a strong structure of request and response, filtering, pagination, sparse fieldsets, including related resources, great error formatting etc.
+| * `JSON API 1.0 specification <http://jsonapi.org/>`_: it is a very popular specification about client server interactions for REST JSON API. It helps you to work in team because it is a very precise and sharable. Thanks to this specification your server will offer lot a features for clients like a strong structure of request and response, filtering, pagination, sparse fieldsets, including related resources, great error formatting etc.
 | 
 | * **Logical data abstration**: you usually need to expose resources to clients that don't fit your data table architecture. For example sometimes you don't want to expose all attributes of a table or compute additional attribut for a resource or create a resource that use data from multiple data storage. Flask-REST-JSONAPI helps you to create a logical abstraction of your data with `Marshmallow <https://marshmallow.readthedocs.io/en/latest/>`_ / `marshmallow-jsonapi <https://marshmallow-jsonapi.readthedocs.io/>`_ so you can expose your data through a very flexible way.
 | 
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 
-__version__ = '0.10.6'
+__version__ = '0.10.7'
 
 
 setup(

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ Main concepts`
`12`	`12`	`:width: 600px`
`13`	`13`	`:alt: Architecture`
`14`	`14`
`15`		-\| * `JSON API 1.0 specification <http://jsonapi.org/>`_: it is a very popular specification about client server interactions for REST JSON API. It helps you to work in team because it is a very precise and sharable. Thanks to this specification your server will offer lot a features for clients like a strong structure of request and response, filtering, pagination, sparse fieldsets, including related resources, great error formatting etc.
	`15`	+\| * `JSON API 1.0 specification <http://jsonapi.org/>`_: it is a very popular specification about client server interactions for REST JSON API. It helps you to work in team because it is a very precise and sharable. Thanks to this specification your server will offer lot a features for clients like a strong structure of request and response, filtering, pagination, sparse fieldsets, including related resources, great error formatting etc.
`16`	`16`	`\|`
`17`	`17`	\| * Logical data abstration: you usually need to expose resources to clients that don't fit your data table architecture. For example sometimes you don't want to expose all attributes of a table or compute additional attribut for a resource or create a resource that use data from multiple data storage. Flask-REST-JSONAPI helps you to create a logical abstraction of your data with `Marshmallow <https://marshmallow.readthedocs.io/en/latest/>`_ / `marshmallow-jsonapi <https://marshmallow-jsonapi.readthedocs.io/>`_ so you can expose your data through a very flexible way.
`18`	`18`	`\|`