diff --git a/.github/workflows/adocs-build-and-publish-develop.yml b/.github/workflows/adocs-build-and-publish-develop.yml index ccf4928..8184cf2 100644 --- a/.github/workflows/adocs-build-and-publish-develop.yml +++ b/.github/workflows/adocs-build-and-publish-develop.yml @@ -1,4 +1,4 @@ -name: build adocs and publish to develop (github pages) +name: Build adocs develop and publish to Github pages on: push: @@ -10,21 +10,21 @@ on: jobs: adoc_build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest name: asciidoctor build steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Build html id: adocbuild - uses: avattathil/asciidoctor-action@master + uses: tonynv/asciidoctor-action@master with: program: "asciidoctor -D docs -o index.html -a lang=nb docs/main.adoc" - name: Build pdf id: adocbuild_pdf - uses: avattathil/asciidoctor-action@master + uses: tonynv/asciidoctor-action@master with: - program: "asciidoctor-pdf -D docs -o forvaltningsstandard-begrepsbeskrivelser.pdf -a lang=nb docs/main.adoc" + program: "asciidoctor-pdf -D docs -o forvaltningsstandard-begrepsbeskrivelser-utfases.pdf -a lang=nb docs/main.adoc" continue-on-error: true - name: Deploy uses: peaceiris/actions-gh-pages@v3 diff --git a/.github/workflows/adocs-build-and-publish-v1-production.yml b/.github/workflows/adocs-build-and-publish-v1-production.yml index 825eae3..556263b 100644 --- a/.github/workflows/adocs-build-and-publish-v1-production.yml +++ b/.github/workflows/adocs-build-and-publish-v1-production.yml @@ -1,4 +1,4 @@ -name: build adocs and publish to production +name: Build adocs and publish v1 to production on: push: @@ -21,19 +21,19 @@ jobs: - name: Build html id: adocbuild - uses: avattathil/asciidoctor-action@master + uses: tonynv/asciidoctor-action@master with: program: "asciidoctor -D docs -o index.html -a lang=nb docs/main.adoc" - name: Build pdf id: adocbuild_pdf - uses: avattathil/asciidoctor-action@master + uses: tonynv/asciidoctor-action@master with: - program: "asciidoctor-pdf -D docs -o files/forvaltningsstandard-begrepsbeskrivelser.pdf -a lang=nb docs/main.adoc" + program: "asciidoctor-pdf -D docs -o files/forvaltningsstandard-begrepsbeskrivelser-utfases.pdf -a lang=nb docs/main.adoc" continue-on-error: true - name: Upload rdf to static-rdf-server - uses: Informasjonsforvaltning/upload-files-to-static-rdf-server-action@v3.1.0 + uses: Informasjonsforvaltning/upload-files-to-static-rdf-server-action@v3.2.0 id: upload-rdf with: ontology-type: "specification" @@ -42,8 +42,8 @@ jobs: api-key: ${{ secrets.STATIC_RDF_SERVER_API_KEY }} files: | docs/index.html text/html nb - docs/files/forvaltningsstandard-begrepsbeskrivelser.pdf application/pdf nb files/forvaltningsstandard-begrepsbeskrivelser.pdf + docs/files/forvaltningsstandard-begrepsbeskrivelser-utfases.pdf application/pdf nb files/forvaltningsstandard-begrepsbeskrivelser-utfases.pdf docs/files/StandardForBegrepsbeskrivelse.xsd application/octet-stream nb files/StandardForBegrepsbeskrivelse.xsd - docs/images/digitaliseringsdirektoratet.png image/png nb images/digitaliseringsdirektoratet.png + docs/images/Digdir.png image/png nb images/Digdir.png docs/images/UML-v2.0.jpg image/jpeg nb images/UML-v2.0.jpg docs/images/UML-v2.0.png image/png nb images/UML-v2.0.png diff --git a/docs/images/Digdir.png b/docs/images/Digdir.png new file mode 100644 index 0000000..d060913 Binary files /dev/null and b/docs/images/Digdir.png differ diff --git a/docs/images/digitaliseringsdirektoratet.png b/docs/images/digitaliseringsdirektoratet.png deleted file mode 100644 index c2d31ea..0000000 Binary files a/docs/images/digitaliseringsdirektoratet.png and /dev/null differ diff --git a/docs/main.adoc b/docs/main.adoc index b94d5be..bf7399b 100644 --- a/docs/main.adoc +++ b/docs/main.adoc @@ -1,6 +1,7 @@ include::locale/attributes.adoc[] = Forvaltningsstandard for begrepsbeskrivelser - Versjon 2.0.2 +Digitaliseringsdirektoratet (Digdir) / The Norwegian Digitalisation Agency :description: Forvaltningsstandard for begrepsbeskrivelser :doctype: book :docinfo: @@ -8,7 +9,7 @@ include::locale/attributes.adoc[] :toc: left :toclevels: 2 :sectanchors: -:title-logo-image: image:images/digitaliseringsdirektoratet.png[pdfwidth=30vw] +:title-logo-image: image:images/Digdir.png[pdfwidth=30vw] :table-stripes: even //:sectnums: @@ -17,22 +18,14 @@ include::locale/attributes.adoc[] //{description} -image::images/digitaliseringsdirektoratet.png[width=50%, pdfwidth=30vw] - -WARNING: #Standarden er p.t. under revisjon#. Forslag til revidert versjon vil bli tilgjengelig som https://informasjonsforvaltning.github.io/skos-ap-no-begrep/[Redaktørens utkast] +image::images/Digdir.png[width=50%, pdfwidth=30vw] +*Status*: #Fases ut# og erstattes av https://data.norge.no/specification/skos-ap-no-begrep[Forvaltningsstandard for begrepsbeskrivelser (SKOS-AP-NO-Begrep)] + *Publisert*: 2019-03-15 (v.2.0) + -*Oppdatert*: 2020-07-01 (v.2.0.2) + -*Status*: Gjeldende +*Oppdatert*: 2020-07-01 (v.2.0.2), 2022-12-09 (Fases ut) + include::shared/download.adoc[] -NOTE: *Innmelding av feil og mangler:* + -Dersom du finner feil eller mangler i dokumentet, ber vi om at dette meldes inn på https://github.com/Informasjonsforvaltning/forvaltningsstandard-begrepsbeskrivelser/issues[Github Issues]. Dersom du ikke allerede har bruker på Github kan du opprette bruker gratis. - -[TIP] -Det er utarbeidet en https://data.norge.no/guide/veileder-begrepsbeskrivelser/[veileder for bruk av denne forvaltningsstandard]. - // :leveloffset: +1 // Innhold her. diff --git a/docs/shared/download.adoc b/docs/shared/download.adoc index 879a9da..a0181fe 100644 --- a/docs/shared/download.adoc +++ b/docs/shared/download.adoc @@ -2,7 +2,6 @@ ifeval::["{backend}" == "html5"] [TIP] //.Nedlasting av dokumentet -Dette dokumentet kan også lastes ned link:files/forvaltningsstandard-begrepsbeskrivelser.pdf[som PDF]. -Dersom det oppleves problemer med nedlastet utgave, eksempelvis bilder som mangler eller lenker som ikke fungerer, ber vi om at man benytter versjonen tilgjengelig på nett for de aktuelle delene. +Dette dokumentet kan også lastes ned link:files/forvaltningsstandard-begrepsbeskrivelser-utfases.pdf[som PDF]. endif::[]