Update outdated links

* appc-webdav.xml
  (#svn.webdav.clients.standalone.free): Update link to Cadaver
  (#svn.webdav.clients.fs-impl.windows): Update link to Webdrive

* ch00-preface.xml
  (#svn.intro.history): CollabNet is now digital.ai

* ch04-branching-and-merging.xml
  (#svn.branchmerge.advanced.finalword): Update link to blog article

* ch06-server-configuration.xml
  (#svn.serverconfig.pathbasedauthz.gotchas): Update link to blog article

git-svn-id: https://svn.code.sf.net/p/svnbook/source/trunk@6063 b70f5e92-ccc6-4167-9ab2-d027528d294b

diff --git a/en/book/appc-webdav.xml b/en/book/appc-webdav.xml
index 08dcd33..6c8f6ea 100644 (file)
--- a/en/book/appc-webdav.xml
+++ b/en/book/appc-webdav.xml
@@ -427,7 +427,7 @@
           library—not surprisingly, since both neon and cadaver
           are written by the same author.  cadaver is free software (GPL
           license) and is available at <ulink
-          url="http://www.webdav.org/cadaver/"/>.</para>
+          url="https://notroj.github.io/cadaver/"/>.</para>
 
         <para>Using cadaver is similar to using a command-line FTP
           program, and thus it's extremely useful for basic WebDAV
@@ -626,7 +626,7 @@ Progress: [=============================&gt;] 100.0% of 1461 bytes succeeded.
           contents of these WebDAV-backed pseudodrives as easily as
           you can against real local hard drives, and in the same
           ways.  You can purchase WebDrive from South River
-          Technologies (<ulink url="https://southrivertech.com"/>).
+          Technologies (<ulink url="https://webdrive.com/"/>).
           Novell's NetDrive is freely available online, but requires
           users to have a NetWare license.</para>
 

diff --git a/en/book/ch00-preface.xml b/en/book/ch00-preface.xml
index 0bb05ba..46099ae 100644 (file)
--- a/en/book/ch00-preface.xml
+++ b/en/book/ch00-preface.xml
@@ -253,7 +253,8 @@
         <indexterm>
           <primary>CollabNet</primary>
         </indexterm>In early 2000, CollabNet,
-        Inc. (<ulink url="https://www.collab.net"/>) began seeking
+        Inc. (now known as Digital.ai, <ulink
+        url="https://digital.ai"/>) began seeking
         developers to write a replacement for CVS.  CollabNet
         offered<footnote><para>CollabNet Enterprise Edition has since
         been replaced by a new product line called CollabNet

diff --git a/en/book/ch04-branching-and-merging.xml b/en/book/ch04-branching-and-merging.xml
index cc28062..f2dae59 100644 (file)
--- a/en/book/ch04-branching-and-merging.xml
+++ b/en/book/ch04-branching-and-merging.xml
@@ -3267,8 +3267,9 @@ sys.exit(0)
         to understand these concepts; typically they remain in the
         background as implementation details.  All that said, if you
         enjoy this sort of thing, you can get a fantastic overview in a
-        paper posted at CollabNet's website: <ulink
-        url="http://www.open.collab.net/community/subversion/articles/merge-info.html"
+        paper posted at CollabNet's website (now mirrored on the Subversion
+        website): <ulink
+        url="https://subversion.apache.org/blog/2008-05-06-merge-info.html"
         />.</para>
 
       <para>For now, if you want to steer clear of the complexities of

diff --git a/en/book/ch06-server-configuration.xml b/en/book/ch06-server-configuration.xml
index 33c90dc..1f3debe 100644 (file)
--- a/en/book/ch06-server-configuration.xml
+++ b/en/book/ch06-server-configuration.xml
@@ -5107,9 +5107,8 @@ calc = @calc-developers, @calc-owners
         directory, rather than asking for authentication partway
         through.<footnote><para>For more on this, see the blog
         post <emphasis>Authz and Anon Authn Agony</emphasis> at
-        <ulink url="http://blogs.collab.net/subversion/2007/03/authz_and_anon_/"
+        <ulink url="https://subversion.apache.org/blog/2007-03-27-authz-and-anon-authn-agony.html"
         />.</para></footnote></para>
-      <!-- TODO: Merge content from the blog post into the book. --> 
 
     </sect2>
   </sect1>