| | [ Return to Bugs & Features | Roadmap 1.1 | SVN ⇄ GIT ]
STR #1606
| Application: | FLTK Library |
|---|
| Status: | 1 - Closed w/Resolution |
|---|
| Priority: | 2 - Low, e.g. a documentation error or undocumented side-effect |
|---|
| Scope: | 3 - Applies to all machines and operating systems |
|---|
| Subsystem: | Documentation |
|---|
| Summary: | fl_cursor HTML glitch |
|---|
| Version: | 1.1-current |
|---|
| Created By: | wilson.afn |
|---|
| Assigned To: | matt |
|---|
| Fix Version: | None |
|---|
| Update Notification: | |
|---|
Trouble Report Files:
No files
Trouble Report Comments:
| |
| #1 | wilson.afn
06:43 Feb 16, 2007 |
| In rev 5697, some bogus HTML seems to have infested:
documentation/functions.html#fl_cursor
It has not seemed to affect the website version:
http://fltk.org/doc-1.1/functions.html#fl_cursor | |
| |
| #2 | matt
06:07 Feb 18, 2007 |
| Please be more specific. What does the wrong text say? Or is it an HTML code issue? Where exactly? Maybe you could give me a line numeber or some copied and pasted text? | |
| |
| #3 | wilson.afn
08:31 Feb 18, 2007 |
| Matt,
Here's what I see in FFx under "Description:"
Sets the cursor for the current window to the specified shape and colors. The cursors are defined in the <<<<<<< .mine HREF="enumerations.html#cursor"><FL/Enumerations.H> ======= HREF="enumerations.html#cursor"><FL/Enumerations.H> >>>>>>> .r5185 header file. | |
| |
| #4 | greg.ercolano
08:57 Feb 18, 2007 |
| Hmm, unless matt sees the problem, I don't see a problem myself. Also, your paste showing differences seems to show equivalence between the two pastes. (Maybe the web interface to the STR is mangling your post)
When I diff the Description section between the latest 1.1.x-svn and the html on the website, the only difference I see (ignoring whitespace and caps differences) is that the website version's HREF url has the full http: path in the link, which should be fine. eg:
WEB: href="http://fltk.org/doc-1.1/enumerations.html#cursor"
SVN: HREF="enumerations.html#cursor"
Each seems right, and both website and online docs seem to resolve their links correctly.
I guess if you have something weird in your 1.1.x checkout, try renaming away the functions.html, and re-check it out with 'svn update functions.html', just in case the last time you did an update, it created a merge file, and didn't apply a proper update. | |
| |
| #5 | matt
09:29 Feb 18, 2007 |
| What you see is a "conflict" between your local version of FLTK and the version that you checked out from the SVN repository. I did check my version of the repository and it seems fine.
The difference between those two texts is probably only a space or a newline.
You can fix this on your machine by deleting the file and then running another "svn update". | |
| |
| #6 | wilson.afn
09:32 Feb 18, 2007 |
| Although I didn't understand a word of Greg's reasoning, I deleted functions.html and "svn update", and *poof*, the bogus HTML is no more. So what ever he said must be right. I wish I understood these computer gizmos. Close out this STR, please. | |
[ Return to Bugs & Features ]
|
| |
