Merge branch 'master' into v1

Author: jmdobry

guide/angular-cache/basics.md

@@ -80,12 +80,12 @@ angular.module('app', ['angular-data.DSCacheFactory'])
 
         DSCacheFactoryProvider.setCacheDefaults({
             maxAge: 3600000,
-                deleteOnExpire: 'aggressive',
-                onExpire: function (key, value) {
-                    $http.get(key).success(function (data) {
-                        profileCache.put(key, data);
-                    });
-                }
+            deleteOnExpire: 'aggressive',
+            onExpire: function (key, value) {
+                $http.get(key).success(function (data) {
+                    profileCache.put(key, data);
+                });
+            }
         });
     });
 ```

guide/angular-data/queries.md

@@ -119,7 +119,7 @@ Params definition:
     }
   },
   skip: <number>,
-  offset: <number>, // same as offset
+  offset: <number>, // same as skip
   limit: <number>,
   orderBy: <array>,
   sort: <array> // same as orderBy