Fossil SCM
Correct use of plural, remove some spaces/tabs at the end of lines.
Commit
3e18dbefd0d6d2beedf3f2dc14d78f12944d9218
Parent
2eda90a5dedf50c…
1 file changed
+6
-6
+6
-6
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -1317,11 +1317,11 @@ | ||
| 1317 | 1317 | text_diff(&c1, &c2, pOut, pRe, diffFlags); |
| 1318 | 1318 | blob_reset(&c1); |
| 1319 | 1319 | blob_reset(&c2); |
| 1320 | 1320 | return; |
| 1321 | 1321 | } |
| 1322 | - | |
| 1322 | + | |
| 1323 | 1323 | sideBySide = !is_false(PD("sbs","1")); |
| 1324 | 1324 | zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1); |
| 1325 | 1325 | zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2); |
| 1326 | 1326 | diffFlags = construct_diff_flags(1, sideBySide) | DIFF_HTML; |
| 1327 | 1327 | |
| @@ -1667,12 +1667,12 @@ | ||
| 1667 | 1667 | content_get(rid, &content); |
| 1668 | 1668 | if( renderAsWiki ){ |
| 1669 | 1669 | wiki_convert(&content, 0, 0); |
| 1670 | 1670 | }else if( renderAsHtml ){ |
| 1671 | 1671 | @ <iframe src="%R/raw/%T(blob_str(&downloadName))?name=%s(zUuid)" |
| 1672 | - @ width="100%%" frameborder="0" marginwidth="0" marginheight="0" | |
| 1673 | - @ sandbox="allow-same-origin" | |
| 1672 | + @ width="100%%" frameborder="0" marginwidth="0" marginheight="0" | |
| 1673 | + @ sandbox="allow-same-origin" | |
| 1674 | 1674 | @ onload="this.height = this.contentDocument.documentElement.scrollHeight;"> |
| 1675 | 1675 | @ </iframe> |
| 1676 | 1676 | }else{ |
| 1677 | 1677 | style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid); |
| 1678 | 1678 | zMime = mimetype_from_content(&content); |
| @@ -2337,13 +2337,13 @@ | ||
| 2337 | 2337 | @ </td></tr> |
| 2338 | 2338 | }else if( zBranchName ){ |
| 2339 | 2339 | @ <tr><th align="right" valign="top">Branch Closure:</th> |
| 2340 | 2340 | @ <td valign="top"> |
| 2341 | 2341 | @ <label><input type="checkbox" name="close"%s(zCloseFlag) /> |
| 2342 | - @ Mark branch <span style="font-weight:bold" id="cbranch">%h(zBranchName)</span> | |
| 2343 | - @ as "closed" so that its leaf no longer appears on the "leaves" page | |
| 2344 | - @ and is no longer labeled as a "<b>Leaf</b>"</label> | |
| 2342 | + @ Mark branch <b>%s(zBranchName)</b> as "closed" so that its leafs | |
| 2343 | + @ no longer appear on the "leaves" page and are no longer labeled | |
| 2344 | + @ as a leaf "<b>Leaf</b>"</label> | |
| 2345 | 2345 | @ </td></tr> |
| 2346 | 2346 | } |
| 2347 | 2347 | } |
| 2348 | 2348 | if(zBranchName) fossil_free(zBranchName); |
| 2349 | 2349 | |
| 2350 | 2350 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1317,11 +1317,11 @@ | |
| 1317 | text_diff(&c1, &c2, pOut, pRe, diffFlags); |
| 1318 | blob_reset(&c1); |
| 1319 | blob_reset(&c2); |
| 1320 | return; |
| 1321 | } |
| 1322 | |
| 1323 | sideBySide = !is_false(PD("sbs","1")); |
| 1324 | zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1); |
| 1325 | zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2); |
| 1326 | diffFlags = construct_diff_flags(1, sideBySide) | DIFF_HTML; |
| 1327 | |
| @@ -1667,12 +1667,12 @@ | |
| 1667 | content_get(rid, &content); |
| 1668 | if( renderAsWiki ){ |
| 1669 | wiki_convert(&content, 0, 0); |
| 1670 | }else if( renderAsHtml ){ |
| 1671 | @ <iframe src="%R/raw/%T(blob_str(&downloadName))?name=%s(zUuid)" |
| 1672 | @ width="100%%" frameborder="0" marginwidth="0" marginheight="0" |
| 1673 | @ sandbox="allow-same-origin" |
| 1674 | @ onload="this.height = this.contentDocument.documentElement.scrollHeight;"> |
| 1675 | @ </iframe> |
| 1676 | }else{ |
| 1677 | style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid); |
| 1678 | zMime = mimetype_from_content(&content); |
| @@ -2337,13 +2337,13 @@ | |
| 2337 | @ </td></tr> |
| 2338 | }else if( zBranchName ){ |
| 2339 | @ <tr><th align="right" valign="top">Branch Closure:</th> |
| 2340 | @ <td valign="top"> |
| 2341 | @ <label><input type="checkbox" name="close"%s(zCloseFlag) /> |
| 2342 | @ Mark branch <span style="font-weight:bold" id="cbranch">%h(zBranchName)</span> |
| 2343 | @ as "closed" so that its leaf no longer appears on the "leaves" page |
| 2344 | @ and is no longer labeled as a "<b>Leaf</b>"</label> |
| 2345 | @ </td></tr> |
| 2346 | } |
| 2347 | } |
| 2348 | if(zBranchName) fossil_free(zBranchName); |
| 2349 | |
| 2350 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1317,11 +1317,11 @@ | |
| 1317 | text_diff(&c1, &c2, pOut, pRe, diffFlags); |
| 1318 | blob_reset(&c1); |
| 1319 | blob_reset(&c2); |
| 1320 | return; |
| 1321 | } |
| 1322 | |
| 1323 | sideBySide = !is_false(PD("sbs","1")); |
| 1324 | zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1); |
| 1325 | zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2); |
| 1326 | diffFlags = construct_diff_flags(1, sideBySide) | DIFF_HTML; |
| 1327 | |
| @@ -1667,12 +1667,12 @@ | |
| 1667 | content_get(rid, &content); |
| 1668 | if( renderAsWiki ){ |
| 1669 | wiki_convert(&content, 0, 0); |
| 1670 | }else if( renderAsHtml ){ |
| 1671 | @ <iframe src="%R/raw/%T(blob_str(&downloadName))?name=%s(zUuid)" |
| 1672 | @ width="100%%" frameborder="0" marginwidth="0" marginheight="0" |
| 1673 | @ sandbox="allow-same-origin" |
| 1674 | @ onload="this.height = this.contentDocument.documentElement.scrollHeight;"> |
| 1675 | @ </iframe> |
| 1676 | }else{ |
| 1677 | style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid); |
| 1678 | zMime = mimetype_from_content(&content); |
| @@ -2337,13 +2337,13 @@ | |
| 2337 | @ </td></tr> |
| 2338 | }else if( zBranchName ){ |
| 2339 | @ <tr><th align="right" valign="top">Branch Closure:</th> |
| 2340 | @ <td valign="top"> |
| 2341 | @ <label><input type="checkbox" name="close"%s(zCloseFlag) /> |
| 2342 | @ Mark branch <b>%s(zBranchName)</b> as "closed" so that its leafs |
| 2343 | @ no longer appear on the "leaves" page and are no longer labeled |
| 2344 | @ as a leaf "<b>Leaf</b>"</label> |
| 2345 | @ </td></tr> |
| 2346 | } |
| 2347 | } |
| 2348 | if(zBranchName) fossil_free(zBranchName); |
| 2349 | |
| 2350 |