Rename about-filter to render-filter

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/cgit.c b/cgit.c
index e2d789101f302a6ad4b580146e1615968a7a91e9..2ef1b7131266f6dbe37690376a1552bb5e90ddd4 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -96,7 +96,7 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
        else if (!strcmp(name, "ignore"))
                repo->ignore = atoi(value);
        else if (ctx.cfg.enable_filter_overrides) {
-               if (!strcmp(name, "about-filter"))
+               if (!strcmp(name, "render-filter"))
                        repo->about_filter = cgit_new_filter(value, ABOUT);
                else if (!strcmp(name, "commit-filter"))
                        repo->commit_filter = cgit_new_filter(value, COMMIT);
@@ -205,7 +205,7 @@ static void config_cb(const char *name, const char *value)
                ctx.cfg.cache_snapshot_ttl = atoi(value);
        else if (!strcmp(name, "case-sensitive-sort"))
                ctx.cfg.case_sensitive_sort = atoi(value);
-       else if (!strcmp(name, "about-filter"))
+       else if (!strcmp(name, "render-filter"))
                ctx.cfg.about_filter = cgit_new_filter(value, ABOUT);
        else if (!strcmp(name, "commit-filter"))
                ctx.cfg.commit_filter = cgit_new_filter(value, COMMIT);
@@ -816,7 +816,7 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
        fprintf(f, "repo.enable-log-linecount=%d\n",
                repo->enable_log_linecount);
        if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter)
-               cgit_fprintf_filter(repo->about_filter, f, "repo.about-filter=");
+               cgit_fprintf_filter(repo->about_filter, f, "repo.render-filter=");
        if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter)
                cgit_fprintf_filter(repo->commit_filter, f, "repo.commit-filter=");
        if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter)

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 6b4efa267a8be44d497c5ec2c115ab597fa5f018..f7924fa1870831b19083428c6e3834dc0905300f 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -26,7 +26,7 @@ defined, use its value instead.
 
 GLOBAL SETTINGS
 ---------------
-about-filter::
+render-filter::
        Specifies a command which will be invoked to format the content of
        about pages (both top-level and for each repository). The command will
        get the content of the about-file on its STDIN, the name of the file
@@ -449,8 +449,8 @@ virtual-root::
 
 REPOSITORY SETTINGS
 -------------------
-repo.about-filter::
-       Override the default about-filter. Default value: none. See also:
+repo.render-filter::
+       Override the default render-filter. Default value: none. See also:
        "enable-filter-overrides". See also: "FILTER API".
 
 repo.branch-sort::
@@ -877,7 +877,7 @@ source-filter=/var/www/cgit/filters/syntax-highlighting.py
 
 # Format markdown, restructuredtext, manpages, text files, and html files
 # through the right converters
-about-filter=/var/www/cgit/filters/about-formatting.sh
+render-filter=/var/www/cgit/filters/about-formatting.sh
 
 ##
 ## Search for these files in the root of the default branch of repositories

diff --git a/filters/about-formatting.sh b/filters/render-formatting.sh
similarity index 92%
rename from filters/about-formatting.sh
rename to filters/render-formatting.sh
index 85daf9c26b077ffd2f6bdc879f493a3332428162..a22345206bc33c8f547518c93c0403f6791f0532 100755 (executable)
--- a/filters/about-formatting.sh
+++ b/filters/render-formatting.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# This may be used with the about-filter or repo.about-filter setting in cgitrc.
+# This may be used with the render-filter or repo.render-filter setting in cgitrc.
 # It passes formatting of about pages to differing programs, depending on the usage.
 
 # Markdown support requires python and markdown-python.

diff --git a/tests/setup.sh b/tests/setup.sh
index 7590f04944116e00b8d4728333bf9caa043b6d18..1f3c0b4579a38daa6afa8c7c291f786231fec1f0 100755 (executable)
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -134,7 +134,7 @@ repo.desc=spaced repo
 repo.url=filter-exec
 repo.path=$PWD/repos/filter/.git
 repo.desc=filtered repo
-repo.about-filter=exec:$FILTER_DIRECTORY/dump.sh
+repo.render-filter=exec:$FILTER_DIRECTORY/dump.sh
 repo.commit-filter=exec:$FILTER_DIRECTORY/dump.sh
 repo.email-filter=exec:$FILTER_DIRECTORY/dump.sh
 repo.source-filter=exec:$FILTER_DIRECTORY/dump.sh
@@ -146,7 +146,7 @@ EOF
 repo.url=filter-lua
 repo.path=$PWD/repos/filter/.git
 repo.desc=filtered repo
-repo.about-filter=lua:$FILTER_DIRECTORY/dump.lua
+repo.render-filter=lua:$FILTER_DIRECTORY/dump.lua
 repo.commit-filter=lua:$FILTER_DIRECTORY/dump.lua
 repo.email-filter=lua:$FILTER_DIRECTORY/dump.lua
 repo.source-filter=lua:$FILTER_DIRECTORY/dump.lua

diff --git a/ui-summary.c b/ui-summary.c
index 8e81ac4e7961558a63ba20ecad55d2e098c3e815..d643c9dd2560dae50b30f053bdb628b7a7a33bba 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -129,7 +129,7 @@ void cgit_print_repo_readme(char *path)
        }
 
        /* Print the calculated readme, either from the git repo or from the
-        * filesystem, while applying the about-filter.
+        * filesystem, while applying the render-filter.
         */
        html("<div id='summary'>");
        cgit_open_filter(ctx.repo->about_filter, filename);