Convert all support/*.html to .md

Partial fix of openssl#324

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from openssl#348)

Makefile

@@ -70,11 +70,15 @@ H_DOCS = $(addsuffix .html,\
                                               docs/*.md.tt \
                               | grep -v '/sub-')))
 H_NEWS = $(addsuffix .html,$(basename $(shell git ls-files -- news/*.md)))
+<<<<<<< HEAD
 =======
 >>>>>>> 7943bed (Convert all community/*.html to .md)
 =======
 H_NEWS = $(addsuffix .html,$(basename $(shell git ls-files -- news/*.md)))
 >>>>>>> 6b0605c (Convert all news/*.html to .md)
+=======
+H_SUPPORT = $(addsuffix .html,$(basename $(shell git ls-files -- support/*.md)))
+>>>>>>> 7e79f7d (Convert all support/*.html to .md)
 H_POLICIES = $(addsuffix .html,\
                $(basename $(shell git ls-files -- policies/*.md \
                                                   policies/general/*.md \
@@ -109,6 +113,10 @@ SIMPLE = $(H_TOP) \
 	 $(H_SOURCE) \
 	 source/.htaccess \
 	 source/index.inc \
+<<<<<<< HEAD
+=======
+	 source/old/index.html \
+>>>>>>> 7e79f7d (Convert all support/*.html to .md)
 	 $(H_SUPPORT)
 SRCLISTS = $(foreach S,$(FUTURESERIES) $(SERIES) $(OLDSERIES2) fips,source/old/$(S)/index.inc source/old/$(S)/index.html)
 
@@ -592,6 +600,9 @@ $(foreach H, \
   $(H_NEWS) \
 >>>>>>> 6b0605c (Convert all news/*.html to .md)
   $(H_POLICIES) \
+<<<<<<< HEAD
   $(H_SOURCE) \
+=======
+>>>>>>> 7e79f7d (Convert all support/*.html to .md)
   $(H_SUPPORT) \
 ,$(eval $(call makehtmldepend,$(H))))

support/acks.md

@@ -48,6 +48,11 @@ note sponsors may choose to remain anonymous.
 
 [Activision](https://activision.com/)
 
+<<<<<<< HEAD
+=======
+[CarGurus](https://cargurus.com/)
+
+>>>>>>> 7e79f7d (Convert all support/*.html to .md)
 [VeriSign, Inc.](https://www.verisign.com/)
 
 </div>
@@ -58,9 +63,15 @@ note sponsors may choose to remain anonymous.
 
 [beslist.nl](https://beslist.nl/)
 
+<<<<<<< HEAD
 [Mercedes-Benz AG](https://opensource.mercedes-benz.com/)
 
 [SAKURA internet Inc](https://www.sakura.ad.jp/en/corporate/)
+=======
+[Jameson Lopp](https://www.lopp.net/)
+
+[Mercedes-Benz AG](https://opensource.mercedes-benz.com/)
+>>>>>>> 7e79f7d (Convert all support/*.html to .md)
 
 </div>