Merge branch '3.4.x' into 3.5.x

tolbertam · tolbertam · commit 604213c4d78f · 2018-08-07T17:02:12.000-05:00
diff --git a/manual/README.md b/manual/README.md
@@ -277,6 +277,11 @@ for (ColumnDefinitions.Definition definition : row.getColumnDefinitions()) {
 }
 ```
 
+### Object mapping
+
+Besides explicit work with queries and rows, you can also use
+[Object Mapper](object_mapper/) to simplify retrieval & store of your data.
+
 
 ### More information
 
diff --git a/manual/object_mapper/creating/README.md b/manual/object_mapper/creating/README.md
@@ -221,7 +221,7 @@ declaration.
 
 [@Computed][computed] can be used on properties that are the result of a
 computation on the Cassandra side, typically a function call. Native
-functions in Cassandra like `writetime()` or [User Defined Functions] are
+functions in Cassandra like `writetime()` or [User-Defined Functions] are
 supported.
 
 ```java
@@ -263,7 +263,7 @@ it should be placed on either the field declaration or the property getter metho
 
 ### Mapping User Types
 
-[User Defined Types] can also be mapped by using [@UDT][udt]:
+[User-Defined Types] can also be mapped by using [@UDT][udt]:
 
 ```
 CREATE TYPE address (street text, zip_code int);
diff --git a/manual/object_mapper/using/README.md b/manual/object_mapper/using/README.md
@@ -202,7 +202,7 @@ implementation for it:
 
 ```java
 UserAccessor userAccessor = manager.createAccessor(UserAccessor.class);
-User user = userAccessor.getOne(uuid);
+Result<User> users = userAccessor.getAll();
 ```
 
 Like mappers, accessors are cached at the manager level and thus, are
diff --git a/manual/statements/prepared/README.md b/manual/statements/prepared/README.md
@@ -122,10 +122,10 @@ BoundStatement bound = ps1.bind()
 
 // Using the unset method to unset previously set value.
 // Positional setter:
-bound.unset("description");
+bound.unset(1);
 
 // Named setter:
-bound.unset(1);
+bound.unset("description");
 ```
 
 A bound statement also has getters to retrieve the values. Note that

Original file line number	Diff line number	Diff line change
`@@ -277,6 +277,11 @@ for (ColumnDefinitions.Definition definition : row.getColumnDefinitions()) {`
`277`	`277`	`}`
`278`	`278`	```
`279`	`279`
	`280`	`+### Object mapping`
	`281`	`+`
	`282`	`+Besides explicit work with queries and rows, you can also use`
	`283`	`+[Object Mapper](object_mapper/) to simplify retrieval & store of your data.`
	`284`	`+`
`280`	`285`
`281`	`286`	`### More information`
`282`	`287`