[web] master update

[Richard Levitte]

The branch master has been updated
       via  abbb2d45bbd7db0f8733a2ca997300b572d19061 (commit)
      from  a12160447e27f7fd9dd1d84441d527de2545a4a8 (commit)


- Log -----------------------------------------------------------------
commit abbb2d45bbd7db0f8733a2ca997300b572d19061
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 11 16:27:33 2021 +0100

    Complete the transition changelog.txt -> changelog.md
    
    Almost a year ago, in 4b0220368e888aab29972537aff8602a45b724e9, changelog.txt
    was renamed to changelog.md.  It seems, however, that we didn't make that
    change complete.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/web/pull/224)

-----------------------------------------------------------------------

Summary of changes:
 .gitignore             | 2 +-
 Makefile               | 2 +-
 news/changelog.html.tt | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 83f4641..e2cf52a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@ docs/fips.inc
 docs/man*/
 news/changelog.html
 news/changelog.inc
-news/changelog.txt
+news/changelog.md
 news/cl*.txt
 news/newsflash.inc
 news/openssl-*-notes.html
diff --git a/Makefile b/Makefile
index 4b1bd1f..741be51 100644
--- a/Makefile
+++ b/Makefile
@@ -218,7 +218,7 @@ news/$(1): $(CHECKOUTS)/$(2)
 	cp $$? $$@
 endef
 
-# Create the target 'news/changelog.txt', taking the source from
+# Create the target 'news/changelog.md', taking the source from
 # $(CHECKOUTS)/openssl/CHANGES.md
 $(eval $(call mknews_changelogtxt,changelog.md,openssl/CHANGES.md))
 
diff --git a/news/changelog.html.tt b/news/changelog.html.tt
index 95097b7..2b7a510 100644
--- a/news/changelog.html.tt
+++ b/news/changelog.html.tt
@@ -22,8 +22,8 @@
             <p>
             This is the changelog for the master branch, the one that is
             currently in active development.
-	    The plain-text version of this document is available
-	    here: <a href="changelog.txt">changelog.txt</a>
+	    The plain-text / markdown version of this document is available
+	    here: <a href="changelog.md">changelog.md</a>
             </p>
 	    </p>
             For other branches, the changelogs are distributed with