From 45a8b9831e33919df35c1864ff2bd1c4c34a6f42 Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Tue, 23 May 2023 07:05:43 +1000
Subject: [PATCH] clean up rebase

---
 README.md                                     | 15 +++++++++++++--
 packages/client/src/pages/mfm-cheat-sheet.vue | 14 ++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index b8fd09b770..79bd8f86cb 100644
--- a/README.md
+++ b/README.md
@@ -83,11 +83,14 @@ If you have access to a server that supports one of the sources below, I recomme
 - Web Proxy (one of the following)
   - 🍀 Nginx (recommended)
   - 🪶 Apache
+  - 🦦 Caddy
 
 ### 😗 Optional dependencies
 
 - [FFmpeg](https://ffmpeg.org/) for video transcoding
-- [ElasticSearch](https://www.elastic.co/elasticsearch/) for full-text search
+- Full text search (one of the following)
+  - 🦔 [Sonic](https://crates.io/crates/sonic-server) (recommended)
+  - [ElasticSearch](https://www.elastic.co/elasticsearch/)
 
 ### 🏗️ Build dependencies
 
@@ -181,7 +184,15 @@ For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](
 - Run `sudo a2ensite calckey.apache` to enable the site
 - Run `sudo service apache2 restart` to reload apache2 configuration
 
-</details>
+### 🦦 Caddy
+
+- Add the following block to your `Caddyfile`, replacing `example.tld` with your own domain:
+```caddy
+example.tld {
+    reverse_proxy http://127.0.0.1:3000
+}
+```
+- Reload your caddy configuration
 
 ## 🚀 Build and launch!
 
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index ea35a6210c..5492a37223 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -416,19 +416,9 @@
 					<div class="content">
 						<p>{{ i18n.ts._mfm.plainDescription }}</p>
 						<div class="preview">
-							<Mfm :text="preview_plain" />
-							<MkTextarea v-model="preview_plain"
-								><span>MFM</span></MkTextarea
-							>
+							<Mfm :text="preview_plain"/>
+							<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
 						</div>
-			</div>
-			<div class="section _block">
-				<div class="title">{{ i18n.ts._mfm.plain }}</div>
-				<div class="content">
-					<p>{{ i18n.ts._mfm.plainDescription }}</p>
-					<div class="preview">
-						<Mfm :text="preview_plain"/>
-						<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
 					</div>
 				</div>
 			</div>