Merge pull request #2 from rlenferink/improve-breadcrumbs
Moved breadcrumbs from javascript to be Hugo generated
diff --git a/README.md b/README.md
index 1feb5f9..4b4286d 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,18 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
# Apache Jena website
@@ -22,12 +22,12 @@
## Repository structure
-This repository uses 2 branches for serving the website.
+This repository uses 3 branches for buiding the website.
- The `master` branch, which contains all the sources for the website.
- The `asf-site` branch, which contains the generated website being used for the actual website.
+- The `javadoc` branch, which has the javadoc to be published at
-When contributing patches, apply them to the `master` branch. Jenkins will then regenerate the website
-and commit the changes to the `asf-site` branch.
+When contributing patches, please create pull requests for the `master` branch.
## Content Management System
@@ -38,9 +38,18 @@
To generate the static website, execute `hugo` to generate and serve the website on `localhost:1313`.
-During development, it may be useful to run an incremental build. For this to work, execute `hugo server -D` to
-continuously generate and serve the website on `localhost:1313`.
+During development, it may be useful to run an incremental build. For this to
+work, execute `hugo server -D` to continuously generate and serve the website on
+`localhost:1313`.
-## Publish the website
+## Building and publishing the website
-Jenkins is used for generating the website and committing the generated site to the `asf-site` branch.
+The ASF Jenkins [Jena_Site job](https://builds.apache.org/job/Jena_Site/) is
+used for generating the website and committing the generated site to the
+`asf-site` branch.
+
+Separately, javadoc for a release is commited into the `javadoc` branch during
+the release process.
+
+[gitpubsub](https://www.apache.org/dev/gitpubsub.html) is used to publish the
+site, using the content from the `asf-site` and `javadoc` branches.
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index f13193b..ab63f73 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -105,7 +105,7 @@
<li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
<li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
<li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
- <li><a href="/documentation/javadoc/">All Javadoc</a></li>
+ <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
</ul>
</li>
diff --git a/source/download/__index.md b/source/download/__index.md
index bbe82d8..6ab0fde 100644
--- a/source/download/__index.md
+++ b/source/download/__index.md
@@ -45,18 +45,18 @@
The binary distribution may be downloaded at:
<a href="[preferred]jena/binaries/apache-jena-3.14.0.tar.gz">apache-jena-3.14.0.tar.gz</a>
-(<a href="https://www.apache.org/dist/jena/binaries/apache-jena-3.14.0.tar.gz.sha512">SHA512</a>,
-<a href="https://www.apache.org/dist/jena/binaries/apache-jena-3.14.0.tar.gz.asc">PGP</a>)
+(<a href="https://downloads.apache.org/jena/binaries/apache-jena-3.14.0.tar.gz.sha512">SHA512</a>,
+<a href="https://downloads.apache.org/jena/binaries/apache-jena-3.14.0.tar.gz.asc">PGP</a>)
<a href="[preferred]jena/binaries/apache-jena-3.14.0.zip">apache-jena-3.14.0.zip</a>
-(<a href="https://www.apache.org/dist/jena/binaries/apache-jena-3.14.0.zip.sha512">SHA512</a>,
-<a href="https://www.apache.org/dist/jena/binaries/apache-jena-3.14.0.zip.asc">PGP</a>)
+(<a href="https://downloads.apache.org/jena/binaries/apache-jena-3.14.0.zip.sha512">SHA512</a>,
+<a href="https://downloads.apache.org/jena/binaries/apache-jena-3.14.0.zip.asc">PGP</a>)
The source distribution, which includes the source for Fuseki and all modules in the release, may be downloaded at:
<a href="[preferred]jena/source/jena-3.14.0-source-release.zip">jena-3.14.0-source-release.zip</a>
-(<a href="https://www.apache.org/dist/jena/source/jena-3.14.0-source-release.zip.sha512">SHA512</a>,
-<a href="https://www.apache.org/dist/jena/source/jena-3.14.0-source-release.zip.asc">PGP</a>)
+(<a href="https://downloads.apache.org/jena/source/jena-3.14.0-source-release.zip.sha512">SHA512</a>,
+<a href="https://downloads.apache.org/jena/source/jena-3.14.0-source-release.zip.asc">PGP</a>)
### Apache Jena Fuseki
@@ -64,12 +64,12 @@
WAR file packaging) may be downloaded at:
<a href="[preferred]jena/binaries/apache-jena-fuseki-3.14.0.tar.gz">apache-jena-fuseki-3.14.0.tar.gz</a>
-(<a href="https://www.apache.org/dist/jena/binaries/apache-jena-fuseki-3.14.0.tar.gz.sha512">SHA512</a>,
-<a href="https://www.apache.org/dist/jena/binaries/apache-jena-fuseki-3.14.0.tar.gz.asc">PGP</a>)
+(<a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-3.14.0.tar.gz.sha512">SHA512</a>,
+<a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-3.14.0.tar.gz.asc">PGP</a>)
<a href="[preferred]jena/binaries/apache-jena-fuseki-3.14.0.zip">apache-jena-fuseki-3.14.0.zip</a>
-(<a href="https://www.apache.org/dist/jena/binaries/apache-jena-fuseki-3.14.0.zip.sha512">SHA512</a>,
-<a href="https://www.apache.org/dist/jena/binaries/apache-jena-fuseki-3.14.0.zip.asc">PGP</a>)
+(<a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-3.14.0.zip.sha512">SHA512</a>,
+<a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-3.14.0.zip.asc">PGP</a>)
### Individual Modules
diff --git a/static/tutorials/sparql_data/ds-dft.ttl b/static/tutorials/sparql_data/ds-dft.ttl
index 226d98e..d0ec1b6 100644
--- a/static/tutorials/sparql_data/ds-dft.ttl
+++ b/static/tutorials/sparql_data/ds-dft.ttl
@@ -1,6 +1,6 @@
-@prefix dc: <http://purl.org/dc/elements/1.1/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix web: <http://example/> .
-
-<ds-ng-1.ttl> dc:date "2005-07-14T03:18:56+01:00"^^xsd:dateTime .
-<ds-ng-2.ttl> dc:date "2005-09-22T05:53:05+01:00"^^xsd:dateTime .
+@prefix dc: <http://purl.org/dc/elements/1.1/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix web: <http://example/> .
+
+<ds-ng-1.ttl> dc:date "2005-07-14T03:18:56+01:00"^^xsd:dateTime .
+<ds-ng-2.ttl> dc:date "2005-09-22T05:53:05+01:00"^^xsd:dateTime .
diff --git a/static/tutorials/sparql_data/ds-ng-1.ttl b/static/tutorials/sparql_data/ds-ng-1.ttl
index 32dda24..5e99e41 100644
--- a/static/tutorials/sparql_data/ds-ng-1.ttl
+++ b/static/tutorials/sparql_data/ds-ng-1.ttl
@@ -1,4 +1,4 @@
-@prefix dc: <http://purl.org/dc/elements/1.1/> .
-
-[] dc:title "Harry Potter and the Philospher's Stone" .
-[] dc:title "Harry Potter and the Chamber of Secrets" .
+@prefix dc: <http://purl.org/dc/elements/1.1/> .
+
+[] dc:title "Harry Potter and the Philospher's Stone" .
+[] dc:title "Harry Potter and the Chamber of Secrets" .
diff --git a/static/tutorials/sparql_data/ds-ng-2.ttl b/static/tutorials/sparql_data/ds-ng-2.ttl
index 39b979f..d39262a 100644
--- a/static/tutorials/sparql_data/ds-ng-2.ttl
+++ b/static/tutorials/sparql_data/ds-ng-2.ttl
@@ -1,4 +1,4 @@
-@prefix dc: <http://purl.org/dc/elements/1.1/> .
-
-[] dc:title "Harry Potter and the Sorcerer's Stone" .
-[] dc:title "Harry Potter and the Chamber of Secrets" .
+@prefix dc: <http://purl.org/dc/elements/1.1/> .
+
+[] dc:title "Harry Potter and the Sorcerer's Stone" .
+[] dc:title "Harry Potter and the Chamber of Secrets" .
diff --git a/static/tutorials/sparql_data/q-bp1.rq b/static/tutorials/sparql_data/q-bp1.rq
index 7749258..99236be 100644
--- a/static/tutorials/sparql_data/q-bp1.rq
+++ b/static/tutorials/sparql_data/q-bp1.rq
@@ -1,4 +1,4 @@
-SELECT ?x ?name
-WHERE
- { ?x <http://www.w3.org/2001/vcard-rdf/3.0#FN> ?name }
-
+SELECT ?x ?name
+WHERE
+ { ?x <http://www.w3.org/2001/vcard-rdf/3.0#FN> ?name }
+
diff --git a/static/tutorials/sparql_data/q-bp2.rq b/static/tutorials/sparql_data/q-bp2.rq
index f2cafa4..22e95b7 100644
--- a/static/tutorials/sparql_data/q-bp2.rq
+++ b/static/tutorials/sparql_data/q-bp2.rq
@@ -1,6 +1,6 @@
-SELECT ?givenName
-WHERE
- { ?y <http://www.w3.org/2001/vcard-rdf/3.0#Family> "Smith" .
- ?y <http://www.w3.org/2001/vcard-rdf/3.0#Given> ?givenName .
- }
-
+SELECT ?givenName
+WHERE
+ { ?y <http://www.w3.org/2001/vcard-rdf/3.0#Family> "Smith" .
+ ?y <http://www.w3.org/2001/vcard-rdf/3.0#Given> ?givenName .
+ }
+
diff --git a/static/tutorials/sparql_data/q-bp3.rq b/static/tutorials/sparql_data/q-bp3.rq
index 32f0c02..de40c98 100644
--- a/static/tutorials/sparql_data/q-bp3.rq
+++ b/static/tutorials/sparql_data/q-bp3.rq
@@ -1,8 +1,8 @@
-PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?givenName
-WHERE
- { ?y vcard:Family "Smith" .
- ?y vcard:Given ?givenName .
- }
-
+PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?givenName
+WHERE
+ { ?y vcard:Family "Smith" .
+ ?y vcard:Given ?givenName .
+ }
+
diff --git a/static/tutorials/sparql_data/q-bp4.rq b/static/tutorials/sparql_data/q-bp4.rq
index 4df12d5..5ad5a65 100644
--- a/static/tutorials/sparql_data/q-bp4.rq
+++ b/static/tutorials/sparql_data/q-bp4.rq
@@ -1,8 +1,8 @@
-PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?y ?givenName
-WHERE
- { ?y vcard:Family "Smith" .
- ?y vcard:Given ?givenName .
- }
-
+PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?y ?givenName
+WHERE
+ { ?y vcard:Family "Smith" .
+ ?y vcard:Given ?givenName .
+ }
+
diff --git a/static/tutorials/sparql_data/q-ds-1.rq b/static/tutorials/sparql_data/q-ds-1.rq
index f95c73a..0cca0e7 100644
--- a/static/tutorials/sparql_data/q-ds-1.rq
+++ b/static/tutorials/sparql_data/q-ds-1.rq
@@ -1,6 +1,6 @@
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX dc: <http://purl.org/dc/elements/1.1/>
-PREFIX : <.>
-
-SELECT *
-{ ?s ?p ?o }
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+PREFIX : <.>
+
+SELECT *
+{ ?s ?p ?o }
diff --git a/static/tutorials/sparql_data/q-ds-2.rq b/static/tutorials/sparql_data/q-ds-2.rq
index edc3938..8716e93 100644
--- a/static/tutorials/sparql_data/q-ds-2.rq
+++ b/static/tutorials/sparql_data/q-ds-2.rq
@@ -1,8 +1,8 @@
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX dc: <http://purl.org/dc/elements/1.1/>
-PREFIX : <.>
-
-SELECT *
-{
- { ?s ?p ?o } UNION { GRAPH ?g { ?s ?p ?o } }
-}
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+PREFIX : <.>
+
+SELECT *
+{
+ { ?s ?p ?o } UNION { GRAPH ?g { ?s ?p ?o } }
+}
diff --git a/static/tutorials/sparql_data/q-ds-3.rq b/static/tutorials/sparql_data/q-ds-3.rq
index 0c681f4..da7d967 100644
--- a/static/tutorials/sparql_data/q-ds-3.rq
+++ b/static/tutorials/sparql_data/q-ds-3.rq
@@ -1,8 +1,8 @@
-PREFIX dc: <http://purl.org/dc/elements/1.1/>
-PREFIX : <.>
-
-SELECT ?title
-{
- GRAPH :ds-ng-2.ttl
- { ?b dc:title ?title }
-}
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+PREFIX : <.>
+
+SELECT ?title
+{
+ GRAPH :ds-ng-2.ttl
+ { ?b dc:title ?title }
+}
diff --git a/static/tutorials/sparql_data/q-ds-4.rq b/static/tutorials/sparql_data/q-ds-4.rq
index 47bd718..7a3c191 100644
--- a/static/tutorials/sparql_data/q-ds-4.rq
+++ b/static/tutorials/sparql_data/q-ds-4.rq
@@ -1,10 +1,10 @@
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX dc: <http://purl.org/dc/elements/1.1/>
-PREFIX : <.>
-
-SELECT ?date ?title
-{
- ?g dc:date ?date . FILTER (?date > "2005-08-01T00:00:00Z"^^xsd:dateTime )
- GRAPH ?g
- { ?b dc:title ?title }
-}
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+PREFIX : <.>
+
+SELECT ?date ?title
+{
+ ?g dc:date ?date . FILTER (?date > "2005-08-01T00:00:00Z"^^xsd:dateTime )
+ GRAPH ?g
+ { ?b dc:title ?title }
+}
diff --git a/static/tutorials/sparql_data/q-ds-5.rq b/static/tutorials/sparql_data/q-ds-5.rq
index 096ccbb..3b9a31c 100644
--- a/static/tutorials/sparql_data/q-ds-5.rq
+++ b/static/tutorials/sparql_data/q-ds-5.rq
@@ -1,11 +1,11 @@
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX dc: <http://purl.org/dc/elements/1.1/>
-PREFIX : <.>
-
-SELECT *
-FROM <ds-dft.ttl>
-FROM NAMED <ds-ng-1.ttl>
-FROM NAMED <ds-ng-2.ttl>
-{
- { ?s ?p ?o } UNION { GRAPH ?g { ?s ?p ?o } }
-}
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+PREFIX : <.>
+
+SELECT *
+FROM <ds-dft.ttl>
+FROM NAMED <ds-ng-1.ttl>
+FROM NAMED <ds-ng-2.ttl>
+{
+ { ?s ?p ?o } UNION { GRAPH ?g { ?s ?p ?o } }
+}
diff --git a/static/tutorials/sparql_data/q-f1.rq b/static/tutorials/sparql_data/q-f1.rq
index 23dc333..6389303 100644
--- a/static/tutorials/sparql_data/q-f1.rq
+++ b/static/tutorials/sparql_data/q-f1.rq
@@ -1,6 +1,6 @@
-PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?g
-WHERE
- { ?y vcard:Given ?g . FILTER regex(?g, "r", "i") }
-
+PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?g
+WHERE
+ { ?y vcard:Given ?g . FILTER regex(?g, "r", "i") }
+
diff --git a/static/tutorials/sparql_data/q-f2.rq b/static/tutorials/sparql_data/q-f2.rq
index 41be169..0437a26 100644
--- a/static/tutorials/sparql_data/q-f2.rq
+++ b/static/tutorials/sparql_data/q-f2.rq
@@ -1,8 +1,8 @@
-PREFIX info: <http://somewhere/peopleInfo#>
-
-SELECT ?resource
-WHERE
- {
- ?resource info:age ?age .
- FILTER (?age >= 24)
- }
+PREFIX info: <http://somewhere/peopleInfo#>
+
+SELECT ?resource
+WHERE
+ {
+ ?resource info:age ?age .
+ FILTER (?age >= 24)
+ }
diff --git a/static/tutorials/sparql_data/q-opt1.rq b/static/tutorials/sparql_data/q-opt1.rq
index d2cf0e7..83c9c5d 100644
--- a/static/tutorials/sparql_data/q-opt1.rq
+++ b/static/tutorials/sparql_data/q-opt1.rq
@@ -1,10 +1,10 @@
-# Optional example
-PREFIX info: <http://somewhere/peopleInfo#>
-PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name ?age
-WHERE
-{
- ?person vcard:FN ?name .
- OPTIONAL { ?person info:age ?age }
+# Optional example
+PREFIX info: <http://somewhere/peopleInfo#>
+PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name ?age
+WHERE
+{
+ ?person vcard:FN ?name .
+ OPTIONAL { ?person info:age ?age }
}
\ No newline at end of file
diff --git a/static/tutorials/sparql_data/q-opt2.rq b/static/tutorials/sparql_data/q-opt2.rq
index 9283513..9243ee7 100644
--- a/static/tutorials/sparql_data/q-opt2.rq
+++ b/static/tutorials/sparql_data/q-opt2.rq
@@ -1,10 +1,10 @@
-# Optional example
-PREFIX info: <http://somewhere/peopleInfo#>
-PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name ?age
-WHERE
-{
- ?person vcard:FN ?name .
- ?person info:age ?age .
+# Optional example
+PREFIX info: <http://somewhere/peopleInfo#>
+PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name ?age
+WHERE
+{
+ ?person vcard:FN ?name .
+ ?person info:age ?age .
}
\ No newline at end of file
diff --git a/static/tutorials/sparql_data/q-opt3.rq b/static/tutorials/sparql_data/q-opt3.rq
index a66ee14..4e75ecf 100644
--- a/static/tutorials/sparql_data/q-opt3.rq
+++ b/static/tutorials/sparql_data/q-opt3.rq
@@ -1,10 +1,10 @@
-# Optional example
-PREFIX info: <http://somewhere/peopleInfo#>
-PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name ?age
-WHERE
-{
- ?person vcard:FN ?name .
- OPTIONAL { ?person info:age ?age . FILTER ( ?age > 24 ) }
+# Optional example
+PREFIX info: <http://somewhere/peopleInfo#>
+PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name ?age
+WHERE
+{
+ ?person vcard:FN ?name .
+ OPTIONAL { ?person info:age ?age . FILTER ( ?age > 24 ) }
}
\ No newline at end of file
diff --git a/static/tutorials/sparql_data/q-opt4.rq b/static/tutorials/sparql_data/q-opt4.rq
index ad5f881..13b2300 100644
--- a/static/tutorials/sparql_data/q-opt4.rq
+++ b/static/tutorials/sparql_data/q-opt4.rq
@@ -1,11 +1,11 @@
-# Optional example
-PREFIX info: <http://somewhere/peopleInfo#>
-PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name ?age
-WHERE
-{
- ?person vcard:FN ?name .
- OPTIONAL { ?person info:age ?age . }
- FILTER ( !bound(?age) || ?age > 24 )
+# Optional example
+PREFIX info: <http://somewhere/peopleInfo#>
+PREFIX vcard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name ?age
+WHERE
+{
+ ?person vcard:FN ?name .
+ OPTIONAL { ?person info:age ?age . }
+ FILTER ( !bound(?age) || ?age > 24 )
}
\ No newline at end of file
diff --git a/static/tutorials/sparql_data/q-union1.rq b/static/tutorials/sparql_data/q-union1.rq
index 6a71e45..de8e17e 100644
--- a/static/tutorials/sparql_data/q-union1.rq
+++ b/static/tutorials/sparql_data/q-union1.rq
@@ -1,8 +1,8 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name
-WHERE
-{
- { [] foaf:name ?name } UNION { [] vCard:FN ?name }
-}
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name
+WHERE
+{
+ { [] foaf:name ?name } UNION { [] vCard:FN ?name }
+}
diff --git a/static/tutorials/sparql_data/q-union1alt.rq b/static/tutorials/sparql_data/q-union1alt.rq
index 261f35d..8a341df 100644
--- a/static/tutorials/sparql_data/q-union1alt.rq
+++ b/static/tutorials/sparql_data/q-union1alt.rq
@@ -1,9 +1,9 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name
-WHERE
-{
- [] ?p ?name
- FILTER (?p = foaf:name || ?p = vCard:FN)
-}
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name
+WHERE
+{
+ [] ?p ?name
+ FILTER (?p = foaf:name || ?p = vCard:FN)
+}
diff --git a/static/tutorials/sparql_data/q-union2.rq b/static/tutorials/sparql_data/q-union2.rq
index c60e866..829689c 100644
--- a/static/tutorials/sparql_data/q-union2.rq
+++ b/static/tutorials/sparql_data/q-union2.rq
@@ -1,8 +1,8 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name1 ?name2
-WHERE
-{
- { [] foaf:name ?name1 } UNION { [] vCard:FN ?name2 }
-}
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name1 ?name2
+WHERE
+{
+ { [] foaf:name ?name1 } UNION { [] vCard:FN ?name2 }
+}
diff --git a/static/tutorials/sparql_data/q-union3.rq b/static/tutorials/sparql_data/q-union3.rq
index 355fbbe..8b33dc3 100644
--- a/static/tutorials/sparql_data/q-union3.rq
+++ b/static/tutorials/sparql_data/q-union3.rq
@@ -1,10 +1,10 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
-
-SELECT ?name1 ?name2
-WHERE
-{
- ?x a foaf:Person
- OPTIONAL { ?x foaf:name ?name1 }
- OPTIONAL { ?x vCard:FN ?name2 }
-}
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX vCard: <http://www.w3.org/2001/vcard-rdf/3.0#>
+
+SELECT ?name1 ?name2
+WHERE
+{
+ ?x a foaf:Person
+ OPTIONAL { ?x foaf:name ?name1 }
+ OPTIONAL { ?x vCard:FN ?name2 }
+}
diff --git a/static/tutorials/sparql_data/q1.rq b/static/tutorials/sparql_data/q1.rq
index 0509244..fe5a103 100644
--- a/static/tutorials/sparql_data/q1.rq
+++ b/static/tutorials/sparql_data/q1.rq
@@ -1,4 +1,4 @@
-SELECT ?x
-WHERE
- { ?x <http://www.w3.org/2001/vcard-rdf/3.0#FN> "John Smith" }
-
+SELECT ?x
+WHERE
+ { ?x <http://www.w3.org/2001/vcard-rdf/3.0#FN> "John Smith" }
+
diff --git a/static/tutorials/sparql_data/vc-db-3.ttl b/static/tutorials/sparql_data/vc-db-3.ttl
index 3c8519b..be35504 100644
--- a/static/tutorials/sparql_data/vc-db-3.ttl
+++ b/static/tutorials/sparql_data/vc-db-3.ttl
@@ -1,15 +1,15 @@
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix vcard: <http://www.w3.org/2001/vcard-rdf/3.0#> .
-
-_:a a foaf:Person ;
- foaf:name "Matt Jones" .
-
-_:b a foaf:Person ;
- foaf:name "Sarah Jones" .
-
-_:c a foaf:Person ;
- vcard:FN "Becky Smith" .
-
-_:d a foaf:Person ;
- vcard:FN "John Smith" .
-
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix vcard: <http://www.w3.org/2001/vcard-rdf/3.0#> .
+
+_:a a foaf:Person ;
+ foaf:name "Matt Jones" .
+
+_:b a foaf:Person ;
+ foaf:name "Sarah Jones" .
+
+_:c a foaf:Person ;
+ vcard:FN "Becky Smith" .
+
+_:d a foaf:Person ;
+ vcard:FN "John Smith" .
+
