pr feedback answered

- use the actual page URL
- tighten the wording

Author: nedbat

Doc/improvepage.rst Doc/improve-page.rstDoc/improvepage.rst renamed to Doc/improve-page.rst

@@ -20,20 +20,20 @@ Improve a documentation page
          });
       </script>
 
-We are always interested to hear about ways to improve the documentation.
+We are always interested to hear ideas about improvements to the documentation.
 
 You were reading "PAGETITLE" at `<PAGEURL>`_.  The source for that page is on
 `GitHub <https://github.com/python/cpython/blob/main/Doc/PAGESOURCE?plain=1>`_.
 
-You have a few options for asking questions or suggesting changes:
+You have a few ways to ask questions or suggest changes:
 
 - You can start a discussion about the page on the Python discussion forum.
   This link will start a pre-populated topic:
-  `Question about "PAGETITLE" <https://discuss.python.org/new-topic?category=documentation&title=Question+about+%22PAGETITLE%22&body=About+the+page+at+PAGEURL%3A>`_.
+  `Question about page "PAGETITLE" <https://discuss.python.org/new-topic?category=documentation&title=Question+about+page+%22PAGETITLE%22&body=About+the+page+at+PAGEURL%3A>`_.
 
 - You can open an issue on the Python GitHub issue tracker. This link will
-  create a new issue pre-populated with some information for you:
-  `Docs: problem with "PAGETITLE" <https://github.com/python/cpython/issues/new?title=Docs%3A+problem+with+%22PAGETITLE%22&labels=docs&body=The+page+at+PAGEURL+has+a+problem%3A>`_.
+  create a new pre-populated issue:
+  `Docs: problem with page "PAGETITLE" <https://github.com/python/cpython/issues/new?title=Docs%3A+problem+with+page+%22PAGETITLE%22&labels=docs&body=The+page+at+PAGEURL+has+a+problem%3A>`_.
 
 - You can `edit the page on GitHub <https://github.com/python/cpython/blob/main/Doc/PAGESOURCE?plain=1>`_
   to open a pull request and begin the contribution process.

Doc/tools/templates/customsourcelink.html

@@ -3,9 +3,11 @@
     document.addEventListener('DOMContentLoaded', () => {
         const title = document.querySelector('meta[property="og:title"]').content;
         const elements = document.querySelectorAll('.improvepage');
+        const pageurl = window.location.href.split('?')[0];
         elements.forEach(element => {
             const url = new URL(element.href);
             url.searchParams.set('pagetitle', title);
+            url.searchParams.set('pageurl', pageurl);
             element.href = url.toString();
         });
     });
@@ -14,7 +16,7 @@
     <h3>{{ _('This page') }}</h3>
     <ul class="this-page-menu">
       <li><a href="{{ pathto('bugs') }}">{% trans %}Report a bug{% endtrans %}</a></li>
-      <li><a class="improvepage" href="{{ pathto('improvepage') }}?pageurl=https://docs.python.org/3/{{ pagename }}.html&pagesource={{ sourcename|replace('.rst.txt', '.rst') }}">{% trans %}Improve this page{% endtrans %}</a></li>
+      <li><a class="improvepage" href="{{ pathto('improve-page') }}?pagesource={{ pagename }}.rst">{% trans %}Improve this page{% endtrans %}</a></li>
       <li>
         <a href="https://github.com/python/cpython/blob/main/Doc/{{ pagename }}.rst?plain=1"
             rel="nofollow">{{ _('Show source') }}