diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 41d36112..e734254a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,7 +6,7 @@ on: jobs: deploy: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 with: @@ -14,9 +14,9 @@ jobs: fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod - name: Setup Hugo - uses: peaceiris/actions-hugo@v2 + uses: peaceiris/actions-hugo@v3 with: - hugo-version: '0.74.3' + hugo-version: '0.131.0' extended: true - name: Setup Node diff --git a/README.md b/README.md index 7c400ecc..d11c646d 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ XLT Documentation is based on Docsy. Docsy is a [Hugo](https://gohugo.io/) theme The following are basic prerequisites: -- Install a recent release of the Hugo "extended" version (we recommend version 0.74 or later). +- Install a recent release of the Hugo "extended" version (we recommend version 0.131.0 or later). If you install from the [release page](https://github.com/gohugoio/hugo/releases), make sure you download the `_extended` version which supports SCSS. - [Install the current Node environment](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm) (version > 14.x). diff --git a/config.toml b/config.toml index e572d96a..fd2a8185 100644 --- a/config.toml +++ b/config.toml @@ -16,7 +16,7 @@ defaultContentLanguageInSubdir = false # Useful when translating. enableMissingTranslationPlaceholders = true -disableKinds = ["taxonomy", "taxonomyTerm"] +disableKinds = ["taxonomy"] # log warning if link does not exist on build (instead of default ERROR, which fails the build) refLinksErrorLevel = "WARNING" @@ -71,20 +71,12 @@ anchor = "smart" # Language configuration [languages] -[languages.en] +[languages.en.params] # title = "Xceptance Documentation Hub" description = "Documentation for XLT and XTC including Manuals and How-Tos" languageName ="English" # Weight used for sorting. weight = 1 -#[languages.no] -#title = "Goldydocs" -#description = "Docsy er operativsystem for skyen" -#languageName ="Norsk" -#contentDir = "content/no" -#time_format_default = "02.01.2006" -#time_format_blog = "02.01.2006" - # Everything below this are Site Params diff --git a/content/en/xlt/about-xlt/000-demo/index.md b/content/en/xlt/about-xlt/000-demo/index.md index ae66093e..a89cf0ca 100644 --- a/content/en/xlt/about-xlt/000-demo/index.md +++ b/content/en/xlt/about-xlt/000-demo/index.md @@ -99,7 +99,7 @@ Go to [Load Testing]({{< relref "/xlt/load-testing" >}}). Go to [XTC]({{< relref "xtc" >}}). -Go to [Release Notes]({{< relref "../../release-notes" >}}). +Go to [Release Notes]({{< relref "../release-notes" >}}). (Actually you can build links to wherever in the hierarchy without a shortcode, [just like this](/load-testing) or [this](../../load-testing). However the `relref` shortcode should be preferred as Hugo will perform link validation for all links generated by that shortcode and log a warning or fail the build with an error depending on the [configuration](https://gohugo.io/content-management/cross-references/#ref-and-relref-configuration).) diff --git a/content/en/xlt/load-testing/How-Tos/load-numbers.md b/content/en/xlt/load-testing/How-Tos/load-numbers.md index 668969f4..40b543b4 100644 --- a/content/en/xlt/load-testing/How-Tos/load-numbers.md +++ b/content/en/xlt/load-testing/How-Tos/load-numbers.md @@ -34,7 +34,7 @@ We need at least a few numbers to derive our calculation from, such as: * Peak page views/h: for example 250,000 page views * Peak orders/h: for example 200 orders -[^1]: [What are visits?]({{< relref "/glossary#visit" >}}) +[^1]: [What are visits?]({{< relref "../glossary#visit" >}}) Based on these assumptions, we can put together a fairly simple but sufficiently accurate load mix. Of course, we can also analyze the current log files and try to come up with something more precise, but that will be only a snapshot. Traffic is very volatile and hence we can be very generous when setting up this mix. @@ -42,7 +42,7 @@ Since we do not take any daily averages as base but the peaks, we will calculate ## Arrival Rate Calculation -There are [two different approaches]({{< relref "/load-model" >}}) (load models) available to define a load test setup: the user count model and the arrival rate model. +There are [two different approaches]({{< relref "load-model" >}}) (load models) available to define a load test setup: the user count model and the arrival rate model. For the user count model, you define a certain number of concurrent users the system will have to handle, whereas with the arrival rate model, your criteria is the number of transactions per hour. As the latter is better fit for real world load, we will go with the arrival rate model. diff --git a/content/en/xtc/loadtesting/140-overview.md b/content/en/xtc/loadtesting/140-overview.md index 849b6f37..e5f808b4 100644 --- a/content/en/xtc/loadtesting/140-overview.md +++ b/content/en/xtc/loadtesting/140-overview.md @@ -8,7 +8,7 @@ description: > All infos that are available on the Load Tests Overview. --- -A load test project in XTC may contain a number of [XLT load and performance tests]({{< relref "/load-testing" >}}). In XTC, you can easily keep track of which tests have been run for a project and have all the data (e.g. which settings were used, how much load was applied, how did the test go) available in one place. +A load test project in XTC may contain a number of [XLT load and performance tests]({{< relref "xlt/load-testing" >}}). In XTC, you can easily keep track of which tests have been run for a project and have all the data (e.g. which settings were used, how much load was applied, how did the test go) available in one place. ## Load Tests Overview diff --git a/themes/docsy/layouts/_default/content.html b/themes/docsy/layouts/_default/content.html index f6f47475..7da20b81 100644 --- a/themes/docsy/layouts/_default/content.html +++ b/themes/docsy/layouts/_default/content.html @@ -9,7 +9,7 @@

{{ .Title }}

{{ partial "feedback.html" .Site.Params.ui.feedback }}
{{ end }} - {{ if (.Site.Params.DisqusShortname) }} + {{ if (.Site.Config.Services.Disqus.Shortname) }}
{{ partial "disqus-comment.html" . }} {{ end }} diff --git a/themes/docsy/layouts/blog/content.html b/themes/docsy/layouts/blog/content.html index 3a5faedd..dae7acc9 100644 --- a/themes/docsy/layouts/blog/content.html +++ b/themes/docsy/layouts/blog/content.html @@ -6,7 +6,7 @@

{{ .Title }}

{{ .Content }} - {{ if (.Site.Params.DisqusShortname) }} + {{ if (.Site.Config.Services.Disqus.Shortname) }}
{{ partial "disqus-comment.html" . }}
diff --git a/themes/docsy/layouts/docs/list.html b/themes/docsy/layouts/docs/list.html index b8394e02..1206fb91 100644 --- a/themes/docsy/layouts/docs/list.html +++ b/themes/docsy/layouts/docs/list.html @@ -11,7 +11,7 @@

{{ .Title }}

{{ partial "feedback.html" .Site.Params.ui.feedback }}
{{ end }} - {{ if (.Site.DisqusShortname) }} + {{ if (.Site.Config.Services.Disqus.Shortname) }}
{{ partial "disqus-comment.html" . }} {{ end }} diff --git a/themes/docsy/layouts/partials/disqus-comment.html b/themes/docsy/layouts/partials/disqus-comment.html index c3ae3f91..f7406c48 100644 --- a/themes/docsy/layouts/partials/disqus-comment.html +++ b/themes/docsy/layouts/partials/disqus-comment.html @@ -14,7 +14,7 @@ */ (function() { // DON'T EDIT BELOW THIS LINE var d = document, s = d.createElement('script'); -s.src = 'https://' + {{ .Site.DisqusShortname }} + '.disqus.com/embed.js'; +s.src = 'https://' + {{ .Site.Config.Services.Disqus.Shortname }} + '.disqus.com/embed.js'; s.setAttribute('data-timestamp', +new Date()); (d.head || d.body).appendChild(s); })(); diff --git a/themes/docsy/layouts/partials/head-css.html b/themes/docsy/layouts/partials/head-css.html index e7ac94b3..ad62e1c0 100644 --- a/themes/docsy/layouts/partials/head-css.html +++ b/themes/docsy/layouts/partials/head-css.html @@ -1,6 +1,6 @@ {{ $scssMain := "scss/main.scss"}} -{{ if .Site.IsServer }} +{{ if hugo.IsServer }} {{/* Note the missing postCSS. This makes it snappier to develop in Chrome, but makes it look sub-optimal in other browsers. */}} {{ $css := resources.Get $scssMain | toCSS (dict "enableSourceMap" true) }} diff --git a/themes/docsy/layouts/partials/scripts.html b/themes/docsy/layouts/partials/scripts.html index 072e65f6..bc0ac5b5 100644 --- a/themes/docsy/layouts/partials/scripts.html +++ b/themes/docsy/layouts/partials/scripts.html @@ -8,7 +8,7 @@ {{ $jsSearch = resources.Get "js/offline-search.js" }} {{ end }} {{ $js := (slice $jsBase $jsAnchor $jsSearch) | resources.Concat "js/main.js" }} -{{ if .Site.IsServer }} +{{ if hugo.IsServer }} {{ else }} {{ $js := $js | minify | fingerprint }} diff --git a/themes/docsy/layouts/swagger/list.html b/themes/docsy/layouts/swagger/list.html index 71224780..908403af 100644 --- a/themes/docsy/layouts/swagger/list.html +++ b/themes/docsy/layouts/swagger/list.html @@ -8,7 +8,7 @@

{{ .Title }}

{{ partial "feedback.html" .Site.Params.ui.feedback }}
{{ end }} - {{ if (.Site.DisqusShortname) }} + {{ if (.Site.Config.Services.Disqus.Shortname) }}
{{ partial "disqus-comment.html" . }} {{ end }} diff --git a/themes/xltdoc/layouts/partials/head.html b/themes/xltdoc/layouts/partials/head.html index a1508019..00117284 100644 --- a/themes/xltdoc/layouts/partials/head.html +++ b/themes/xltdoc/layouts/partials/head.html @@ -9,10 +9,6 @@ {{ end -}} {{ partialCached "favicons.html" . }} {{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }} -{{- template "_internal/opengraph.html" . -}} -{{- template "_internal/google_news.html" . -}} -{{- template "_internal/schema.html" . -}} -{{- template "_internal/twitter_cards.html" . -}} {{ partialCached "head-css.html" . "asdf" }} {{ if .Site.Params.offlineSearch }} diff --git a/themes/xltdoc/layouts/partials/scripts.html b/themes/xltdoc/layouts/partials/scripts.html index 112d9b37..b9dbb639 100644 --- a/themes/xltdoc/layouts/partials/scripts.html +++ b/themes/xltdoc/layouts/partials/scripts.html @@ -7,7 +7,7 @@ {{ $jsSearch = resources.Get "js/offline-search.js" }} {{ end }} {{ $js := (slice $jsBase $jsAnchor $jsSearch) | resources.Concat "js/main.js" }} -{{ if .Site.IsServer }} +{{ if hugo.IsServer }} {{ else }} {{ $js := $js | minify | fingerprint }}