Merge branch 'main' into fix-19897

Author: balanceofcowards

Makefile

@@ -243,7 +243,7 @@ clean:
 .PHONY: fmt
 fmt:
 	@MISSPELL_PACKAGE=$(MISSPELL_PACKAGE) GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
-	$(eval TEMPLATES := $(wildcard templates/**/*.tmpl))
+	$(eval TEMPLATES := $(shell find templates -type f -name '*.tmpl'))
 	@# strip whitespace after '{{' and before `}}` unless there is only whitespace before it 
 	@$(SED_INPLACE) -e 's/{{[ 	]\{1,\}/{{/g' -e '/^[ 	]\{1,\}}}/! s/[ 	]\{1,\}}}/}}/g' $(TEMPLATES)
 

docs/content/doc/installation/on-kubernetes.zh-cn.md

@@ -30,8 +30,8 @@ helm install gitea gitea/gitea
 您也可以通过 `helm show` 命令导出 `README.md` 和配置文件 `values.yaml` 进行学习和编辑，例如：
 
 ```bash
-helm show values gitea > values.yaml
-helm show readme gitea > README.md
+helm show values gitea/gitea > values.yaml
+helm show readme gitea/gitea > README.md
 
 # 使用自定义的配置文件 values.yaml
 helm install gitea -f values.yaml gitea/gitea