rebase fix

Informasjonsforvaltning · Jul 18, 2024 · 0bda00d · 0bda00d
1 parent e3e2a3d
commit 0bda00d
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 74 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,7 +1,7 @@
 name: github pages
 
 on:
-  push:
+  pull_request:
     branches:
       - master
 

diff --git a/...a.norge.no/Søk_og_filter/Filter/_index.md → content/Data.norge.no/Search/LLM/_index.md b/...a.norge.no/Søk_og_filter/Filter/_index.md → content/Data.norge.no/Search/LLM/_index.md
diff --git a/...elles datakatalog/Search/Search/_index.md → ...ent/Data.norge.no/Search/Search/_index.md b/...elles datakatalog/Search/Search/_index.md → ...ent/Data.norge.no/Search/Search/_index.md
diff --git a/...elles datakatalog/Search/Sparql/_index.md → ...ent/Data.norge.no/Search/Sparql/_index.md b/...elles datakatalog/Search/Sparql/_index.md → ...ent/Data.norge.no/Search/Sparql/_index.md
diff --git a/content/Felles datakatalog/Search/_index.md → content/Data.norge.no/Search/_index.md b/content/Felles datakatalog/Search/_index.md → content/Data.norge.no/Search/_index.md
@@ -9,16 +9,16 @@ There are 3 different ways to search for data in Data.norge.no, each is based on
 
 The main search service in Data.norge.no is based on ElasticSearch. This service searches the text in a limited selection of fields, and has filters and other advanced functionality that helps users navigate.
 
-[See this page for more info](https://informasjonsforvaltning.github.io/felles-datakatalog/search/search)
+[See this page for more info](https://informasjonsforvaltning.github.io/data.norge.no/search/search)
 
 ### LLM
 
 The LLM search service uses a 'Large Language Model' (LLM) that is built from the same data used in the main search, but will accept naturally worded queries where the other search demands exact wording of titles or keywords.
 
-[See this page for more info](https://informasjonsforvaltning.github.io/felles-datakatalog/search/llm)
+[See this page for more info](https://informasjonsforvaltning.github.io/data.norge.no/search/llm)
 
 ### SPARQL
 
 The SPARQL search service is based on the RDF query language SPARQL, and is our most advanced and powerful search. A user will have to create queries that follows the correct syntax, but will be able to search all harvested data points, not just pre-selected fields.
 
-[See this page for more info](https://informasjonsforvaltning.github.io/felles-datakatalog/search/sparql)
+[See this page for more info](https://informasjonsforvaltning.github.io/data.norge.no/search/sparql)
diff --git a/content/Data.norge.no/Søk_og_filter/Sparql/_index.md b/content/Data.norge.no/Søk_og_filter/Sparql/_index.md
diff --git a/content/Data.norge.no/Søk_og_filter/Søk/_index.md b/content/Data.norge.no/Søk_og_filter/Søk/_index.md
diff --git a/content/Data.norge.no/Søk_og_filter/_index.md b/content/Data.norge.no/Søk_og_filter/_index.md
diff --git a/content/Felles datakatalog/Search/LLM/_index.md b/content/Felles datakatalog/Search/LLM/_index.md