From 0c4f67f07c33ac958676ec8fac0293860c615e8b Mon Sep 17 00:00:00 2001
From: Alexander Pushkov <alexander@notpushk.in>
Date: Thu, 15 Jul 2021 12:40:08 +0300
Subject: [PATCH 1/3] Remove leftover merge conflict

---
 docs/FAQ.md | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/docs/FAQ.md b/docs/FAQ.md
index cfd41e1f9363..2ecde3003790 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -390,20 +390,8 @@ Codespaces web dashboard instead of connecting directly to it.
 On the other hand, code-server is free, open-source, and can be run on any
 machine with few limitations.
 
-<<<<<<< HEAD
-
-## Does code-server have any security login validation?
-
-code-server only supports a single password and limits logins to two per minute plus twelve per hour.
-
-## Enterprise
-
-=======
-
 ## Are there community projects involving code-server?
 
-> > > > > > > Edit code-server docs
-
 Visit the [awesome-code-server](https://github.com/cdr/awesome-code-server)
 repository to view community projects and guides with code-server! Feel free to
 add your own!

From de7c9232a0bc8645c25662f3c69837eaff1fc0de Mon Sep 17 00:00:00 2001
From: Alexander Pushkov <alexander@notpushk.in>
Date: Sat, 17 Jul 2021 13:27:32 +0300
Subject: [PATCH 2/3] =?UTF-8?q?Bring=20back=20the=20=E2=80=9Csecurity=20lo?=
 =?UTF-8?q?gin=20validation=E2=80=9D=20section,=20update=20ToC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/FAQ.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/FAQ.md b/docs/FAQ.md
index 2ecde3003790..6bf5ea2a4e5d 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -28,7 +28,6 @@
 - [What's the difference between code-server and Theia?](#whats-the-difference-between-code-server-and-theia)
 - [What's the difference between code-server and VS Code Codespaces?](#whats-the-difference-between-code-server-and-vs-code-codespaces)
 - [Does code-server have any security login validation?](#does-code-server-have-any-security-login-validation)
-- [Enterprise](#enterprise)
 - [Are there community projects involving code-server?](#are-there-community-projects-involving-code-server)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -390,6 +389,10 @@ Codespaces web dashboard instead of connecting directly to it.
 On the other hand, code-server is free, open-source, and can be run on any
 machine with few limitations.
 
+## Does code-server have any security login validation?
+
+code-server only supports a single password and limits logins to two per minute plus twelve per hour. 
+
 ## Are there community projects involving code-server?
 
 Visit the [awesome-code-server](https://github.com/cdr/awesome-code-server)

From 47de05dde97f026aaf428be9d1fd7eb53d7274ec Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Mon, 19 Jul 2021 10:08:05 -0500
Subject: [PATCH 3/3] Tweak login limit verbiage

Co-authored-by: Jonathan Yu <jawnsy@cpan.org>
---
 docs/FAQ.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/FAQ.md b/docs/FAQ.md
index 6bf5ea2a4e5d..4a4bf42335c1 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -391,7 +391,7 @@ machine with few limitations.
 
 ## Does code-server have any security login validation?
 
-code-server only supports a single password and limits logins to two per minute plus twelve per hour. 
+code-server supports setting a single password and limits logins to two per minute and twelve per hour. 
 
 ## Are there community projects involving code-server?