diff --git a/global-attributes.yml b/global-attributes.yml index 1228ce638..87ca11dc3 100644 --- a/global-attributes.yml +++ b/global-attributes.yml @@ -34,10 +34,10 @@ latest-docs-version: 'next' previous-docs-version: 'next' # server - latest-server-version: '10.16' - latest-server-download-version: '10.16.4' - previous-server-version: '10.15' - current-server-version: '10.16' + latest-server-version: '11.0' + latest-server-download-version: '11.0.0' + previous-server-version: '10.16' + current-server-version: '11.0' oc-changelog-url: 'https://owncloud.com/changelog/server/' oc-install-package-url: 'https://download.owncloud.com/server/stable/?sort=time&order=asc' oc-examples-server-url: 'https://owncloud.install.com/owncloud' @@ -67,7 +67,9 @@ ocis-downloadpage-url: 'https://download.owncloud.com/ocis/ocis' # webui latest-webui-version: 'next' - previous-webui-version: 'next' + # this one names a *server* version, not a webui one: it is only consumed by + # docs-main server_releases.adoc as xref:{previous-webui-version}@server:classic_ui: + previous-webui-version: '10.16' # desktop latest-desktop-version: '7.1' previous-desktop-version: '6.0' diff --git a/site.yml b/site.yml index f28127e09..f907fe693 100644 --- a/site.yml +++ b/site.yml @@ -19,7 +19,6 @@ content: branches: - master - '10.16' - - '10.15' - url: https://github.com/owncloud/docs-ocis.git branches: - master @@ -86,7 +85,7 @@ antora: attributefile: ./global-attributes.yml enabled: true - require: ./ext-antora/sitemap-cleanup.js - validsegments: ['next', 'latest'] + validsegments: ['latest'] preferredsegment: latest printsitemapfound: true printcontent: false diff --git a/supplemental/js/go-redirect.js b/supplemental/js/go-redirect.js index ead8644da..e33c3e06a 100644 --- a/supplemental/js/go-redirect.js +++ b/supplemental/js/go-redirect.js @@ -27,12 +27,12 @@ * version root (e.g. /server/latest/), matching how the links are versioned. * * Version remap: core emits the CONCRETE server version in the path (e.g. - * /server/10.16/go.php), but the site publishes the current stable only under + * /server/11.0/go.php), but the site publishes the current stable only under * /server/latest/ (site.yml latest_version_segment_strategy: replace, because * GitHub Pages cannot 302 a version segment to latest). So a version segment - * without its own published tree (10.16, older releases) is remapped to - * `latest`; segments that ARE published (e.g. 10.15, next) are kept for - * per-version fidelity. PUBLISHED_VERSIONS is checked in CI against the built + * without its own published tree (11.0, older releases) is remapped to + * `latest`; segments that ARE published (e.g. 10.16) are kept for per-version + * fidelity. PUBLISHED_VERSIONS is checked in CI against the built * public/server/* directories so it cannot silently go stale. */ ;(function (root) { @@ -41,9 +41,10 @@ // Server version path segments that have their own published doc tree. // Anything else (concrete current-stable, unpublished older releases) is // served under `latest`. Kept in sync with the build by the unit tests. - // Here `latest` is the current stable (10.16, published via - // latest_version_segment: latest) and `next` is the master prerelease. - var PUBLISHED_VERSIONS = ['10.15', 'next', 'latest'] + // Here `latest` is the current stable (11.0, published via + // latest_version_segment: latest). There is no `next` server version: master + // carries the released version rather than a prerelease. + var PUBLISHED_VERSIONS = ['10.16', 'latest'] // key -> path relative to the version root (…/server//). var MAPPING = { diff --git a/test/go-redirect.test.js b/test/go-redirect.test.js index 40b8c7fe9..6a1dab3e8 100644 --- a/test/go-redirect.test.js +++ b/test/go-redirect.test.js @@ -38,7 +38,7 @@ test('a user key redirects into the classic_ui module', () => { }) test('a published version segment is preserved for per-version fidelity', () => { - const p = '/server/10.15/' + const p = '/server/10.16/' assert.equal( resolveGoPhp(p + 'go.php', '?to=admin-sharing'), p + 'admin_manual/configuration/files/file_sharing_configuration.html' @@ -46,10 +46,10 @@ test('a published version segment is preserved for per-version fidelity', () => }) test('an unpublished version segment (concrete current stable) is remapped to latest', () => { - // Core emits the concrete version (e.g. 10.16), which has no published tree; + // Core emits the concrete version (e.g. 11.0), which has no published tree; // it must be sent to /server/latest/ where the current stable is published. assert.equal( - resolveGoPhp('/server/10.16/go.php', '?to=admin-sharing'), + resolveGoPhp('/server/11.0/go.php', '?to=admin-sharing'), '/server/latest/admin_manual/configuration/files/file_sharing_configuration.html' ) // An old, long-unpublished release likewise falls back to latest.