include:: (devguide) fixes

Author: RichardSmedley

modules/concept-docs/pages/n1ql-query.adoc

@@ -17,7 +17,7 @@ The maximum client-side query cache size is 5000 entries.
 
 [source,java]
 ----
-include::example$N1qlQueryExample.java[tag=n1ql_query_1,indent=0]
+include::devguide:example$java/N1qlQueryExample.java[tag=n1ql_query_1,indent=0]
 ----
 
 
@@ -65,7 +65,7 @@ You can also create and define indexes in the SDK using:
 
 [source,java]
 ----
-include::example$N1qlQueryExample.java[tag=n1ql_query_2,indent=0]
+include::devguide:example$java/N1qlQueryExample.java[tag=n1ql_query_2,indent=0]
 ----
 
 
@@ -91,7 +91,7 @@ Building deferred indexes can also be done via the SDK:
 
 [source,java]
 ----
-include::example$N1qlQueryExample.java[tag=n1ql_query_3,indent=0]
+include::devguide:example$java/N1qlQueryExample.java[tag=n1ql_query_3,indent=0]
 ----
 
 
@@ -106,7 +106,7 @@ Consider the following snippet:
 
 [source,java]
 ----
-include::example$N1qlQueryExample.java[tag=n1ql_query_4,indent=0]
+include::devguide:example$java/N1qlQueryExample.java[tag=n1ql_query_4,indent=0]
 ----
 
 The above query may not return the newly inserted document because it has not yet been indexed.
@@ -116,12 +116,13 @@ If the above code is modified to use _REQUEST_PLUS_, query processing will wait
 
 [source,java]
 ----
-include::example$N1qlQueryExample.java[tag=n1ql_query_5,indent=0]
+include::devguide:example$java/N1qlQueryExample.java[tag=n1ql_query_5,indent=0]
 ----
 
 This gives the application developer more control over the balance between performance (latency) and consistency,
 and allows optimization on a case-by-case basis.
 
+
 == Collections and Scopes, and the Query Context
 
 From Couchbase Server release 7.0 the xref:7.1@server:learn:data/scopes-and-collections.adoc[Collections] feature lets you logically group similar documents into Collections.
@@ -142,5 +143,5 @@ For example, from the context of `{backtick}travel-sample{backtick}.inventory`,
 SELECT * FROM airline;
 ----
 
-To do this, you can xref:7.1@server:tools:query-workbench.adoc#query-context[Set a Query Context] in the Query Workbench
-or xref:howtos:n1ql-queries-with-sdk.adoc#querying-at-scope-level[query at scope level] using the SDK.
+To do this, you can xref:server:tools:query-workbench.adoc#query-context[Set a Query Context] in the Query Workbench
+or xref:howtos:sqlpp-queries-with-sdk.adoc#querying-at-scope-level[query at scope level] using the SDK.