From df199f6c273729a08b6ece4afbbb8f0d5550ca9a Mon Sep 17 00:00:00 2001 From: Retype GitHub Action Date: Tue, 12 Dec 2023 17:00:26 +0000 Subject: [PATCH] Refreshes Retype-generated documentation. Process triggered by dippindots. --- 404.html | 8 ++++---- about-us/index.html | 8 ++++---- architecture-overview/index.html | 8 ++++---- backend-code-organization/index.html | 8 ++++---- backend-development-guidelines/index.html | 8 ++++---- data-loading-for-developers/index.html | 8 ++++---- data-loading-maintaining-studies/index.html | 8 ++++---- .../index.html | 8 ++++---- data-loading/index.html | 10 +++++----- .../index.html | 10 +++++----- .../authenticating-users-via-ldap/index.html | 8 ++++---- .../authenticating-users-via-saml/index.html | 8 ++++---- .../index.html | 8 ++++---- .../user-authorization/index.html | 8 ++++---- deployment/customization/caching/index.html | 8 ++++---- .../index.html | 8 ++++---- .../portal.properties-reference/index.html | 10 +++++----- deployment/customization/studyview/index.html | 8 ++++---- .../build-from-source/index.html | 8 ++++---- .../deploying/index.html | 10 +++++----- .../import-the-seed-database/index.html | 8 ++++---- .../load-sample-cancer-study/index.html | 8 ++++---- .../pre-build-steps/index.html | 8 ++++---- .../software-requirements/index.html | 8 ++++---- deployment/docker/example_commands/index.html | 10 +++++----- deployment/docker/import_data/index.html | 10 +++++----- deployment/docker/index.html | 8 ++++---- .../docker/notes-for-non-linux/index.html | 8 ++++---- deployment/docker/using-keycloak/index.html | 10 +++++----- deployment/index.html | 8 ++++---- .../index.html | 8 ++++---- .../oncokb-data-access/index.html | 8 ++++---- .../build-different-frontend/index.html | 8 ++++---- development/cbioportal-er-diagram/index.html | 8 ++++---- development/database-versioning/index.html | 10 +++++----- development/deployment-procedure/index.html | 8 ++++---- development/documentation-site/index.html | 8 ++++---- .../feature-development-guide/index.html | 8 ++++---- development/index.html | 8 ++++---- development/manual-test-cases/index.html | 8 ++++---- development/release-procedure/index.html | 8 ++++---- .../session-service-working/index.html | 8 ++++---- downloads/index.html | 8 ++++---- file-formats/index.html | 10 +++++----- hardware-requirements/index.html | 8 ++++---- import-gene-panels/index.html | 8 ++++---- import-gene-sets/index.html | 8 ++++---- .../index.html | 8 ++++---- import-reference-genome/index.html | 8 ++++---- import-study-using-docker/index.html | 10 +++++----- imported-maf-columns/index.html | 8 ++++---- importer-tool/index.html | 8 ++++---- index.html | 8 ++++---- migration-guide/index.html | 8 ++++---- msk-maintenance/index.html | 8 ++++---- .../index.html | 8 ++++---- news-genie/index.html | 8 ++++---- news/index.html | 8 ++++---- resources/js/config.js | 2 +- rfc-list/index.html | 8 ++++---- session-service-management/index.html | 10 +++++----- sitemap.xml.gz | Bin 1278 -> 1262 bytes software-acknowledgments/index.html | 8 ++++---- study-curation-guide/index.html | 8 ++++---- testing/index.html | 10 +++++----- uninstall-docker-cbioportal/index.html | 10 +++++----- .../index.html | 10 +++++----- .../index.html | 10 +++++----- user-guide/by-page/index.html | 8 ++++---- user-guide/faq/index.html | 8 ++++---- user-guide/index.html | 8 ++++---- user-guide/new-users/index.html | 8 ++++---- user-guide/oql/index.html | 8 ++++---- user-guide/overview/index.html | 8 ++++---- using-the-dataset-validator/index.html | 10 +++++----- using-the-metaimport-script/index.html | 8 ++++---- web-api-and-clients/index.html | 10 +++++----- z-score-normalization-script/index.html | 8 ++++---- 78 files changed, 322 insertions(+), 322 deletions(-) diff --git a/404.html b/404.html index 93b2880a711..711b0e0dd0f 100644 --- a/404.html +++ b/404.html @@ -3,7 +3,7 @@ - + @@ -28,11 +28,11 @@ - + - + - + diff --git a/about-us/index.html b/about-us/index.html index 06b075ed27e..dda3ee05ef7 100644 --- a/about-us/index.html +++ b/about-us/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/architecture-overview/index.html b/architecture-overview/index.html index bac186d8455..463dd062213 100644 --- a/architecture-overview/index.html +++ b/architecture-overview/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/backend-code-organization/index.html b/backend-code-organization/index.html index 0a9a7b61be9..e079f15d5c0 100644 --- a/backend-code-organization/index.html +++ b/backend-code-organization/index.html @@ -3,7 +3,7 @@ - + @@ -33,11 +33,11 @@ - + - + - + diff --git a/backend-development-guidelines/index.html b/backend-development-guidelines/index.html index f2fa862bc61..0e705ef289c 100644 --- a/backend-development-guidelines/index.html +++ b/backend-development-guidelines/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/data-loading-for-developers/index.html b/data-loading-for-developers/index.html index 4cf92d538f9..57466c62cfe 100644 --- a/data-loading-for-developers/index.html +++ b/data-loading-for-developers/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/data-loading-maintaining-studies/index.html b/data-loading-maintaining-studies/index.html index f75884c0208..743faf4fef5 100644 --- a/data-loading-maintaining-studies/index.html +++ b/data-loading-maintaining-studies/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/data-loading-tips-and-best-practices/index.html b/data-loading-tips-and-best-practices/index.html index 532b7079db2..cbf679e5ccf 100644 --- a/data-loading-tips-and-best-practices/index.html +++ b/data-loading-tips-and-best-practices/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/data-loading/index.html b/data-loading/index.html index 05177d21e46..c7e81ddd031 100644 --- a/data-loading/index.html +++ b/data-loading/index.html @@ -3,7 +3,7 @@ - + @@ -31,12 +31,12 @@ - + - + - - + + diff --git a/deployment/authorization-and-authentication/authenticating-and-authorizing-users-via-keycloak/index.html b/deployment/authorization-and-authentication/authenticating-and-authorizing-users-via-keycloak/index.html index 0ee77b9adcd..552a5bc2e34 100644 --- a/deployment/authorization-and-authentication/authenticating-and-authorizing-users-via-keycloak/index.html +++ b/deployment/authorization-and-authentication/authenticating-and-authorizing-users-via-keycloak/index.html @@ -3,7 +3,7 @@ - + @@ -33,12 +33,12 @@ - + - + - - + + diff --git a/deployment/authorization-and-authentication/authenticating-users-via-ldap/index.html b/deployment/authorization-and-authentication/authenticating-users-via-ldap/index.html index 9f012649f4f..2fd37f17b1a 100644 --- a/deployment/authorization-and-authentication/authenticating-users-via-ldap/index.html +++ b/deployment/authorization-and-authentication/authenticating-users-via-ldap/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/deployment/authorization-and-authentication/authenticating-users-via-saml/index.html b/deployment/authorization-and-authentication/authenticating-users-via-saml/index.html index 74717ae6763..e7a47d46a74 100644 --- a/deployment/authorization-and-authentication/authenticating-users-via-saml/index.html +++ b/deployment/authorization-and-authentication/authenticating-users-via-saml/index.html @@ -3,7 +3,7 @@ - + @@ -33,11 +33,11 @@ - + - + - + diff --git a/deployment/authorization-and-authentication/authenticating-users-via-tokens/index.html b/deployment/authorization-and-authentication/authenticating-users-via-tokens/index.html index 31d93abd38a..b186db6410c 100644 --- a/deployment/authorization-and-authentication/authenticating-users-via-tokens/index.html +++ b/deployment/authorization-and-authentication/authenticating-users-via-tokens/index.html @@ -3,7 +3,7 @@ - + @@ -33,11 +33,11 @@ - + - + - + diff --git a/deployment/authorization-and-authentication/user-authorization/index.html b/deployment/authorization-and-authentication/user-authorization/index.html index f80595c80cc..6d61571c708 100644 --- a/deployment/authorization-and-authentication/user-authorization/index.html +++ b/deployment/authorization-and-authentication/user-authorization/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/deployment/customization/caching/index.html b/deployment/customization/caching/index.html index 1c6983ab6e1..21d2cb1cf50 100644 --- a/deployment/customization/caching/index.html +++ b/deployment/customization/caching/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/deployment/customization/customizing-your-instance-of-cbioportal/index.html b/deployment/customization/customizing-your-instance-of-cbioportal/index.html index da45d68d4d9..68fe884ee21 100644 --- a/deployment/customization/customizing-your-instance-of-cbioportal/index.html +++ b/deployment/customization/customizing-your-instance-of-cbioportal/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/deployment/customization/portal.properties-reference/index.html b/deployment/customization/portal.properties-reference/index.html index 2ed2ed5d0b4..336908f9594 100644 --- a/deployment/customization/portal.properties-reference/index.html +++ b/deployment/customization/portal.properties-reference/index.html @@ -3,7 +3,7 @@ - + @@ -33,12 +33,12 @@ - + - + - - + + diff --git a/deployment/customization/studyview/index.html b/deployment/customization/studyview/index.html index 902c65edd5f..4b66ff5ccd5 100644 --- a/deployment/customization/studyview/index.html +++ b/deployment/customization/studyview/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/deployment/deploy-without-docker/build-from-source/index.html b/deployment/deploy-without-docker/build-from-source/index.html index 7c6062d96c7..a92153da06f 100644 --- a/deployment/deploy-without-docker/build-from-source/index.html +++ b/deployment/deploy-without-docker/build-from-source/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/deployment/deploy-without-docker/deploying/index.html b/deployment/deploy-without-docker/deploying/index.html index 0d5dde25559..11c136e7643 100644 --- a/deployment/deploy-without-docker/deploying/index.html +++ b/deployment/deploy-without-docker/deploying/index.html @@ -3,7 +3,7 @@ - + @@ -31,12 +31,12 @@ - + - + - - + + diff --git a/deployment/deploy-without-docker/import-the-seed-database/index.html b/deployment/deploy-without-docker/import-the-seed-database/index.html index 6977c077341..d12fd8038d6 100644 --- a/deployment/deploy-without-docker/import-the-seed-database/index.html +++ b/deployment/deploy-without-docker/import-the-seed-database/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/deployment/deploy-without-docker/load-sample-cancer-study/index.html b/deployment/deploy-without-docker/load-sample-cancer-study/index.html index 908db9d5b3a..a50e1b5b97f 100644 --- a/deployment/deploy-without-docker/load-sample-cancer-study/index.html +++ b/deployment/deploy-without-docker/load-sample-cancer-study/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/deployment/deploy-without-docker/pre-build-steps/index.html b/deployment/deploy-without-docker/pre-build-steps/index.html index 7ae31c5f1be..2e86b318220 100644 --- a/deployment/deploy-without-docker/pre-build-steps/index.html +++ b/deployment/deploy-without-docker/pre-build-steps/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/deployment/deploy-without-docker/software-requirements/index.html b/deployment/deploy-without-docker/software-requirements/index.html index 38771f0cb06..a4adfa15730 100644 --- a/deployment/deploy-without-docker/software-requirements/index.html +++ b/deployment/deploy-without-docker/software-requirements/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/deployment/docker/example_commands/index.html b/deployment/docker/example_commands/index.html index 6899df003a3..cc7bda0eaa4 100644 --- a/deployment/docker/example_commands/index.html +++ b/deployment/docker/example_commands/index.html @@ -3,7 +3,7 @@ - + @@ -31,12 +31,12 @@ - + - + - - + + diff --git a/deployment/docker/import_data/index.html b/deployment/docker/import_data/index.html index d007d0fde71..7e6fe98c40b 100644 --- a/deployment/docker/import_data/index.html +++ b/deployment/docker/import_data/index.html @@ -3,7 +3,7 @@ - + @@ -31,12 +31,12 @@ - + - + - - + + diff --git a/deployment/docker/index.html b/deployment/docker/index.html index 82e9489f30b..a74fcd189b6 100644 --- a/deployment/docker/index.html +++ b/deployment/docker/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/deployment/docker/notes-for-non-linux/index.html b/deployment/docker/notes-for-non-linux/index.html index 8970be92103..9932ed19f81 100644 --- a/deployment/docker/notes-for-non-linux/index.html +++ b/deployment/docker/notes-for-non-linux/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/deployment/docker/using-keycloak/index.html b/deployment/docker/using-keycloak/index.html index c21bace7815..f02206ff4b6 100644 --- a/deployment/docker/using-keycloak/index.html +++ b/deployment/docker/using-keycloak/index.html @@ -3,7 +3,7 @@ - + @@ -31,12 +31,12 @@ - + - + - - + + diff --git a/deployment/index.html b/deployment/index.html index 07f2843ac19..694d1e042be 100644 --- a/deployment/index.html +++ b/deployment/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/deployment/integration-with-other-webservices/index.html b/deployment/integration-with-other-webservices/index.html index b13f78b6c4d..165796ef422 100644 --- a/deployment/integration-with-other-webservices/index.html +++ b/deployment/integration-with-other-webservices/index.html @@ -3,7 +3,7 @@ - + @@ -28,11 +28,11 @@ - + - + - + diff --git a/deployment/integration-with-other-webservices/oncokb-data-access/index.html b/deployment/integration-with-other-webservices/oncokb-data-access/index.html index 87a5a454295..d67352f97ea 100644 --- a/deployment/integration-with-other-webservices/oncokb-data-access/index.html +++ b/deployment/integration-with-other-webservices/oncokb-data-access/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/development/build-different-frontend/index.html b/development/build-different-frontend/index.html index d19e4d0fc2b..7121d89a066 100644 --- a/development/build-different-frontend/index.html +++ b/development/build-different-frontend/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/development/cbioportal-er-diagram/index.html b/development/cbioportal-er-diagram/index.html index 0e0beb0d777..ebaa421c7b8 100644 --- a/development/cbioportal-er-diagram/index.html +++ b/development/cbioportal-er-diagram/index.html @@ -3,7 +3,7 @@ - + @@ -33,11 +33,11 @@ - + - + - + diff --git a/development/database-versioning/index.html b/development/database-versioning/index.html index 7ffc872f86a..c0a6c55d600 100644 --- a/development/database-versioning/index.html +++ b/development/database-versioning/index.html @@ -3,7 +3,7 @@ - + @@ -31,12 +31,12 @@ - + - + - - + + diff --git a/development/deployment-procedure/index.html b/development/deployment-procedure/index.html index 9374f559c39..31e967a0485 100644 --- a/development/deployment-procedure/index.html +++ b/development/deployment-procedure/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/development/documentation-site/index.html b/development/documentation-site/index.html index 97ee12eb638..2d25b091a8d 100644 --- a/development/documentation-site/index.html +++ b/development/documentation-site/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/development/feature-development-guide/index.html b/development/feature-development-guide/index.html index 78cc428ef5d..0fec4697e6b 100644 --- a/development/feature-development-guide/index.html +++ b/development/feature-development-guide/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/development/index.html b/development/index.html index ac1359ba4f2..4fd1c23668d 100644 --- a/development/index.html +++ b/development/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/development/manual-test-cases/index.html b/development/manual-test-cases/index.html index 3b873d2f38e..c112e222560 100644 --- a/development/manual-test-cases/index.html +++ b/development/manual-test-cases/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/development/release-procedure/index.html b/development/release-procedure/index.html index 1c7698f7ca8..9e7ac2adcff 100644 --- a/development/release-procedure/index.html +++ b/development/release-procedure/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/development/session-service-working/index.html b/development/session-service-working/index.html index 26371afcc33..0e56b1ace80 100644 --- a/development/session-service-working/index.html +++ b/development/session-service-working/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/downloads/index.html b/downloads/index.html index 33b1afb06de..ad04860d6e9 100644 --- a/downloads/index.html +++ b/downloads/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/file-formats/index.html b/file-formats/index.html index cb7ab3854da..888f609b2ef 100644 --- a/file-formats/index.html +++ b/file-formats/index.html @@ -3,7 +3,7 @@ - + @@ -33,12 +33,12 @@ - + - + - - + + diff --git a/hardware-requirements/index.html b/hardware-requirements/index.html index d14f29842d6..88e5d3586e9 100644 --- a/hardware-requirements/index.html +++ b/hardware-requirements/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/import-gene-panels/index.html b/import-gene-panels/index.html index 6783f5581ab..8ce6dca78fe 100644 --- a/import-gene-panels/index.html +++ b/import-gene-panels/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/import-gene-sets/index.html b/import-gene-sets/index.html index 7fdeff13fa2..2b2242f8e03 100644 --- a/import-gene-sets/index.html +++ b/import-gene-sets/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/import-oncokb-annotations-as-custom-driver-annotations/index.html b/import-oncokb-annotations-as-custom-driver-annotations/index.html index 47c9b2c57bf..39e672fe9d5 100644 --- a/import-oncokb-annotations-as-custom-driver-annotations/index.html +++ b/import-oncokb-annotations-as-custom-driver-annotations/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/import-reference-genome/index.html b/import-reference-genome/index.html index 606744a56d4..5d94099de53 100644 --- a/import-reference-genome/index.html +++ b/import-reference-genome/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/import-study-using-docker/index.html b/import-study-using-docker/index.html index c3f08fa8508..cd2cd72ab4b 100644 --- a/import-study-using-docker/index.html +++ b/import-study-using-docker/index.html @@ -3,7 +3,7 @@ - + @@ -31,12 +31,12 @@ - + - + - - + + diff --git a/imported-maf-columns/index.html b/imported-maf-columns/index.html index 7f21ed63032..f515640b182 100644 --- a/imported-maf-columns/index.html +++ b/imported-maf-columns/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/importer-tool/index.html b/importer-tool/index.html index 248bde417cf..02b21fbffd3 100644 --- a/importer-tool/index.html +++ b/importer-tool/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/index.html b/index.html index fac98f78852..423d3255823 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/migration-guide/index.html b/migration-guide/index.html index f229949bcd6..f67c9f324b8 100644 --- a/migration-guide/index.html +++ b/migration-guide/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/msk-maintenance/index.html b/msk-maintenance/index.html index b8575f52504..a09229038f8 100644 --- a/msk-maintenance/index.html +++ b/msk-maintenance/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/mutation-data-transcript-annotation/index.html b/mutation-data-transcript-annotation/index.html index 2b25ea86b48..35ef784d384 100644 --- a/mutation-data-transcript-annotation/index.html +++ b/mutation-data-transcript-annotation/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/news-genie/index.html b/news-genie/index.html index 7d1e0d09a06..0c456b04156 100644 --- a/news-genie/index.html +++ b/news-genie/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/news/index.html b/news/index.html index 0937f7b7740..2c466d9bebd 100644 --- a/news/index.html +++ b/news/index.html @@ -3,7 +3,7 @@ - + @@ -33,11 +33,11 @@ - + - + - + diff --git a/resources/js/config.js b/resources/js/config.js index ff6c6adf8c4..fcef5bc779f 100644 --- a/resources/js/config.js +++ b/resources/js/config.js @@ -1 +1 @@ -var __DOCS_CONFIG__ = {"id":"rZLP6R2hNOYWkdTpdrzX+l+196qw/+L7d76","key":"42fOUCllmwhNMsRUsCr6ysQtWOeADHRtvr4DIMf+xnQ.EdauXfe3bGCLMP58NFM3pd2UFHHSzuD+GyXOik5yV1du5saJvNnvG/FOuaJF24XS0Dj+AC1sPM9NqZDgOZH90A.8209","base":"/","host":"docs.cbioportal.org","version":"1.0.0","useRelativePaths":true,"documentName":"index.html","appendDocumentName":false,"trailingSlash":true,"preloadSearch":false,"cacheBustingToken":"3.5.0.755710556163","cacheBustingStrategy":"query","sidebarFilterPlaceholder":"Filter","toolbarFilterPlaceholder":"Filter","showSidebarFilter":true,"filterNotFoundMsg":"No member names found containing the query \"{query}\"","maxHistoryItems":15,"homeIcon":"","access":[{"value":"public","label":"Public"},{"value":"protected","label":"Protected"}],"toolbarLinks":[{"id":"fields","label":"Fields"},{"id":"properties","label":"Properties"},{"id":"methods","label":"Methods"},{"id":"events","label":"Events"}],"sidebar":[{"n":"/","l":"Home"},{"n":"/about-us","l":"About Us"},{"n":"/rfc-list","l":"List of RF​Cs"},{"n":"/user-guide","l":"User Guide","i":[{"n":"/user-guide/new-users","l":"New Users"},{"n":"/user-guide/faq","l":"Frequently Asked Questions"},{"n":"/user-guide/overview","l":"Overview of Resources"},{"n":"/user-guide/by-page","l":"Page Specific Resources"},{"n":"/user-guide/oql","l":"OQL"},{"n":"/news","l":"News"},{"n":"/news-genie","l":"Genie News"}]},{"n":"/web-api-and-clients","l":"Web API and API Clients"},{"n":"/deployment","l":"Deployment","i":[{"n":"/architecture-overview","l":"Architecture overview"},{"n":"/hardware-requirements","l":"Hardware Requirements"},{"n":"/deployment/docker","l":"Deploy with Docker (Recommended)","i":[{"n":"/deployment/docker/import_data","l":"Import data with Docker"},{"n":"/deployment/docker/example_commands","l":"Example Commands"},{"n":"/deployment/docker/using-keycloak","l":"Authenticating and Authorizing Users using Keycloak in Docker"}]},{"n":"/deploy-without-docker","l":"Deploy without Docker","c":false,"i":[{"n":"/deployment/deploy-without-docker/software-requirements","l":"Software Requirements"},{"n":"/deployment/deploy-without-docker/pre-build-steps","l":"Pre-​Build Steps"},{"n":"/deployment/deploy-without-docker/build-from-source","l":"Building from Source"},{"n":"/deployment/deploy-without-docker/import-the-seed-database","l":"Importing the Seed Database"},{"n":"/deployment/deploy-without-docker/deploying","l":"Deploying the Web Application"},{"n":"/deployment/deploy-without-docker/load-sample-cancer-study","l":"Loading a Sample Study"}]},{"n":"/authorization-and-authentication","l":"Authorization and Authentication","c":false,"i":[{"n":"/deployment/authorization-and-authentication/user-authorization","l":"User Authorization"},{"n":"/deployment/authorization-and-authentication/authenticating-users-via-saml","l":"Authenticating Users via SAML"},{"n":"/deployment/authorization-and-authentication/authenticating-users-via-ldap","l":"Authenticating Users via LDAP"},{"n":"/deployment/authorization-and-authentication/authenticating-and-authorizing-users-via-keycloak","l":"Authenticating and Authorizing Users via Keycloak"},{"n":"/deployment/authorization-and-authentication/authenticating-users-via-tokens","l":"Authenticating Users via Tokens"}]},{"n":"/customization","l":"Customization","c":false,"i":[{"n":"/deployment/customization/customizing-your-instance-of-cbioportal","l":"Customizing your c​Bio​Portal Instance via portal.​properties"},{"n":"/deployment/customization/portal.properties-reference","l":"More portal.​properties Settings"},{"n":"/deployment/customization/caching","l":"Configuring Caching Behavior"},{"n":"/deployment/customization/studyview","l":"How does the study view organize the charts"},{"n":"/deployment/customization/studyview","l":"Utilize priority setting from database to visualize charts"}]},{"n":"/integration-with-other-webservices","l":"Integration with Other Webservices","c":false,"i":[{"n":"/deployment/integration-with-other-webservices/oncokb-data-access","l":"Onco​KB Data Access"}]},{"n":"/data-loading","l":"Data Loading Overview","i":[{"n":"/downloads","l":"Downloads"},{"n":"/using-the-dataset-validator","l":"Using the Dataset Validator"},{"n":"/using-the-metaimport-script","l":"Using the meta​Import Script"},{"n":"/file-formats","l":"File Formats","i":[{"n":"/z-score-normalization-script","l":"Z-​Score Normalization"}]},{"n":"/study-curation-guide","l":"Study Curation Guide"},{"n":"/data-loading-maintaining-studies","l":"Maintaining Studies"},{"n":"/data-loading-for-developers","l":"For Developers"},{"n":"/data-loading-tips-and-best-practices","l":"Tips and Best Practices"},{"n":"/mutation-data-transcript-annotation","l":"Mutation Data Transcript Annotation"},{"n":"/import-oncokb-annotations-as-custom-driver-annotations","l":"Import Onco​KB annotations as custom driver annotations"},{"n":"/import-gene-sets","l":"Importing Gene Sets for Gene Set Scoring Data"},{"n":"/import-gene-panels","l":"Importing Gene Panels"},{"n":"/deployment/customization/studyview","l":"Study View Customization with Priority Data"}]},{"n":"/cbioportal-maintenance","l":"c​Bio​Portal Maintenance","c":false,"i":[{"n":"/updating-your-cbioportal-installation","l":"Updating your c​Bio​Portal Database Scheme"},{"n":"/updating-gene-and-gene_alias-tables","l":"Update genes and gene aliases"},{"n":"/migration-guide","l":"Migration Guide"},{"n":"/msk-maintenance","l":"MSK Maintenance"}]}]},{"n":"/development","l":"Development","i":[{"n":"/development/feature-development-guide","l":"Feature Development Guide"},{"n":"/development/cbioportal-er-diagram","l":"c​Bio​Portal Entity-​relationship Diagram"},{"n":"/development/database-versioning","l":"c​Bio​Portal Database Versioning"},{"n":"/development/build-different-frontend","l":"Build c​Bio​Portal with a different frontend version"},{"n":"/development/session-service-working","l":"Session Service"},{"n":"/development/manual-test-cases","l":"Manual test cases"},{"n":"/development/release-procedure","l":"Release Procedure"},{"n":"/development/deployment-procedure","l":"Deployment Procedure"},{"n":"/development/documentation-site","l":"This documentation site"}]}],"search":{"mode":0,"minChars":2,"maxResults":20,"placeholder":"Search","hotkeys":["k"],"noResultsFoundMsg":"Sorry, no results found.","recognizeLanguages":true,"languages":[0],"preload":false},"resources":{"History_Title_Label":"History","History_ClearLink_Label":"Clear","History_NoHistory_Label":"No history items","API_AccessFilter_Label":"Access","API_ParameterSection_Label":"PARAMETERS","API_SignatureSection_Label":"SIGNATURE","API_CopyHint_Label":"Copy","API_CopyNameHint_Label":"Copy name","API_CopyLinkHint_Label":"Copy link","API_CopiedAckHint_Label":"Copied!","API_MoreOverloads_Label":"more","API_MoreDropdownItems_Label":"More","API_OptionalParameter_Label":"optional","API_DefaultParameterValue_Label":"Default value","API_InheritedFilter_Label":"Inherited","Search_Input_Placeholder":"Search","Toc_Contents_Label":"Contents","Toc_RelatedClasses_Label":"Related Classes","History_JustNowTime_Label":"just now","History_AgoTime_Label":"ago","History_YearTime_Label":"y","History_MonthTime_Label":"mo","History_DayTime_Label":"d","History_HourTime_Label":"h","History_MinuteTime_Label":"m","History_SecondTime_Label":"s"}}; +var __DOCS_CONFIG__ = {"id":"L5x0O47196ZOv9rhiArSHx7VKJtIYC1jRfB","key":"haF54JxYTYX9ihyD6JF6yYeRgJLfxId5+jSuDT5xneY.NBhJO3tITxlsawUUWmBXRtxxfp/9GJAksHWCXrgXrc+wI0PRa1qzswYH2yH2wblOHqyIHddjymUIWkhJ5t3YtA.8271","base":"/","host":"docs.cbioportal.org","version":"1.0.0","useRelativePaths":true,"documentName":"index.html","appendDocumentName":false,"trailingSlash":true,"preloadSearch":false,"cacheBustingToken":"3.5.0.755715597922","cacheBustingStrategy":"query","sidebarFilterPlaceholder":"Filter","toolbarFilterPlaceholder":"Filter","showSidebarFilter":true,"filterNotFoundMsg":"No member names found containing the query \"{query}\"","maxHistoryItems":15,"homeIcon":"","access":[{"value":"public","label":"Public"},{"value":"protected","label":"Protected"}],"toolbarLinks":[{"id":"fields","label":"Fields"},{"id":"properties","label":"Properties"},{"id":"methods","label":"Methods"},{"id":"events","label":"Events"}],"sidebar":[{"n":"/","l":"Home"},{"n":"/about-us","l":"About Us"},{"n":"/rfc-list","l":"List of RF​Cs"},{"n":"/user-guide","l":"User Guide","i":[{"n":"/user-guide/new-users","l":"New Users"},{"n":"/user-guide/faq","l":"Frequently Asked Questions"},{"n":"/user-guide/overview","l":"Overview of Resources"},{"n":"/user-guide/by-page","l":"Page Specific Resources"},{"n":"/user-guide/oql","l":"OQL"},{"n":"/news","l":"News"},{"n":"/news-genie","l":"Genie News"}]},{"n":"/web-api-and-clients","l":"Web API and API Clients"},{"n":"/deployment","l":"Deployment","i":[{"n":"/architecture-overview","l":"Architecture overview"},{"n":"/hardware-requirements","l":"Hardware Requirements"},{"n":"/deployment/docker","l":"Deploy with Docker (Recommended)","i":[{"n":"/deployment/docker/import_data","l":"Import data with Docker"},{"n":"/deployment/docker/example_commands","l":"Example Commands"},{"n":"/deployment/docker/using-keycloak","l":"Authenticating and Authorizing Users using Keycloak in Docker"}]},{"n":"/deploy-without-docker","l":"Deploy without Docker","c":false,"i":[{"n":"/deployment/deploy-without-docker/software-requirements","l":"Software Requirements"},{"n":"/deployment/deploy-without-docker/pre-build-steps","l":"Pre-​Build Steps"},{"n":"/deployment/deploy-without-docker/build-from-source","l":"Building from Source"},{"n":"/deployment/deploy-without-docker/import-the-seed-database","l":"Importing the Seed Database"},{"n":"/deployment/deploy-without-docker/deploying","l":"Deploying the Web Application"},{"n":"/deployment/deploy-without-docker/load-sample-cancer-study","l":"Loading a Sample Study"}]},{"n":"/authorization-and-authentication","l":"Authorization and Authentication","c":false,"i":[{"n":"/deployment/authorization-and-authentication/user-authorization","l":"User Authorization"},{"n":"/deployment/authorization-and-authentication/authenticating-users-via-saml","l":"Authenticating Users via SAML"},{"n":"/deployment/authorization-and-authentication/authenticating-users-via-ldap","l":"Authenticating Users via LDAP"},{"n":"/deployment/authorization-and-authentication/authenticating-and-authorizing-users-via-keycloak","l":"Authenticating and Authorizing Users via Keycloak"},{"n":"/deployment/authorization-and-authentication/authenticating-users-via-tokens","l":"Authenticating Users via Tokens"}]},{"n":"/customization","l":"Customization","c":false,"i":[{"n":"/deployment/customization/customizing-your-instance-of-cbioportal","l":"Customizing your c​Bio​Portal Instance via portal.​properties"},{"n":"/deployment/customization/portal.properties-reference","l":"More portal.​properties Settings"},{"n":"/deployment/customization/caching","l":"Configuring Caching Behavior"},{"n":"/deployment/customization/studyview","l":"How does the study view organize the charts"},{"n":"/deployment/customization/studyview","l":"Utilize priority setting from database to visualize charts"}]},{"n":"/integration-with-other-webservices","l":"Integration with Other Webservices","c":false,"i":[{"n":"/deployment/integration-with-other-webservices/oncokb-data-access","l":"Onco​KB Data Access"}]},{"n":"/data-loading","l":"Data Loading Overview","i":[{"n":"/downloads","l":"Downloads"},{"n":"/using-the-dataset-validator","l":"Using the Dataset Validator"},{"n":"/using-the-metaimport-script","l":"Using the meta​Import Script"},{"n":"/file-formats","l":"File Formats","i":[{"n":"/z-score-normalization-script","l":"Z-​Score Normalization"}]},{"n":"/study-curation-guide","l":"Study Curation Guide"},{"n":"/data-loading-maintaining-studies","l":"Maintaining Studies"},{"n":"/data-loading-for-developers","l":"For Developers"},{"n":"/data-loading-tips-and-best-practices","l":"Tips and Best Practices"},{"n":"/mutation-data-transcript-annotation","l":"Mutation Data Transcript Annotation"},{"n":"/import-oncokb-annotations-as-custom-driver-annotations","l":"Import Onco​KB annotations as custom driver annotations"},{"n":"/import-gene-sets","l":"Importing Gene Sets for Gene Set Scoring Data"},{"n":"/import-gene-panels","l":"Importing Gene Panels"},{"n":"/deployment/customization/studyview","l":"Study View Customization with Priority Data"}]},{"n":"/cbioportal-maintenance","l":"c​Bio​Portal Maintenance","c":false,"i":[{"n":"/updating-your-cbioportal-installation","l":"Updating your c​Bio​Portal Database Scheme"},{"n":"/updating-gene-and-gene_alias-tables","l":"Update genes and gene aliases"},{"n":"/migration-guide","l":"Migration Guide"},{"n":"/msk-maintenance","l":"MSK Maintenance"}]}]},{"n":"/development","l":"Development","i":[{"n":"/development/feature-development-guide","l":"Feature Development Guide"},{"n":"/development/cbioportal-er-diagram","l":"c​Bio​Portal Entity-​relationship Diagram"},{"n":"/development/database-versioning","l":"c​Bio​Portal Database Versioning"},{"n":"/development/build-different-frontend","l":"Build c​Bio​Portal with a different frontend version"},{"n":"/development/session-service-working","l":"Session Service"},{"n":"/development/manual-test-cases","l":"Manual test cases"},{"n":"/development/release-procedure","l":"Release Procedure"},{"n":"/development/deployment-procedure","l":"Deployment Procedure"},{"n":"/development/documentation-site","l":"This documentation site"}]}],"search":{"mode":0,"minChars":2,"maxResults":20,"placeholder":"Search","hotkeys":["k"],"noResultsFoundMsg":"Sorry, no results found.","recognizeLanguages":true,"languages":[0],"preload":false},"resources":{"History_Title_Label":"History","History_ClearLink_Label":"Clear","History_NoHistory_Label":"No history items","API_AccessFilter_Label":"Access","API_ParameterSection_Label":"PARAMETERS","API_SignatureSection_Label":"SIGNATURE","API_CopyHint_Label":"Copy","API_CopyNameHint_Label":"Copy name","API_CopyLinkHint_Label":"Copy link","API_CopiedAckHint_Label":"Copied!","API_MoreOverloads_Label":"more","API_MoreDropdownItems_Label":"More","API_OptionalParameter_Label":"optional","API_DefaultParameterValue_Label":"Default value","API_InheritedFilter_Label":"Inherited","Search_Input_Placeholder":"Search","Toc_Contents_Label":"Contents","Toc_RelatedClasses_Label":"Related Classes","History_JustNowTime_Label":"just now","History_AgoTime_Label":"ago","History_YearTime_Label":"y","History_MonthTime_Label":"mo","History_DayTime_Label":"d","History_HourTime_Label":"h","History_MinuteTime_Label":"m","History_SecondTime_Label":"s"}}; diff --git a/rfc-list/index.html b/rfc-list/index.html index 0c7a872fb42..1abd67a4569 100644 --- a/rfc-list/index.html +++ b/rfc-list/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/session-service-management/index.html b/session-service-management/index.html index 9159bf19361..d8a2e6efa00 100644 --- a/session-service-management/index.html +++ b/session-service-management/index.html @@ -3,7 +3,7 @@ - + @@ -31,12 +31,12 @@ - + - + - - + + diff --git a/sitemap.xml.gz b/sitemap.xml.gz index c76e4a91b2564237919f3a4b1acda0590df4a649..92a83b81fe1b0a7b601b98611c7e14e8e2a85ed3 100644 GIT binary patch literal 1262 zcmV@I({G*wWsY`OeXOZ_Q5e0!{Gt){m2)Kfa5* z$+zX%LmO(eN8TX9_V6v zcl&vwHc}Al)@VWy-QIkjC{#*V6Co11z5G1SN~$e6EqI-i;2YAJUox=;<;km4(lWRg*T?C-7QYQlmR$b>iOM0E@N}1C{F|mdgLeo0q zA~)=4F~sqCA%rJheKcy$vkXP$gK)eK*$}rc<*^!O$AgHuVQdloF z$PA+;waW&AItbbo6m7K^4Lkc%$lkk#LcmxNF**pyurf;yxD96707NpVjY*_Z%Rw4+ zwFBTbGUz^f4D{TZK(Npeki4HHp~VorYM^Rk^7SEmANw@HHx!cLc&Ze`zgl< z5J*I<@(z+-WZhVLQoiQYTVureC8R?oYD;^?!Pd4!&JUI7wSIv10N3D<=R^92!3Q%C z6E(jN_gEw3Bw0ivEwU1>WW-po|6>3-p%AgxO`#N}UC3Cv=I9An7ZpF^`OwMa?qq&0l) zAr&_)VogaNHpEph4Wv|pKs;T2$47!qk~WeJRb3+JkVp0- z4_lO4gHZ!n%EqS&UXf;_Sq$XK-iW9r`%wPR*EyFlm`%(1R~8=ooC{S@#*iMTy_T+J zmCr{2I7f^niSxuWzKRySJOP};5hvA-VI3~IKqNk=s*_JAj6wzN$HEblX=0zDtnzYf zf>a50ECInz=0)aY)8*6g8c!enzqPZIB$QDEP#@=|<=8Ivr z^MU13C`b8?S>kcsvD!p2xE-N`+2vx{@gamBaipNpLlvS=+fO3S@x&KSg^;lQV$D`5 zUp#S|!J_6&&4LUQV28LiYqniDRy@8ZnRFRxtUD5t{X?4z{)0$eOOImwZ=xA3^yldtew<(4OfPR{(|@tw@U-vS1nq-Py9JK+cJkDsk57iLzk@GUs|Py<*1`S=uU z!T5$2S3jXfJBWoqYD*0fQ>%8Ojc70gcH2NGi!VS80Zkf+6*zC-suN#B2TE93<2p30 zb!AN~+K}YEDTFCPBo8Ifv~4xcrIk*ufXnJ~0Qx$0GJrtUb-pv8Rzz3IoF<3~HM9_# z)@c{9VFrsK4$liAJo4&;QF9(;C~6;s!*z&;xP2^-Rl5YMkX@PRbXp6a)+pW%mV@Gy zvL5Bqw+X#QAvh=?Asa0u1qDXGLveo_J6+CMqq$l>uu#odsT_2InmiJlvaYf_4LbW$$X>bzj@e`YLq%ksHYRWP+56C^3BG}l zG{$RB*&he`>>pn1kuP(cM#0cvO!~V_PGZI@?bnHytu{*3!CMi18<=Fx5Tw-F07dLp z@+cDr(@XEsr`z`wAFx1j#40Z!;ZfSgzpf8!{Qn`nq~W-PW^(k!u5w|JegOBs<- zvf&udl%eeNfdTD%&^ylu$mtcC2l+gZ-?s>VhcTtd^ z8X+sZ!=gmf>(87IiODlhN-||hq7Er(4KkF-O4qq~ zlc=_UX4R<@S^vK?-TAQLQfp?^00zkTG{IM(&}bF|d9*hotVAD*|8z~cjON+2oPK8E zG3Q)d1!W%6!?auJT2y&D0)RPUEJ>V4p7BYv%*&I3vp?cgwL@6P7hP~9KF6vclttHgCIfrHhysh{Kwoq}||J4a;a6I)S&19b>DR^X_3#ZxTg z=4zw^Qw-TNd*iE?F8bM~1IwjQ4)Pna#KXEnwTYs4J39b&6j?CysHD{lIL4V+}!Wo4MxUzmjX o0K(DUpV?Q=_!6^=*J~~L2Tk$f - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/study-curation-guide/index.html b/study-curation-guide/index.html index 428630e48e0..b3e045d21a7 100644 --- a/study-curation-guide/index.html +++ b/study-curation-guide/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/testing/index.html b/testing/index.html index 851d9546fc2..7ed0c8e3ae2 100644 --- a/testing/index.html +++ b/testing/index.html @@ -3,7 +3,7 @@ - + @@ -31,12 +31,12 @@ - + - + - - + + diff --git a/uninstall-docker-cbioportal/index.html b/uninstall-docker-cbioportal/index.html index 9d7190ceb67..40ec1607e44 100644 --- a/uninstall-docker-cbioportal/index.html +++ b/uninstall-docker-cbioportal/index.html @@ -3,7 +3,7 @@ - + @@ -31,12 +31,12 @@ - + - + - - + + diff --git a/updating-gene-and-gene_alias-tables/index.html b/updating-gene-and-gene_alias-tables/index.html index ad54403fd0a..405b404d475 100644 --- a/updating-gene-and-gene_alias-tables/index.html +++ b/updating-gene-and-gene_alias-tables/index.html @@ -3,7 +3,7 @@ - + @@ -31,12 +31,12 @@ - + - + - - + + diff --git a/updating-your-cbioportal-installation/index.html b/updating-your-cbioportal-installation/index.html index 349d9a6276c..be9e467505b 100644 --- a/updating-your-cbioportal-installation/index.html +++ b/updating-your-cbioportal-installation/index.html @@ -3,7 +3,7 @@ - + @@ -31,12 +31,12 @@ - + - + - - + + diff --git a/user-guide/by-page/index.html b/user-guide/by-page/index.html index 2a0e7ca7d64..60f697efb1f 100644 --- a/user-guide/by-page/index.html +++ b/user-guide/by-page/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/user-guide/faq/index.html b/user-guide/faq/index.html index be09461790c..f894e6e8765 100644 --- a/user-guide/faq/index.html +++ b/user-guide/faq/index.html @@ -3,7 +3,7 @@ - + @@ -33,11 +33,11 @@ - + - + - + diff --git a/user-guide/index.html b/user-guide/index.html index 139cfa77c2c..231f9d0e714 100644 --- a/user-guide/index.html +++ b/user-guide/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/user-guide/new-users/index.html b/user-guide/new-users/index.html index e1aed4b1de9..4b77e6ffaaa 100644 --- a/user-guide/new-users/index.html +++ b/user-guide/new-users/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/user-guide/oql/index.html b/user-guide/oql/index.html index db39f9a839c..8c45f5f515a 100644 --- a/user-guide/oql/index.html +++ b/user-guide/oql/index.html @@ -3,7 +3,7 @@ - + @@ -33,11 +33,11 @@ - + - + - + diff --git a/user-guide/overview/index.html b/user-guide/overview/index.html index 96a4c614d86..4987742dc99 100644 --- a/user-guide/overview/index.html +++ b/user-guide/overview/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/using-the-dataset-validator/index.html b/using-the-dataset-validator/index.html index de2b7013384..1d6239ac1cb 100644 --- a/using-the-dataset-validator/index.html +++ b/using-the-dataset-validator/index.html @@ -3,7 +3,7 @@ - + @@ -33,12 +33,12 @@ - + - + - - + + diff --git a/using-the-metaimport-script/index.html b/using-the-metaimport-script/index.html index 81ea6ba8ec5..b8151bba549 100644 --- a/using-the-metaimport-script/index.html +++ b/using-the-metaimport-script/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - + diff --git a/web-api-and-clients/index.html b/web-api-and-clients/index.html index 2ad43ca5671..15b01aa5c8c 100644 --- a/web-api-and-clients/index.html +++ b/web-api-and-clients/index.html @@ -3,7 +3,7 @@ - + @@ -31,12 +31,12 @@ - + - + - - + + diff --git a/z-score-normalization-script/index.html b/z-score-normalization-script/index.html index c6ea7b36d46..55df317b676 100644 --- a/z-score-normalization-script/index.html +++ b/z-score-normalization-script/index.html @@ -3,7 +3,7 @@ - + @@ -31,11 +31,11 @@ - + - + - +