OSDN Git Service

Manual: Fix some links
authorTim Gerundt <tim@gerundt.de>
Wed, 20 Mar 2019 20:27:50 +0000 (21:27 +0100)
committerTim Gerundt <tim@gerundt.de>
Wed, 20 Mar 2019 20:27:50 +0000 (21:27 +0100)
--HG--
branch : stable

Docs/Users/Manual/About_Doc.xml
Docs/Users/Manual/Configuration.xml
Docs/Users/Manual/Faq.xml
Docs/Users/Manual/Filters.xml
Docs/Users/Manual/Install.xml
Docs/Users/Manual/Introduction.xml
Docs/Users/Manual/Locales.xml
Docs/Users/Manual/Plugins.xml

index 9a9329e..4e77e59 100644 (file)
           developers.</para>
 
           <para>Before submitting questions to <ulink
-          url="http://sourceforge.net/projects/winmerge/">SourceForge.net</ulink>,
+          url="https://sourceforge.net/projects/winmerge/">SourceForge.net</ulink>,
           please check the <xref linkend="Faq" /> topic first to see if your
           question is answered there.</para>
         </listitem>
index d4ce321..a8e518f 100644 (file)
 
       <itemizedlist>
         <listitem>
-          <para><ulink url="http://en.wikipedia.org/wiki/Code_pages">Wikipedia:
+          <para><ulink url="https://en.wikipedia.org/wiki/Code_pages">Wikipedia:
           Code pages</ulink>, <ulink
-          url="http://en.wikipedia.org/wiki/Character_encoding">Character
+          url="https://en.wikipedia.org/wiki/Character_encoding">Character
           encoding</ulink></para>
         </listitem>
 
         <listitem>
           <para><ulink
-          url="http://www.microsoft.com/globaldev/reference/wincp.mspx">Microsoft:
-          Code Pages Supported by Windows</ulink></para>
+          url="https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-ucoderef/28fefe92-d66c-4b03-90a9-97b473223d43">
+          Microsoft: Code Pages Supported by Windows</ulink></para>
         </listitem>
       </itemizedlist>
     </note>
index 99af1fc..6c6529a 100644 (file)
           the Win32 port of <filename>diffutils</filename>. The latest version
           of <filename>diffutils</filename> (and patch) can be downloaded from
           <application>the SourceForge GnuWin32</application> project page:
-          <ulink url="http://sourceforge.net/projects/gnuwin32/">
-          http://sourceforge.net/projects/gnuwin32</ulink>.</para>
+          <ulink url="https://sourceforge.net/projects/gnuwin32/">
+          https://sourceforge.net/projects/gnuwin32</ulink>.</para>
         </answer>
       </qandaentry>
 
index d866be9..76929dc 100644 (file)
@@ -1164,7 +1164,7 @@ Pekka Himanen</screen></para>
 
         <listitem>
           <simpara><ulink
-          url="http://www.regular-expressions.info/">http://www.regular-expressions.info/</ulink></simpara>
+          url="https://www.regular-expressions.info/">http://www.regular-expressions.info/</ulink></simpara>
         </listitem>
       </varlistentry>
 
@@ -1182,7 +1182,8 @@ Pekka Himanen</screen></para>
 
         <listitem>
           <simpara><ulink
-          url="http://www.night-ray.com/regex.pdf">http://www.night-ray.com/regex.pdf</ulink></simpara>
+          url="https://github.com/GordonMcKinney/gist-assets/raw/master/regex.pdf">
+          https://github.com/GordonMcKinney/gist-assets/raw/master/regex.pdf</ulink></simpara>
         </listitem>
       </varlistentry>
     </variablelist>
index 4212211..0d7b808 100644 (file)
@@ -14,7 +14,7 @@
     page: <ulink url="http://winmerge.org/">WinMerge.org</ulink>. Note that\r
     delays can occur in updating home pages for the latest releases, but the\r
     project status page at <ulink\r
-    url="http://sourceforge.net/projects/winmerge/">SourceForge.net</ulink>\r
+    url="https://sourceforge.net/projects/winmerge/">SourceForge.net</ulink>\r
     shows the latest files. There is also a mailing list for release\r
     announcements. Stable releases are also available in several file download\r
     sites.</para>\r
index 14984bc..2a637f9 100644 (file)
@@ -2,7 +2,7 @@
 <article id="Introduction">
   <title>Introduction to WinMerge</title>
 
-  <para>WinMerge is an <ulink url="http://www.opensource.org/">Open
+  <para>WinMerge is an <ulink url="https://opensource.org/">Open
   Source</ulink> 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.</para>
@@ -29,7 +29,7 @@
 
   <para>Please note that WinMerge is not freeware (as many sites on the Web have
   stated): it is <ulink
-  url="http://www.gnu.org/licenses/gpl-2.0.html">GPL</ulink> licensed. We
+  url="https://www.gnu.org/licenses/gpl-2.0.html">GPL</ulink> 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.</para>
@@ -40,7 +40,7 @@
       </indexterm></title>
 
     <para>There are three kind of versions available in the <ulink
-    url="http://sourceforge.net/projects/winmerge/files/">downloads</ulink>
+    url="https://sourceforge.net/projects/winmerge/files/">downloads</ulink>
     page.</para>
 
     <section>
@@ -49,7 +49,7 @@
         </indexterm>Stable versions</title>
 
       <para><ulink
-      url="http://sourceforge.net/projects/winmerge/files/stable/">Stable
+      url="https://sourceforge.net/projects/winmerge/files/stable/">Stable
       versions</ulink> 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.</para>
@@ -61,7 +61,7 @@
         </indexterm>Beta versions</title>
 
       <para><ulink
-      url="http://sourceforge.net/projects/winmerge/files/beta/">Beta
+      url="https://sourceforge.net/projects/winmerge/files/beta/">Beta
       versions</ulink> 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 @@
         </indexterm>Experimental versions</title>
 
       <para><ulink
-      url="http://sourceforge.net/projects/winmerge/files/alpha/">Experimental
+      url="https://sourceforge.net/projects/winmerge/files/alpha/">Experimental
       versions</ulink> 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 <ulink
-      url="http://sourceforge.net/p/winmerge/bugs/">report
+      url="https://sourceforge.net/p/winmerge/bugs/">report
       bugs</ulink> that you find while using these builds: it really helps with
       WinMerge development!</para>
     </section>
     it may take some time for somebody to answer.</para>
 
     <para>If you find a bug, please submit it as a <ulink
-    url="http://sourceforge.net/p/winmerge/bugs/">bug
+    url="https://sourceforge.net/p/winmerge/bugs/">bug
     report</ulink>. 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 <menuchoice>
     </important>
 
     <para>You must <ulink
-    url="https://sourceforge.net/account/registration/">register with
+    url="https://sourceforge.net/user/registration">register with
     SourceForge.net</ulink> 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
       </indexterm>WinMerge source code and development</title>
 
     <para>WinMerge source code is available in the <ulink
-    url="http://sourceforge.net/projects/winmerge/files/">downloads</ulink>
-    page and from the <ulink
-    url="http://sourceforge.net/p/winmerge/code/">public Subversion
-    server</ulink>. Anyone can download the sources, study them, and alter them.
+    url="https://sourceforge.net/projects/winmerge/files/">downloads</ulink>
+    page and from the
+    <ulink url="https://bitbucket.org/winmerge/">Bitbucket</ulink> or
+    <ulink url="https://github.com/winmerge/">GitHub</ulink> 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 <ulink
-    url="http://sourceforge.net/p/winmerge/patches/">patches</ulink>
-    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 <ulink
-    url="http://www.gnu.org/licenses/gpl-2.0.html">GPL</ulink> license is about:
+    url="https://www.gnu.org/licenses/gpl-2.0.html">GPL</ulink> license is about:
     please respect it.</para>
 
     <para>WinMerge development work is done by people in their spare time. 
     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.</para>
-
-    <section>
-      <title>Participating in WinMerge development</title>
-
-      <para>As mentioned above, we look for help in many areas, not just coding.
-      Translation, documentation, and testing are important too.</para>
-
-      <para>The <ulink url="http://wiki.winmerge.org/">Development Wiki</ulink>
-      is a good source of information if you want to help with WinMerge
-      development. The <ulink url="http://wiki.winmerge.org/wiki/Help_Needed">Help
-      Needed</ulink> page in the wiki has more information about how to help
-      with WinMerge development.</para>
-
-      <para>The <ulink
-      url="http://winmerge.org/support/mailing-lists.php">development-mailing</ulink>
-      list is the preferred place for development discussions. Another place is
-      in the <ulink
-      url="http://forums.winmerge.org/viewforum.php?f=6">developers-forum</ulink>.
-      If you are interested in helping with WinMerge development, let us know.
-      If you want to fix one of our <ulink
-      url="http://sourceforge.net/p/winmerge/bugs/"
-      userlevel="">bugs</ulink> or implement a <ulink
-      url="http://sourceforge.net/p/winmerge/feature-requests/">new
-      feature</ulink>, let us <ulink
-      url="http://forums.winmerge.org/viewforum.php?f=6">know</ulink>.</para>
-    </section>
   </section>
 </article>
\ No newline at end of file
index 8a7ce47..3c6dda6 100644 (file)
 
     <para>Please submit any errors you find in translations as bugs to our
     <ulink
-    url="http://sourceforge.net/p/winmerge/bugs/">bug-list</ulink>.
+    url="https://sourceforge.net/p/winmerge/bugs/">bug-list</ulink>.
     It would be great if you also provide a corrected version of the translated
     text.</para>
   </section>
index 281e570..83e0e2b 100644 (file)
       <para>Some plugins require <application>the Visual Basic</application>
       runtime library to work.</para>
 
-      <para>You can download the required file <filename><ulink
-      url="http://www.dll-files.com/dllindex/dll-files.shtml?msvbvm60">msvbvm60.dll</ulink></filename>,
-      or use the <ulink
-      url="http://www.microsoft.com/downloads/details.aspx?familyid=7b9ba261-7a9c-43e7-9117-f673077ffb3c">Run-Time
+      <para>You can use the <ulink
+      url="https://www.microsoft.com/en-us/download/details.aspx?id=24417">Run-Time
       Redistribution Pack</ulink> from <trademark
       class="registered">Microsoft</trademark>. If you don't need the plugin,
       you can safely remove it.</para>