From: Tim Gerundt Date: Wed, 20 Mar 2019 20:27:50 +0000 (+0100) Subject: Manual: Fix some links X-Git-Tag: 2.16.4+-jp-10~55^2~35 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a6858e2ca90c49eb34ed2e9118c6cb3acc65b142;p=winmerge-jp%2Fwinmerge-jp.git Manual: Fix some links --HG-- branch : stable --- diff --git a/Docs/Users/Manual/About_Doc.xml b/Docs/Users/Manual/About_Doc.xml index 9a9329e6c..4e77e599f 100644 --- a/Docs/Users/Manual/About_Doc.xml +++ b/Docs/Users/Manual/About_Doc.xml @@ -170,7 +170,7 @@ developers. Before submitting questions to SourceForge.net, + url="https://sourceforge.net/projects/winmerge/">SourceForge.net, please check the topic first to see if your question is answered there. diff --git a/Docs/Users/Manual/Configuration.xml b/Docs/Users/Manual/Configuration.xml index d4ce321e4..a8e518ffb 100644 --- a/Docs/Users/Manual/Configuration.xml +++ b/Docs/Users/Manual/Configuration.xml @@ -1481,16 +1481,16 @@ - Wikipedia: + Wikipedia: Code pages, Character + url="https://en.wikipedia.org/wiki/Character_encoding">Character encoding Microsoft: - Code Pages Supported by Windows + url="https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-ucoderef/28fefe92-d66c-4b03-90a9-97b473223d43"> + Microsoft: Code Pages Supported by Windows diff --git a/Docs/Users/Manual/Faq.xml b/Docs/Users/Manual/Faq.xml index 99af1fce4..6c6529aac 100644 --- a/Docs/Users/Manual/Faq.xml +++ b/Docs/Users/Manual/Faq.xml @@ -467,8 +467,8 @@ the Win32 port of diffutils. The latest version of diffutils (and patch) can be downloaded from the SourceForge GnuWin32 project page: - - http://sourceforge.net/projects/gnuwin32. + + https://sourceforge.net/projects/gnuwin32. diff --git a/Docs/Users/Manual/Filters.xml b/Docs/Users/Manual/Filters.xml index d866be985..76929dc56 100644 --- a/Docs/Users/Manual/Filters.xml +++ b/Docs/Users/Manual/Filters.xml @@ -1164,7 +1164,7 @@ Pekka Himanen http://www.regular-expressions.info/ + url="https://www.regular-expressions.info/">http://www.regular-expressions.info/ @@ -1182,7 +1182,8 @@ Pekka Himanen http://www.night-ray.com/regex.pdf + url="https://github.com/GordonMcKinney/gist-assets/raw/master/regex.pdf"> + https://github.com/GordonMcKinney/gist-assets/raw/master/regex.pdf diff --git a/Docs/Users/Manual/Install.xml b/Docs/Users/Manual/Install.xml index 4212211fc..0d7b808d0 100644 --- a/Docs/Users/Manual/Install.xml +++ b/Docs/Users/Manual/Install.xml @@ -14,7 +14,7 @@ page: WinMerge.org. Note that delays can occur in updating home pages for the latest releases, but the project status page at SourceForge.net + url="https://sourceforge.net/projects/winmerge/">SourceForge.net shows the latest files. There is also a mailing list for release announcements. Stable releases are also available in several file download sites. diff --git a/Docs/Users/Manual/Introduction.xml b/Docs/Users/Manual/Introduction.xml index 14984bc39..2a637f9c0 100644 --- a/Docs/Users/Manual/Introduction.xml +++ b/Docs/Users/Manual/Introduction.xml @@ -2,7 +2,7 @@
Introduction to WinMerge - WinMerge is an Open + WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle. @@ -29,7 +29,7 @@ Please note that WinMerge is not freeware (as many sites on the Web have stated): it is GPL licensed. We + url="https://www.gnu.org/licenses/gpl-2.0.html">GPL licensed. We provide you with a good tool for free, so please honor your license agreement and submit improvements to us. We are happy to get help improving WinMerge, to the advantage of all WinMerge users. @@ -40,7 +40,7 @@ There are three kind of versions available in the downloads + url="https://sourceforge.net/projects/winmerge/files/">downloads page.
@@ -49,7 +49,7 @@ Stable versions Stable + url="https://sourceforge.net/projects/winmerge/files/stable/">Stable versions are recommended for most users. If you are unsure about what version to use, use the latest stable version. Stable versions have an even second number, for example, 2.4, 2.6 and 2.8. @@ -61,7 +61,7 @@ Beta versions Beta + url="https://sourceforge.net/projects/winmerge/files/beta/">Beta versions are for people who want to test latest features and improvements made after last stable version. Beta versions are not tested as extensively as stable versions and probably have some bugs. Beta @@ -79,7 +79,7 @@ Experimental versions Experimental + url="https://sourceforge.net/projects/winmerge/files/alpha/">Experimental versions or alpha versions are snapshot releases from our version control system (Subversion). They have all the latest features and improvements. Some features may still be buggy or incomplete. These releases are made @@ -87,7 +87,7 @@ compile, and to participate in development discussions concerning new and changing features. We also appreciate any help testing the current code. Use experimental versions with care and enable backups! And please report + url="https://sourceforge.net/p/winmerge/bugs/">report bugs that you find while using these builds: it really helps with WinMerge development!
@@ -158,7 +158,7 @@ it may take some time for somebody to answer. If you find a bug, please submit it as a bug + url="https://sourceforge.net/p/winmerge/bugs/">bug report. Please attach as much information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can display by clicking @@ -178,7 +178,7 @@ You must register with + url="https://sourceforge.net/user/registration">register with SourceForge.net before posting a bug report (registration is free). We require registering because anonymous submissions caused a lot of spam and also because there were no possibility to contact people for asking more @@ -192,16 +192,16 @@ WinMerge source code and development WinMerge source code is available in the downloads - page and from the public Subversion - server. Anyone can download the sources, study them, and alter them. + url="https://sourceforge.net/projects/winmerge/files/">downloads + page and from the + Bitbucket or + GitHub project pages. + Anyone can download the sources, study them, and alter them. If you find (and fix) bugs, improve something, and so on, please submit your - changes to us as patches - and help improve this product! If you publish your altered version, you are + changes to us as patches or pull requests and help improve this product! + If you publish your altered version, you are required to publish the changes to source code too. This is what the GPL license is about: + url="https://www.gnu.org/licenses/gpl-2.0.html">GPL license is about: please respect it. WinMerge development work is done by people in their spare time. @@ -210,31 +210,5 @@ reports them to us. We really try - we use WinMerge too. But there are absolutely no promises for new features. We always appreciate any help with WinMerge, be it testing, documenting, translating, or coding. - -
- Participating in WinMerge development - - As mentioned above, we look for help in many areas, not just coding. - Translation, documentation, and testing are important too. - - The Development Wiki - is a good source of information if you want to help with WinMerge - development. The Help - Needed page in the wiki has more information about how to help - with WinMerge development. - - The development-mailing - list is the preferred place for development discussions. Another place is - in the developers-forum. - If you are interested in helping with WinMerge development, let us know. - If you want to fix one of our bugs or implement a new - feature, let us know. -
\ No newline at end of file diff --git a/Docs/Users/Manual/Locales.xml b/Docs/Users/Manual/Locales.xml index 8a7ce47cc..3c6dda668 100644 --- a/Docs/Users/Manual/Locales.xml +++ b/Docs/Users/Manual/Locales.xml @@ -247,7 +247,7 @@ Please submit any errors you find in translations as bugs to our bug-list. + url="https://sourceforge.net/p/winmerge/bugs/">bug-list. It would be great if you also provide a corrected version of the translated text. diff --git a/Docs/Users/Manual/Plugins.xml b/Docs/Users/Manual/Plugins.xml index 281e570f6..83e0e2b3f 100644 --- a/Docs/Users/Manual/Plugins.xml +++ b/Docs/Users/Manual/Plugins.xml @@ -775,10 +775,8 @@ Some plugins require the Visual Basic runtime library to work. - You can download the required file msvbvm60.dll, - or use the Run-Time + You can use the Run-Time Redistribution Pack from Microsoft. If you don't need the plugin, you can safely remove it.