From ea1867f48efbab8dd3349fa653ba1d6cb271c8dd Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sat, 14 Sep 2019 17:26:35 +0000 Subject: Merge branch 'config-changes' into 'develop' two separate files for config.md and generated config.md See merge request pleroma/pleroma!1666 (cherry picked from commit 9c64a25713790fefa8b5c419aeadf55113c17073) 69faec03 markdown generation to the new file c625fe6f config.md back 4da0da9a don't track generated_config.md --- lib/pleroma/docs/markdown.ex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/pleroma/docs/markdown.ex b/lib/pleroma/docs/markdown.ex index 24930cc9f..8386dc2fb 100644 --- a/lib/pleroma/docs/markdown.ex +++ b/lib/pleroma/docs/markdown.ex @@ -3,9 +3,9 @@ defmodule Pleroma.Docs.Markdown do @spec process(keyword()) :: {:ok, String.t()} def process(descriptions) do - config_path = "docs/config.md" + config_path = "docs/generated_config.md" {:ok, file} = File.open(config_path, [:utf8, :write]) - IO.write(file, "# Configuration\n") + IO.write(file, "# Generated configuration\n") IO.write(file, "Date of generation: #{Date.utc_today()}\n\n") IO.write( -- cgit v1.2.3