dql query re-org

.htmltest.yml

@@ -1,6 +1,6 @@
 DirectoryPath: "public"
 CheckDoctype: true
-CheckExternal: true
+CheckExternal: false
 CheckInternalHash: true
 IgnoreDirectoryMissingTrailingSlash: true
 IgnoreAltMissing: true

archived/cloud/advanced-queries.md

@@ -14,10 +14,10 @@ database operations. Advanced users can use DQL to send queries and mutations
 to Dgraph Cloud's HTTP or gRPC endpoints using the Dgraph client libraries.
 To learn more about the Dgraph client libraries, see the 
 [client library documentation](https://dgraph.io/docs/clients/). To learn more
-about DQL, see [DQL Fundamentals](https://dgraph.io/docs/query-language/graphql-fundamentals/)..
+about DQL, see [DQL Fundamentals]({{< relref "graphql-fundamentals.md">}})..
 
 If you are getting started with Dgraph Cloud, you should probably start out by
-using Dgraph's [GraphQL API](https://dgraph.io/docs/graphql/overview) instead.
+using Dgraph's [GraphQL API]({{< relref "graphql/_index.md">}) instead.
 Dgraph's GraphQL API lets you quickly use Dgraph Cloud before moving on to the
 advanced features available using DQL.
 

content/dql/clients/_index.md → content/clients/_index.md

@@ -7,7 +7,6 @@ aliases = ["/clients"]
 type = "docs"
 [menu.main]
   identifier = "clients"
-  parent = "dql"
 +++
 
 Dgraph client libraries allow you to run DQL transactions, queries and mutations in various programming languages.
@@ -55,7 +54,7 @@ transactions conflict when both transactions:
 - write values to the same scalar predicate of the same node (e.g both
   attempting to set a particular node's `address` predicate); or
 - write to a singular `uid` predicate of the same node (changes to `[uid]` predicates can be concurrently written); or
-- write a value that conflicts on an index for a predicate with `@upsert` set in the schema (see [upserts]({{< relref "howto/upserts.md">}})).
+- write a value that conflicts on an index for a predicate with `@upsert` set in the schema (see [upserts]({{< relref "upserts.md">}})).
 
 When a transaction is aborted, all its changes are discarded.  Transactions can be manually aborted.
 

content/dql/clients/raw-http.md → content/clients/raw-http.md

@@ -442,7 +442,7 @@ $ curl -X POST --compressed -H "Content-Type: application/dql" localhost:8080/qu
 
 ## Run a query in JSON format
 
-The HTTP API also accepts requests in JSON format. For queries you have the keys "query" and "variables". The JSON format is required to set [GraphQL Variables]({{< relref "query-language/graphql-variables.md" >}}) with the HTTP API.
+The HTTP API also accepts requests in JSON format. For queries you have the keys "query" and "variables". The JSON format is required to set [GraphQL Variables]({{< relref "graphql-variables.md" >}}) with the HTTP API.
 
 This query:
 

content/design-concepts/_index.md

@@ -1,8 +1,8 @@
 +++
 date = "2017-03-20T22:25:17+11:00"
 title = "Design Concepts"
-weight = 12
 type = "docs"
+weight = 17
 [menu.main]
   identifier = "design-concepts"
 +++

content/dgraph-glossary.md

@@ -3,7 +3,7 @@ title = "Dgraph Glossary"
 description = "Dgraph terms"
 type = "docs"
 [menu.main]
-    name = "Dgraph Glossary"
+    name = "Glossary"
     identifier = "glossary"
     weight = 16
 +++
@@ -18,7 +18,7 @@ Badger is a fast, open-source key-value database written in pure Go that provide
 More at [Badger documentation](https://dgraph.io/docs/badger)
 
 ### DQL ###
-Dgraph Query Language is Dgraph's proprietary language to insert, update, delete and query data. It is based on GraphQL, but is more expressive. (See also: [GraphQL](#GraphQL))
+Dgraph Query Language is Dgraph's proprietary language to insert, update, delete and query data. It is based on GraphQL, but is more expressive. (See also: [GraphQL](#graphql))
 
 ### Edge ###
 In the mental picture of a graph: bubbles connected by lines ; the bubbles are nodes, the lines are edges.
@@ -48,7 +48,7 @@ Conceptually, a node is "a thing" or an object of the business domain. For every
 The term "node" is also used in software architecture to reference a physical computer or a virtual machine running a module of Dgraph in a cluster. See [Aplha node](#alpha) and [Zero node](#zero).
 
 ### Predicate ###
-In [RDF](#RDF) terminology, a predicate is the smallest piece of information about an object. A predicate can hold a literal value or can describe a relation to another entity :
+In [RDF](#rdf) terminology, a predicate is the smallest piece of information about an object. A predicate can hold a literal value or can describe a relation to another entity :
 - when we store that an entity name is "Alice". The predicate is ``name`` and predicate value is the string "Alice". It becomes a node property.
 - when we store that Alice knows Bob, we may use a predicate ``knows`` with the node representing Alice. The value of this predicate would be the [uid](#uid) of the node representing Bob. In that case, ``knows`` is a [relationship](#relationship).
 

content/dql/_index.md

@@ -1,9 +1,9 @@
 +++
-title = "Dgraph Query Language"
+title = "Query Language"
 description = "Dgraph Query Language (DQL) is Dgraph's proprietary language to add, modify, delete and fetch data."
 type = "docs"
 [menu.main]
-  name = "Dgraph Query Language"
+  name = "Query Language"
   identifier = "dql"
   weight = 4
 +++

content/dql/dql-get-started.md

@@ -169,7 +169,7 @@ In these five steps, you set up Dgraph, added some data, visualized it as a grap
 
 
 - A wider range of queries can also be found in the
-[Query Language](/dql/dql-syntax/) reference.
+[Query Language]({{< relref "dql-query.md" >}}) reference.
 - Go to [Clients](/dql/clients/) to see how to
 communicate with Dgraph from your application.
 

content/dql/dql-syntax/dql-mutation.md → content/dql/dql-mutation.md

@@ -1,11 +1,11 @@
 +++
-title = "DQL mutation"
+title = "Mutation"
 type = "docs"
 [menu.main]
-  name = "DQL mutation"
+  name = "Mutation"
   identifier = "dql-mutation"
-  parent = "dql-syntax"
-  weight = 2
+  parent = "dql"
+  weight = 6
 +++
 
 Dgraph Query Language (DQL) is Dgraph's proprietary language to add, modify, delete and fetch data.
@@ -203,7 +203,7 @@ Execution of an upsert block also returns the response of the query executed on
 of the database *before mutation was executed*.
 To get the latest result, you have to execute another query after the transaction is committed.
 
-Variables defined in the query block can be used in the mutation blocks using the [uid]({{< relref "uid-upsert.md" >}}) and [val]({{< relref "val-upsert.md" >}}) functions.
+Variables defined in the query block can be used in the mutation blocks using the [uid]({{< relref "upserts.md#val-function" >}}) and [val]({{< relref "upserts.md#val-function" >}}) functions.
 
 ## conditional upsert
 The upsert block also allows specifying conditional mutation blocks using an `@if`

content/dql/dql-syntax/dql-rdf.md → content/dql/dql-rdf.md

@@ -1,11 +1,12 @@
 +++
-title = "RDF"
+title = "RDF Data Format"
 type = "docs"
+weight = 3
 [menu.main]
   name = "RDF"
   identifier = "dql-rdf"
-  parent = "dql-syntax"
-  weight = 3
+  parent = "dql"
+  weight = 2
 +++
 Dgrpah natively supports Resource Description Framework (RDF) when creating, importing and exporting data. Dgraph Client libraries can be used to query RDF as well.
 
@@ -130,7 +131,7 @@ While most RDF data uses only triples (with three parts) an optional fourth part
 
 ## Processing RDF to comply with Dgraph syntax for subjects
 
-While it is valid RDF to specify subjects that are IRI strings, Dgraph requires a numeric UID or a blank node as the subject. If a string IRI is required, Dgraph support them via [xid properties]({{< relref "external-ids-upsert-block" >}}). When importing RDF from another source that does not use numeric UID subjects, it will be required to replace arbitrary subject IRIs with blank node IRIs.
+While it is valid RDF to specify subjects that are IRI strings, Dgraph requires a numeric UID or a blank node as the subject. If a string IRI is required, Dgraph support them via [xid properties]({{< relref "upserts.md#external-ids" >}}). When importing RDF from another source that does not use numeric UID subjects, it will be required to replace arbitrary subject IRIs with blank node IRIs.
 
 Typically this is done simply by prepending "_:" to the start of the original IRI. So a triple such as:
 

content/dql/dql-schema.md

@@ -1,6 +1,6 @@
 +++
 date = "2017-03-20T22:25:17+11:00"
-title = "Dgraph types schema"
+title = "Schema"
 type = "docs"
 weight = 3
 aliases = ["/dql/type-system","dql/predicate-types"]