| Thread Previous • Date Previous • Date Next • Thread Next |
Philippe Lhoste пишет:
On 11/08/2009 13:37, Alexander Belchenko wrote: > h) Documentation format. I found CHM format is very nice, especially > because of Search feature. But it was mentioned it becomes obsolete.We need an official reference saying it is obsolete before dropping CHM... It is still a convenient format. At least for its search capabilities across various HTML files.Note: http://support.microsoft.com/kb/902225/Vista has some issues opening CHM files because of stupid application of security rules. There are workarounds and it might have been corrected.> HTML docs works just fine.Indeed, but I mentioned the problem of searching. I don't want to have a server running just to be able to search my doc.
New docs generated by Sphinx are include special javascript file to support offline searching even without special server. You can try it with new version of docs uploaded by Ian.
> * GUI merge tool? Which one? (I've tried WinMerge: it's not bad at > all, but QBzr currently have problems to use it from qconflicts)I vote against shipping a GUI merge tool. That's like shipping an editor for writing the commit message... And keeping it up to date might be problematic. User should be able to get its one, we can recommend a few choices too.
That's OK.
I don't even know if WinMerge can be used as a three-way merge tool (I think it cannot),
It can, but as 2-way actually. It works directly on the file with conflict markers and don't use THIS BASE OTHER files.
Run `winmergeu file.txt` for file.txt with conflicts.
I use Perforce Merge for that, an excellent free tool (although you must download the whole Perforce package to get it, I just made my own zip with it, but I doubt we can distribute it). I still use WinMerge as diff tool.
| Thread Previous • Date Previous • Date Next • Thread Next |
