Revert "Convert SSI includes to tt includes in community/"

This reverts commit d0d42d82433bc44a0199ee6f7bcea0759dc16bec.

Reviewed-by: Anton Arapov <anton@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/web/pull/429)

diff --git a/.gitignore b/.gitignore
index 29afe73f0e287a4f3c84fde0d37d6fc6cdc3c8eb..b49ce1c7863b37233c2ee3f1db7579cf5d486249 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,13 +5,9 @@ blog
 sitemap.txt
 ./*.html
 community/committers.inc
-community/committers.md
 community/omc-alumni.inc
-community/omc-alumni.md
 community/otc.inc
-community/otc.md
 community/omc.inc
-community/omc.md
 community/*.html
 docs/OpenSSL300Design.html
 docs/OpenSSLStrategicArchitecture.html

diff --git a/Makefile b/Makefile
index 1731b64a4d606ca4bd776e45f6d05b660919e877..c5c29d99f7b09c13b61dde10cfd53b749a5fd6ef 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -61,8 +61,7 @@ FUTURESERIES=
 # they have their own special handling.
 H_TOP = $(addsuffix .html,$(basename $(shell git ls-files -- *.md)))
 H_COMMUNITY = $(addsuffix .html,\
-                $(basename $(shell git ls-files -- community/*.md)) \
-                $(basename $(basename $(shell git ls-files -- community/*.md.tt))))
+                $(basename $(shell git ls-files -- community/*.md)))
 # We filter out any file starting with 'sub-'...  they get special treatment
 H_DOCS = $(addsuffix .html,\
            $(basename $(shell git ls-files -- docs/*.md \
@@ -88,6 +87,8 @@ H_SUPPORT = $(addsuffix .html,$(basename $(shell git ls-files -- support/*.md)))
 SIMPLE = $(H_TOP) \
         newsflash.inc \
         $(H_COMMUNITY) \
+        community/committers.inc community/otc.inc \
+        community/omc.inc community/omc-alumni.inc \
         news/changelog.html \
         $(foreach S,$(SERIES),news/openssl-$(S)-notes.inc) \
         $(foreach S,$(SERIES),news/openssl-$(S)-notes.html) \
@@ -388,16 +389,13 @@ community/committers.inc: $(PERSONDB) bin/mk-committers Makefile
        wget -q https://api.openssl.org/0/Group/commit/Members
        ./bin/mk-committers <Members >$@
        @rm -f Members
-community/committers.md: community/committers.inc
 
 community/otc.inc: $(PERSONDB) bin/mk-omc Makefile
        ./bin/mk-omc -n -p -t 'OTC Members' otc otc-inactive > $@
 community/omc.inc: $(PERSONDB) bin/mk-omc Makefile
        ./bin/mk-omc -n -e -l -p -t 'OMC Members' omc omc-inactive > $@
-community/omc.md: community/omc.inc
 community/omc-alumni.inc: $(PERSONDB) bin/mk-omc Makefile
        ./bin/mk-omc -n -l -t 'OMC Alumni' omc-alumni omc-emeritus > $@
-community/omc-alumni.md: community/omc-alumni.inc
 
 news/changelog.inc: news/changelog.txt bin/post-process-html5 Makefile
        @rm -f $@
@@ -585,9 +583,6 @@ source/old/index.md: source/old/index.md.tt Makefile bin/from-tt Makefile
        @rm -f $@
        ./bin/from-tt releases='$(SERIES) $(OLDSERIES2) fips' $<
 
-# Extra inc -> markdown dependencies
-
-
 # Extra HTML dependencies (apart from the markdown file it comes from)
 
 # makehtmldepend creates a standard dependency for HTML files rendered from

diff --git a/community/committers.md.tt b/community/committers.md
similarity index 90%
rename from community/committers.md.tt
rename to community/committers.md
index 72b8909e2455451c7957e8f78225497372e8bc4e..dea1e22f8ec2cd7e2a66605a240b727319fdfe53 100644 (file)
--- a/community/committers.md.tt
+++ b/community/committers.md
@@ -15,6 +15,6 @@ source tree, with appropriate code reviews.
   <td wdith="50%">Name</td>
   <td wdith="50%">GitHub ID</td>
 </tr>
-[% INCLUDE "committers.inc" %]
+<!--#include virtual="committers.inc" -->
 </table>
 </p>

diff --git a/community/dirdata.yaml b/community/dirdata.yaml
index 40e5d3dd675525eead7dc99b1364ca8a0d51ad1f..dc8a7d126ecf8681751a7f33bab8ce362023c100 100644 (file)
--- a/community/dirdata.yaml
+++ b/community/dirdata.yaml
@@ -1,19 +1,21 @@
 ---
-breadcrumbs: >-
-  [Home](/) : [Community](.)
-sidebar: |
-  # [Community](.)
+breadcrumbs:
+  - |
+    [Home](/) : [Community](.)
+sidebar:
+  - |
+    # [Community](.)
 
-  -   [Our Mission and Values](mission.html)
-  -   [List of Committers](committers.html)
-  -   [OpenSSL Technical Committee](otc.html)
-  -   [OpenSSL Management Committee](omc.html)
-  -   [Code of Conduct](conduct.html)
-  -   [Contact Information](contacts.html)
-  -   [Getting Started as a Contributor](getting-started.html)
-  -   [Mailing Lists](mailinglists.html)
-  -   [Wiki](https://wiki.openssl.org)
-  -   [Blog](/blog)
-  -   [Binaries and Engines](binaries.html)
-  -   [Thanks!](thanks.html)
+    -   [Our Mission and Values](mission.html)
+    -   [List of Committers](committers.html)
+    -   [OpenSSL Technical Committee](otc.html)
+    -   [OpenSSL Management Committee](omc.html)
+    -   [Code of Conduct](conduct.html)
+    -   [Contact Information](contacts.html)
+    -   [Getting Started as a Contributor](getting-started.html)
+    -   [Mailing Lists](mailinglists.html)
+    -   [Wiki](https://wiki.openssl.org)
+    -   [Blog](/blog)
+    -   [Binaries and Engines](binaries.html)
+    -   [Thanks!](thanks.html)
 ---

diff --git a/community/omc-alumni.md.tt b/community/omc-alumni.md
similarity index 86%
rename from community/omc-alumni.md.tt
rename to community/omc-alumni.md
index 3f09590f25c640224fb16b3690a33ec2f5c6364d..a05ab033e380994071e05452593e475ea0ee0f68 100644 (file)
--- a/community/omc-alumni.md.tt
+++ b/community/omc-alumni.md
@@ -7,6 +7,6 @@ We gratefully acknowledge the contributions of the following alumni (who
 were previously in the OMC, or a team member or founder prior to
 creation of the OMC):
 
-<p>[% INCLUDE "omc-alumni.inc" %]</p>
+<p><!--#include virtual="omc-alumni.inc" --></p>
 
 We also respectfully remember Ulf Möller who is no longer with us.

diff --git a/community/omc.md.tt b/community/omc.md
similarity index 91%
rename from community/omc.md.tt
rename to community/omc.md
index 0dfb630a5e03be596b55730f1ce1d78cef015364..1f88b92094edb2ba13f2ca87826def86180749b3 100644 (file)
--- a/community/omc.md.tt
+++ b/community/omc.md
@@ -9,7 +9,7 @@ are taken on the basis of a vote.
 
 The current OMC consists of (in alphabetical order):
 
-<p>[% INCLUDE "omc.inc" %]</p>
+<p><!--#include virtual="omc.inc" --></p>
 
 Names with an (I) are currently inactive as defined in our
 [bylaws](/policies/omc-bylaws.html).

diff --git a/community/otc.md.tt b/community/otc.md.tt
index 8502c01723e7f3b4e9b7a5195ba7a8a0582883c6..408a6706c480d6b84683d4abb8898abd8a911b92 100644 (file)
--- a/community/otc.md.tt
+++ b/community/otc.md.tt
@@ -9,7 +9,7 @@ the basis of a vote.
 
 The current OTC consists of (in alphabetical order):
 
-<p>[% INCLUDE "otc.inc" %]</p>
+<p><!--#include virtual="otc.inc" --></p>
 
 Names with an (I) are currently inactive as defined in our
 [bylaws](/policies/omc-bylaws.html).