Fossil SCM
add tickets in the text for the setup page for the wiki-about setting
Commit
f8c13b59b7715beeee0df79991a80af22703a0e84faba5a5dfaeea2dda4ff884
Parent
3a7ad73413b849c…
1 file changed
+8
-7
+8
-7
| --- src/setup.c | ||
| +++ src/setup.c | ||
| @@ -183,11 +183,11 @@ | ||
| 183 | 183 | |
| 184 | 184 | |
| 185 | 185 | /* |
| 186 | 186 | ** WEBPAGE: setup-logmenu |
| 187 | 187 | ** |
| 188 | -** Show a menu of available log renderings accessible to an administrator, | |
| 188 | +** Show a menu of available log renderings accessible to an administrator, | |
| 189 | 189 | ** together with a succinct explanation of each. |
| 190 | 190 | ** |
| 191 | 191 | ** This page is only accessible by administrators. |
| 192 | 192 | */ |
| 193 | 193 | void setup_logmenu_page(void){ |
| @@ -916,11 +916,11 @@ | ||
| 916 | 916 | @ of project-name. This description can be edited in the second entry |
| 917 | 917 | @ box on the <a href="./setup_config">Setup/Configuration page</a>. |
| 918 | 918 | @ |
| 919 | 919 | @ <li><p><b>project-name</b> → |
| 920 | 920 | @ The human-readable name for the project. The project-name can be |
| 921 | - @ modified in the first entry on the | |
| 921 | + @ modified in the first entry on the | |
| 922 | 922 | @ <a href="./setup_config">Setup/Configuration page</a>. |
| 923 | 923 | @ |
| 924 | 924 | @ <li><p><b>peer-repo-<i>CODE</i></b> → |
| 925 | 925 | @ <i>CODE</i> is 16-character prefix of the project-code for another |
| 926 | 926 | @ repository that is part of the same login-group. The value is the |
| @@ -1392,21 +1392,22 @@ | ||
| 1392 | 1392 | db_begin_transaction(); |
| 1393 | 1393 | @ <form action="%R/setup_wiki" method="post"><div> |
| 1394 | 1394 | login_insert_csrf_secret(); |
| 1395 | 1395 | @ <input type="submit" name="submit" value="Apply Changes"></p> |
| 1396 | 1396 | @ <hr> |
| 1397 | - onoff_attribute("Associate Wiki Pages With Branches, Tags, or Checkins", | |
| 1397 | + onoff_attribute("Associate Wiki Pages With Branches, Tags, Tickets, or Checkins", | |
| 1398 | 1398 | "wiki-about", "wiki-about", 1, 0); |
| 1399 | 1399 | @ <p> |
| 1400 | - @ Associate wiki pages with branches, tags, or checkins, based on | |
| 1401 | - @ the wiki page name. Wiki pages that begin with "branch/", "checkin/" | |
| 1402 | - @ or "tag/" and which continue with the name of an existing branch, check-in | |
| 1403 | - @ or tag are treated specially when this feature is enabled. | |
| 1400 | + @ Associate wiki pages with branches, tags, tickets, or checkins, based on | |
| 1401 | + @ the wiki page name. Wiki pages that begin with "branch/", "checkin/", | |
| 1402 | + @ "tag/" or "ticket" and which continue with the name of an existing branch, | |
| 1403 | + @ check-in, tag or ticket are treated specially when this feature is enabled. | |
| 1404 | 1404 | @ <ul> |
| 1405 | 1405 | @ <li> <b>branch/</b><i>branch-name</i> |
| 1406 | 1406 | @ <li> <b>checkin/</b><i>full-check-in-hash</i> |
| 1407 | 1407 | @ <li> <b>tag/</b><i>tag-name</i> |
| 1408 | + @ <li> <b>ticket/</b><i>full-ticket-hash</i> | |
| 1408 | 1409 | @ </ul> |
| 1409 | 1410 | @ (Property: "wiki-about")</p> |
| 1410 | 1411 | @ <hr> |
| 1411 | 1412 | entry_attribute("Allow Unsafe HTML In Markdown", 6, |
| 1412 | 1413 | "safe-html", "safe-html", "", 0); |
| 1413 | 1414 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -183,11 +183,11 @@ | |
| 183 | |
| 184 | |
| 185 | /* |
| 186 | ** WEBPAGE: setup-logmenu |
| 187 | ** |
| 188 | ** Show a menu of available log renderings accessible to an administrator, |
| 189 | ** together with a succinct explanation of each. |
| 190 | ** |
| 191 | ** This page is only accessible by administrators. |
| 192 | */ |
| 193 | void setup_logmenu_page(void){ |
| @@ -916,11 +916,11 @@ | |
| 916 | @ of project-name. This description can be edited in the second entry |
| 917 | @ box on the <a href="./setup_config">Setup/Configuration page</a>. |
| 918 | @ |
| 919 | @ <li><p><b>project-name</b> → |
| 920 | @ The human-readable name for the project. The project-name can be |
| 921 | @ modified in the first entry on the |
| 922 | @ <a href="./setup_config">Setup/Configuration page</a>. |
| 923 | @ |
| 924 | @ <li><p><b>peer-repo-<i>CODE</i></b> → |
| 925 | @ <i>CODE</i> is 16-character prefix of the project-code for another |
| 926 | @ repository that is part of the same login-group. The value is the |
| @@ -1392,21 +1392,22 @@ | |
| 1392 | db_begin_transaction(); |
| 1393 | @ <form action="%R/setup_wiki" method="post"><div> |
| 1394 | login_insert_csrf_secret(); |
| 1395 | @ <input type="submit" name="submit" value="Apply Changes"></p> |
| 1396 | @ <hr> |
| 1397 | onoff_attribute("Associate Wiki Pages With Branches, Tags, or Checkins", |
| 1398 | "wiki-about", "wiki-about", 1, 0); |
| 1399 | @ <p> |
| 1400 | @ Associate wiki pages with branches, tags, or checkins, based on |
| 1401 | @ the wiki page name. Wiki pages that begin with "branch/", "checkin/" |
| 1402 | @ or "tag/" and which continue with the name of an existing branch, check-in |
| 1403 | @ or tag are treated specially when this feature is enabled. |
| 1404 | @ <ul> |
| 1405 | @ <li> <b>branch/</b><i>branch-name</i> |
| 1406 | @ <li> <b>checkin/</b><i>full-check-in-hash</i> |
| 1407 | @ <li> <b>tag/</b><i>tag-name</i> |
| 1408 | @ </ul> |
| 1409 | @ (Property: "wiki-about")</p> |
| 1410 | @ <hr> |
| 1411 | entry_attribute("Allow Unsafe HTML In Markdown", 6, |
| 1412 | "safe-html", "safe-html", "", 0); |
| 1413 |
| --- src/setup.c | |
| +++ src/setup.c | |
| @@ -183,11 +183,11 @@ | |
| 183 | |
| 184 | |
| 185 | /* |
| 186 | ** WEBPAGE: setup-logmenu |
| 187 | ** |
| 188 | ** Show a menu of available log renderings accessible to an administrator, |
| 189 | ** together with a succinct explanation of each. |
| 190 | ** |
| 191 | ** This page is only accessible by administrators. |
| 192 | */ |
| 193 | void setup_logmenu_page(void){ |
| @@ -916,11 +916,11 @@ | |
| 916 | @ of project-name. This description can be edited in the second entry |
| 917 | @ box on the <a href="./setup_config">Setup/Configuration page</a>. |
| 918 | @ |
| 919 | @ <li><p><b>project-name</b> → |
| 920 | @ The human-readable name for the project. The project-name can be |
| 921 | @ modified in the first entry on the |
| 922 | @ <a href="./setup_config">Setup/Configuration page</a>. |
| 923 | @ |
| 924 | @ <li><p><b>peer-repo-<i>CODE</i></b> → |
| 925 | @ <i>CODE</i> is 16-character prefix of the project-code for another |
| 926 | @ repository that is part of the same login-group. The value is the |
| @@ -1392,21 +1392,22 @@ | |
| 1392 | db_begin_transaction(); |
| 1393 | @ <form action="%R/setup_wiki" method="post"><div> |
| 1394 | login_insert_csrf_secret(); |
| 1395 | @ <input type="submit" name="submit" value="Apply Changes"></p> |
| 1396 | @ <hr> |
| 1397 | onoff_attribute("Associate Wiki Pages With Branches, Tags, Tickets, or Checkins", |
| 1398 | "wiki-about", "wiki-about", 1, 0); |
| 1399 | @ <p> |
| 1400 | @ Associate wiki pages with branches, tags, tickets, or checkins, based on |
| 1401 | @ the wiki page name. Wiki pages that begin with "branch/", "checkin/", |
| 1402 | @ "tag/" or "ticket" and which continue with the name of an existing branch, |
| 1403 | @ check-in, tag or ticket are treated specially when this feature is enabled. |
| 1404 | @ <ul> |
| 1405 | @ <li> <b>branch/</b><i>branch-name</i> |
| 1406 | @ <li> <b>checkin/</b><i>full-check-in-hash</i> |
| 1407 | @ <li> <b>tag/</b><i>tag-name</i> |
| 1408 | @ <li> <b>ticket/</b><i>full-ticket-hash</i> |
| 1409 | @ </ul> |
| 1410 | @ (Property: "wiki-about")</p> |
| 1411 | @ <hr> |
| 1412 | entry_attribute("Allow Unsafe HTML In Markdown", 6, |
| 1413 | "safe-html", "safe-html", "", 0); |
| 1414 |