From 0cd28b4af30e8f195c64b6ff995ad537ea7f49fa Mon Sep 17 00:00:00 2001 From: Kiril Isakov Date: Tue, 28 May 2024 22:21:18 +0200 Subject: [PATCH] fix typo: replace "requested" by "required" (ie mandatory, not optional) --- manual/deploy_pro/adfs.md | 2 +- manual/deploy_pro/config_seafile_with_ADFS.md | 2 +- .../docker/docker-compose/ce/10.0/docker-compose.yml | 8 ++++---- .../docker/docker-compose/ce/11.0/docker-compose.yml | 8 ++++---- .../docker/docker-compose/pro/10.0/docker-compose.yml | 10 +++++----- .../docker/docker-compose/pro/11.0/docker-compose.yml | 10 +++++----- .../docker-compose/pro/7.1_8.0/docker-compose.yml | 10 +++++----- .../docker/docker-compose/pro/9.0/docker-compose.yml | 10 +++++----- manual/docker/non_docker_to_docker.md | 4 ++-- manual/extra_setup/sdoc/docker-compose.yml | 2 +- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/manual/deploy_pro/adfs.md b/manual/deploy_pro/adfs.md index 1c3ef6f1..08879367 100644 --- a/manual/deploy_pro/adfs.md +++ b/manual/deploy_pro/adfs.md @@ -234,7 +234,7 @@ SHIBBOLETH_AFFILIATION_ROLE_MAP = { 8. Select **Transform an Incoming Claim**. 9. Give it a name such as **Email to Name ID**. 10. Incoming claim type should be **E-mail Address** (it must match the Outgoing Claim Type in rule #1). -11. The Outgoing claim type is **Name ID** (this is requested in Seafile settings policy `'name_id_format': saml2.saml.NAMEID_FORMAT_EMAILADDRESS`). +11. The Outgoing claim type is **Name ID** (this is required in Seafile settings policy `'name_id_format': saml2.saml.NAMEID_FORMAT_EMAILADDRESS`). 12. the Outgoing name ID format is **Email**. 13. **Pass through all claim values** and click **Finish**. diff --git a/manual/deploy_pro/config_seafile_with_ADFS.md b/manual/deploy_pro/config_seafile_with_ADFS.md index 8d8cce58..4cf522ea 100644 --- a/manual/deploy_pro/config_seafile_with_ADFS.md +++ b/manual/deploy_pro/config_seafile_with_ADFS.md @@ -206,7 +206,7 @@ SAML_CONFIG = { 1. Incoming claim type should be **E-mail Address** (it must match the Outgoing Claim Type in rule #1). - 1. The Outgoing claim type is **Name ID** (this is requested in Seafile settings policy ` 'name_id_format': saml2.saml.NAMEID_FORMAT_EMAILADDRESS`). + 1. The Outgoing claim type is **Name ID** (this is required in Seafile settings policy ` 'name_id_format': saml2.saml.NAMEID_FORMAT_EMAILADDRESS`). 1. the Outgoing name ID format is **Email**. diff --git a/manual/docker/docker-compose/ce/10.0/docker-compose.yml b/manual/docker/docker-compose/ce/10.0/docker-compose.yml index 4cf54f42..8ff29416 100644 --- a/manual/docker/docker-compose/ce/10.0/docker-compose.yml +++ b/manual/docker/docker-compose/ce/10.0/docker-compose.yml @@ -3,11 +3,11 @@ services: image: mariadb:10.11 container_name: seafile-mysql environment: - - MYSQL_ROOT_PASSWORD=db_dev # Requested, set the root's password of MySQL service. + - MYSQL_ROOT_PASSWORD=db_dev # Required, set the root's password of MySQL service. - MYSQL_LOG_CONSOLE=true - MARIADB_AUTO_UPGRADE=1 volumes: - - /opt/seafile-mysql/db:/var/lib/mysql # Requested, specifies the path to MySQL data persistent store. + - /opt/seafile-mysql/db:/var/lib/mysql # Required, specifies the path to MySQL data persistent store. networks: - seafile-net @@ -25,10 +25,10 @@ services: - "80:80" # - "443:443" # If https is enabled, cancel the comment. volumes: - - /opt/seafile-data:/shared # Requested, specifies the path to Seafile data persistent store. + - /opt/seafile-data:/shared # Required, specifies the path to Seafile data persistent store. environment: - DB_HOST=db - - DB_ROOT_PASSWD=db_dev # Requested, the value should be root's password of MySQL service. + - DB_ROOT_PASSWD=db_dev # Required, the value should be root's password of MySQL service. - TIME_ZONE=Etc/UTC # Optional, default is UTC. Should be uncomment and set to your local time zone. - SEAFILE_ADMIN_EMAIL=me@example.com # Specifies Seafile admin user, default is 'me@example.com'. - SEAFILE_ADMIN_PASSWORD=asecret # Specifies Seafile admin password, default is 'asecret'. diff --git a/manual/docker/docker-compose/ce/11.0/docker-compose.yml b/manual/docker/docker-compose/ce/11.0/docker-compose.yml index 1e2fbae4..05bc2f97 100644 --- a/manual/docker/docker-compose/ce/11.0/docker-compose.yml +++ b/manual/docker/docker-compose/ce/11.0/docker-compose.yml @@ -3,11 +3,11 @@ services: image: mariadb:10.11 container_name: seafile-mysql environment: - - MYSQL_ROOT_PASSWORD=db_dev # Requested, set the root's password of MySQL service. + - MYSQL_ROOT_PASSWORD=db_dev # Required, set the root's password of MySQL service. - MYSQL_LOG_CONSOLE=true - MARIADB_AUTO_UPGRADE=1 volumes: - - /opt/seafile-mysql/db:/var/lib/mysql # Requested, specifies the path to MySQL data persistent store. + - /opt/seafile-mysql/db:/var/lib/mysql # Required, specifies the path to MySQL data persistent store. networks: - seafile-net @@ -25,10 +25,10 @@ services: - "80:80" # - "443:443" # If https is enabled, cancel the comment. volumes: - - /opt/seafile-data:/shared # Requested, specifies the path to Seafile data persistent store. + - /opt/seafile-data:/shared # Required, specifies the path to Seafile data persistent store. environment: - DB_HOST=db - - DB_ROOT_PASSWD=db_dev # Requested, the value should be root's password of MySQL service. + - DB_ROOT_PASSWD=db_dev # Required, the value should be root's password of MySQL service. - TIME_ZONE=Etc/UTC # Optional, default is UTC. Should be uncomment and set to your local time zone. - SEAFILE_ADMIN_EMAIL=me@example.com # Specifies Seafile admin user, default is 'me@example.com'. - SEAFILE_ADMIN_PASSWORD=asecret # Specifies Seafile admin password, default is 'asecret'. diff --git a/manual/docker/docker-compose/pro/10.0/docker-compose.yml b/manual/docker/docker-compose/pro/10.0/docker-compose.yml index 68df6945..f6be46da 100644 --- a/manual/docker/docker-compose/pro/10.0/docker-compose.yml +++ b/manual/docker/docker-compose/pro/10.0/docker-compose.yml @@ -3,11 +3,11 @@ services: image: mariadb:10.11 container_name: seafile-mysql environment: - - MYSQL_ROOT_PASSWORD=db_dev # Requested, set the root's password of MySQL service. + - MYSQL_ROOT_PASSWORD=db_dev # Required, set the root's password of MySQL service. - MYSQL_LOG_CONSOLE=true - MARIADB_AUTO_UPGRADE=1 volumes: - - /opt/seafile-mysql/db:/var/lib/mysql # Requested, specifies the path to MySQL data persistent store. + - /opt/seafile-mysql/db:/var/lib/mysql # Required, specifies the path to MySQL data persistent store. networks: - seafile-net @@ -32,7 +32,7 @@ services: hard: -1 mem_limit: 2g volumes: - - /opt/seafile-elasticsearch/data:/usr/share/elasticsearch/data # Requested, specifies the path to Elasticsearch data persistent store. + - /opt/seafile-elasticsearch/data:/usr/share/elasticsearch/data # Required, specifies the path to Elasticsearch data persistent store. networks: - seafile-net @@ -43,10 +43,10 @@ services: - "80:80" # - "443:443" # If https is enabled, cancel the comment. volumes: - - /opt/seafile-data:/shared # Requested, specifies the path to Seafile data persistent store. + - /opt/seafile-data:/shared # Required, specifies the path to Seafile data persistent store. environment: - DB_HOST=db - - DB_ROOT_PASSWD=db_dev # Requested, the value should be root's password of MySQL service. + - DB_ROOT_PASSWD=db_dev # Required, the value should be root's password of MySQL service. # - TIME_ZONE=Asia/Shanghai # Optional, default is UTC. Should be uncomment and set to your local time zone. - SEAFILE_ADMIN_EMAIL=me@example.com # Specifies Seafile admin user, default is 'me@example.com' - SEAFILE_ADMIN_PASSWORD=asecret # Specifies Seafile admin password, default is 'asecret' diff --git a/manual/docker/docker-compose/pro/11.0/docker-compose.yml b/manual/docker/docker-compose/pro/11.0/docker-compose.yml index 656fb4b8..250c6832 100644 --- a/manual/docker/docker-compose/pro/11.0/docker-compose.yml +++ b/manual/docker/docker-compose/pro/11.0/docker-compose.yml @@ -3,11 +3,11 @@ services: image: mariadb:10.11 container_name: seafile-mysql environment: - - MYSQL_ROOT_PASSWORD=db_dev # Requested, set the root's password of MySQL service. + - MYSQL_ROOT_PASSWORD=db_dev # Required, set the root's password of MySQL service. - MYSQL_LOG_CONSOLE=true - MARIADB_AUTO_UPGRADE=1 volumes: - - /opt/seafile-mysql/db:/var/lib/mysql # Requested, specifies the path to MySQL data persistent store. + - /opt/seafile-mysql/db:/var/lib/mysql # Required, specifies the path to MySQL data persistent store. networks: - seafile-net @@ -32,7 +32,7 @@ services: hard: -1 mem_limit: 4g volumes: - - /opt/seafile-elasticsearch/data:/usr/share/elasticsearch/data # Requested, specifies the path to Elasticsearch data persistent store. + - /opt/seafile-elasticsearch/data:/usr/share/elasticsearch/data # Required, specifies the path to Elasticsearch data persistent store. networks: - seafile-net @@ -43,10 +43,10 @@ services: - "80:80" # - "443:443" # If https is enabled, cancel the comment. volumes: - - /opt/seafile-data:/shared # Requested, specifies the path to Seafile data persistent store. + - /opt/seafile-data:/shared # Required, specifies the path to Seafile data persistent store. environment: - DB_HOST=db - - DB_ROOT_PASSWD=db_dev # Requested, the value should be root's password of MySQL service. + - DB_ROOT_PASSWD=db_dev # Required, the value should be root's password of MySQL service. # - TIME_ZONE=Asia/Shanghai # Optional, default is UTC. Should be uncomment and set to your local time zone. - SEAFILE_ADMIN_EMAIL=me@example.com # Specifies Seafile admin user, default is 'me@example.com' - SEAFILE_ADMIN_PASSWORD=asecret # Specifies Seafile admin password, default is 'asecret' diff --git a/manual/docker/docker-compose/pro/7.1_8.0/docker-compose.yml b/manual/docker/docker-compose/pro/7.1_8.0/docker-compose.yml index 13cc2d88..6ed14bee 100644 --- a/manual/docker/docker-compose/pro/7.1_8.0/docker-compose.yml +++ b/manual/docker/docker-compose/pro/7.1_8.0/docker-compose.yml @@ -4,10 +4,10 @@ services: image: mariadb:10.5 container_name: seafile-mysql environment: - - MYSQL_ROOT_PASSWORD=db_dev # Requested, set the root's password of MySQL service. + - MYSQL_ROOT_PASSWORD=db_dev # Required, set the root's password of MySQL service. - MYSQL_LOG_CONSOLE=true volumes: - - /opt/seafile-mysql/db:/var/lib/mysql # Requested, specifies the path to MySQL data persistent store. + - /opt/seafile-mysql/db:/var/lib/mysql # Required, specifies the path to MySQL data persistent store. networks: - seafile-net @@ -31,7 +31,7 @@ services: hard: -1 mem_limit: 2g volumes: - - /opt/seafile-elasticsearch/data:/usr/share/elasticsearch/data # Requested, specifies the path to Elasticsearch data persistent store. + - /opt/seafile-elasticsearch/data:/usr/share/elasticsearch/data # Required, specifies the path to Elasticsearch data persistent store. networks: - seafile-net @@ -42,10 +42,10 @@ services: - "80:80" # - "443:443" # If https is enabled, cancel the comment. volumes: - - /opt/seafile-data:/shared # Requested, specifies the path to Seafile data persistent store. + - /opt/seafile-data:/shared # Required, specifies the path to Seafile data persistent store. environment: - DB_HOST=db - - DB_ROOT_PASSWD=db_dev # Requested, the value should be root's password of MySQL service. + - DB_ROOT_PASSWD=db_dev # Required, the value should be root's password of MySQL service. # - TIME_ZONE=Asia/Shanghai # Optional, default is UTC. Should be uncomment and set to your local time zone. - SEAFILE_ADMIN_EMAIL=me@example.com # Specifies Seafile admin user, default is 'me@example.com' - SEAFILE_ADMIN_PASSWORD=asecret # Specifies Seafile admin password, default is 'asecret' diff --git a/manual/docker/docker-compose/pro/9.0/docker-compose.yml b/manual/docker/docker-compose/pro/9.0/docker-compose.yml index 1abe5eb2..abe2bc6f 100644 --- a/manual/docker/docker-compose/pro/9.0/docker-compose.yml +++ b/manual/docker/docker-compose/pro/9.0/docker-compose.yml @@ -4,10 +4,10 @@ services: image: mariadb:10.6 container_name: seafile-mysql environment: - - MYSQL_ROOT_PASSWORD=db_dev # Requested, set the root's password of MySQL service. + - MYSQL_ROOT_PASSWORD=db_dev # Required, set the root's password of MySQL service. - MYSQL_LOG_CONSOLE=true volumes: - - /opt/seafile-mysql/db:/var/lib/mysql # Requested, specifies the path to MySQL data persistent store. + - /opt/seafile-mysql/db:/var/lib/mysql # Required, specifies the path to MySQL data persistent store. networks: - seafile-net @@ -31,7 +31,7 @@ services: hard: -1 mem_limit: 2g volumes: - - /opt/seafile-elasticsearch/data:/usr/share/elasticsearch/data # Requested, specifies the path to Elasticsearch data persistent store. + - /opt/seafile-elasticsearch/data:/usr/share/elasticsearch/data # Required, specifies the path to Elasticsearch data persistent store. networks: - seafile-net @@ -42,10 +42,10 @@ services: - "80:80" # - "443:443" # If https is enabled, cancel the comment. volumes: - - /opt/seafile-data:/shared # Requested, specifies the path to Seafile data persistent store. + - /opt/seafile-data:/shared # Required, specifies the path to Seafile data persistent store. environment: - DB_HOST=db - - DB_ROOT_PASSWD=db_dev # Requested, the value should be root's password of MySQL service. + - DB_ROOT_PASSWD=db_dev # Required, the value should be root's password of MySQL service. # - TIME_ZONE=Asia/Shanghai # Optional, default is UTC. Should be uncomment and set to your local time zone. - SEAFILE_ADMIN_EMAIL=me@example.com # Specifies Seafile admin user, default is 'me@example.com' - SEAFILE_ADMIN_PASSWORD=asecret # Specifies Seafile admin password, default is 'asecret' diff --git a/manual/docker/non_docker_to_docker.md b/manual/docker/non_docker_to_docker.md index 235be7e1..4d3fdfc9 100644 --- a/manual/docker/non_docker_to_docker.md +++ b/manual/docker/non_docker_to_docker.md @@ -74,10 +74,10 @@ services: # image: mariadb:10.5 # container_name: seafile-mysql # environment: -# - MYSQL_ROOT_PASSWORD=db_dev # Requested, set the root's password of MySQL service. +# - MYSQL_ROOT_PASSWORD=db_dev # Required, set the root's password of MySQL service. # - MYSQL_LOG_CONSOLE=true # volumes: -# - /opt/seafile-mysql/db:/var/lib/mysql # Requested, specifies the path to MySQL data persistent store. +# - /opt/seafile-mysql/db:/var/lib/mysql # Required, specifies the path to MySQL data persistent store. # networks: # - seafile-net diff --git a/manual/extra_setup/sdoc/docker-compose.yml b/manual/extra_setup/sdoc/docker-compose.yml index 217a658a..b2f7ef62 100644 --- a/manual/extra_setup/sdoc/docker-compose.yml +++ b/manual/extra_setup/sdoc/docker-compose.yml @@ -14,7 +14,7 @@ services: - DB_HOST=192.168.0.2 - DB_PORT=3306 - DB_USER=user - - DB_PASSWD=password # Requested, password of MySQL service. + - DB_PASSWD=password # Required, password of MySQL service. - DB_NAME=sdoc_db - TIME_ZONE=Etc/UTC # Optional, default is UTC. Should be uncomment and set to your local time zone. - SDOC_SERVER_LETSENCRYPT=false # Whether to use https or not.