repo: gemini-site
action: commit
revision: 
path_from: 
revision_from: d56ba83128718d9daf846e3f4007cb02dae68c0c:
path_to: 
revision_to: 

commit d56ba83128718d9daf846e3f4007cb02dae68c0c
Merge: 128d03a 4d6cbe8
Author: Solderpunk 
Date:   Sat Nov 23 19:57:35 2019 +0000

    Merge /home/solderpunk/gemini

diff --cc docs/faq.txt
index 3e0f3beae6082a8243fe4c0d3904a974f4353d06,19fe31950b71a03a4ecad41743e7255e3f337bbc..ff0a74d362dd11f4b53a6be001e4d8ed0993423e
--- a/docs/faq.txt
+++ b/docs/faq.txt
@@@ -90,8 -90,15 +90,10 @@@ actual project, it seemed wise to send 

  ## 2.1 What are the design criteria for Gemini?

- The following are the core design criteria of the Gemini protocol:
 -<<<<<<< HEAD
 -=======
+ The following criteria were informally put in place at the beginning
+ of the project.  It's debatable how closely some of these goals have
+ been met, but in general Gemini is still quite close to this target.

 ->>>>>>> f3dbe0b113d59bc508fe589478809769783f1650
 -The following are the core design criteria of the Gemini protocol:
 -
  ### 2.1.1 Simplicity

  In particular, Gemini strives for simplicity of client implementation.

-----END OF PAGE-----