From 399d2b7951174780e0e9cc895f0fc5b44903ec3e Mon Sep 17 00:00:00 2001
From: "@RandyMcMillan" <randy.lee.mcmillan@gmail.com>
Date: Sun, 19 Feb 2023 15:31:30 -0500
Subject: [PATCH 1/3] minor grammar corrections (#663)

---
 docs-web/src/main/webapp/src/locale/en.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs-web/src/main/webapp/src/locale/en.json b/docs-web/src/main/webapp/src/locale/en.json
index 78c8a3e3..32495206 100644
--- a/docs-web/src/main/webapp/src/locale/en.json
+++ b/docs-web/src/main/webapp/src/locale/en.json
@@ -25,7 +25,7 @@
     "message": "Please enter a new password",
     "submit": "Change my password",
     "error_title": "Error changing your password",
-    "error_message": "Your password recovery request is expired, please ask a new one on the login page"
+    "error_message": "Your password recovery request is expired, please ask for a new one on the login page"
   },
   "index": {
     "toggle_navigation": "Toggle navigation",
@@ -360,7 +360,7 @@
       "message_2": "Those applications automatically generate a validation code that changes after a certain period of time.<br/>You will be required to enter this validation code each time you login on <strong>{{ appName }}</strong>.",
       "secret_key": "Your secret key is: <strong>{{ secret }}</strong>",
       "secret_key_warning": "Configure your TOTP app on your phone with this secret key now, you will not be able to access it later.",
-      "totp_enabled_message": "Two-factor authentication is enabled on your account.<br/>Each time you login on <strong>{{ appName }}</strong>, you will be asked a validation code from your configured phone app.<br/>If you lose your phone, you will not be able to login into your account but active sessions will allow you to regenerate a secrey key.",
+      "totp_enabled_message": "Two-factor authentication is enabled on your account.<br/>Each time you login on <strong>{{ appName }}</strong>, you will be asked for a validation code from your configured phone app.<br/>If you lose your phone, you will not be able to login into your account but active sessions will allow you to regenerate a secrey key.",
       "disable_totp": {
         "disable_totp": "Disable two-factor authentication",
         "message": "Your account will not be protected by the two-factor authentication anymore.",
@@ -509,7 +509,7 @@
     "error_general": "An error occurred while trying to import your file, please make sure it is a valid EML file"
   },
   "app_share": {
-    "main": "Ask a shared document link to access it",
+    "main": "Ask for a shared document link to access it",
     "403": {
       "title": "Not authorized",
       "message": "The document you are trying to view is not shared anymore"

From dd4a1667cab6674c9b91e501e3efb602e24dd5b8 Mon Sep 17 00:00:00 2001
From: "@RandyMcMillan" <randy.lee.mcmillan@gmail.com>
Date: Mon, 20 Feb 2023 05:51:30 -0500
Subject: [PATCH 2/3] .gitignore: add docs/.gitkeep (#664)

---
 .gitignore    | 7 ++++++-
 docs/.gitkeep | 0
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 docs/.gitkeep

diff --git a/.gitignore b/.gitignore
index 5560f987..ef52ccd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,9 @@ node_modules
 import_test
 teedy-importer-linux
 teedy-importer-macos
-teedy-importer-win.exe
\ No newline at end of file
+teedy-importer-win.exe
+docs/*
+!docs/.gitkeep
+
+#macos
+.DS_Store
diff --git a/docs/.gitkeep b/docs/.gitkeep
new file mode 100644
index 00000000..e69de29b

From ad2722842900cb247d9fff9bacd80dfa42b51448 Mon Sep 17 00:00:00 2001
From: "@RandyMcMillan" <randy.lee.mcmillan@gmail.com>
Date: Mon, 20 Feb 2023 05:51:39 -0500
Subject: [PATCH 3/3] docker-compose.yml: add example config (#665)

---
 docker-compose.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..8315aa50
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,18 @@
+version: '3'
+services:
+# Teedy Application
+  teedy-server:
+    image: sismics/docs:v1.10
+    restart: unless-stopped
+    ports:
+      # Map internal port to host
+      - 8080:8080
+    environment:
+      # Base url to be used
+      DOCS_BASE_URL: "https://docs.example.com"
+      # Set the admin email
+      DOCS_ADMIN_EMAIL_INIT: "admin@example.com"
+      # Set the admin password (in this example: "superSecure")
+      DOCS_ADMIN_PASSWORD_INIT: "$$2a$$05$$PcMNUbJvsk7QHFSfEIDaIOjk1VI9/E7IPjTKx.jkjPxkx2EOKSoPS"
+    volumes:
+      - ./docs/data:/data