summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchiatchiat <chiatchiat@gmail.com>2023-04-01 21:02:09 +0800
committerGitHub <noreply@github.com>2023-04-01 21:02:09 +0800
commit35d341b30074436ce6aa9b5c22468ee23ec92cf6 (patch)
treec5e116be29797c7c3e283cd6c6ceb7763c477e71
parent556cd32114f84a378488b381a65ed3ae1beda8a4 (diff)
parent1f2366fb56663b9e8e480b9cba299ff201cba4da (diff)
downloadcherrypy-git-35d341b30074436ce6aa9b5c22468ee23ec92cf6.tar.gz
Merge branch 'cherrypy:main' into utc-time-in-LazyRfc3339UtcTime
-rw-r--r--.github/ISSUE_TEMPLATE.md2
-rw-r--r--docs/index.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index ee3e4b86..af86b79f 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
<!--
**** DELETE THIS BLOCK ****
-Thanks for filing an issue! Please keep keep issues limited to bug reports,
+Thanks for filing an issue! Please keep issues limited to bug reports,
feature requests, and other general issues. For support questions, please feel
free to reach out on stackoverflow:
https://stackoverflow.com/questions/tagged/cherrypy
diff --git a/docs/index.rst b/docs/index.rst
index 6914a8dd..15834b7e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -32,7 +32,7 @@ CherryPy allows developers to build web applications in much the
same way they would build any other object-oriented Python program.
This results in smaller source code developed in less time.
-CherryPy is now more than ten years old and it is has proven to
+CherryPy is now more than ten years old, and it has proven to
be fast and reliable. It is being used in production by many
sites, from the simplest to the most demanding.