Merge from ^/trunk/en r6063.

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

diff --git a/en/book/appc-webdav.xml b/en/book/appc-webdav.xml
index 4344f69..e92fd94 100644 (file)
--- a/en/book/appc-webdav.xml
+++ b/en/book/appc-webdav.xml
@@ -415,7 +415,7 @@
           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>
+          <ulink 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
@@ -614,7 +614,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="http://www.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 b418fe5..27ac122 100644 (file)
--- a/en/book/ch00-preface.xml
+++ b/en/book/ch00-preface.xml
@@ -247,7 +247,8 @@
       </indexterm>
 
       <para>In early 2000, CollabNet,
-        Inc. (<ulink url="http://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 1aed814..3e01946 100644 (file)
--- a/en/book/ch04-branching-and-merging.xml
+++ b/en/book/ch04-branching-and-merging.xml
@@ -2909,8 +2909,9 @@ sys.exit(0)
         to understand these concepts; they should typically remain in the
         background as pesky 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.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 dadec75..42db6ef 100644 (file)
--- a/en/book/ch06-server-configuration.xml
+++ b/en/book/ch06-server-configuration.xml
@@ -3793,7 +3793,10 @@ sally = r
         is anonymously world-readable, the entire checkout will be
         done without authentication—again, skipping the
         unreadable directory, rather than asking for authentication
-        partway through.</para>
+        partway through.<footnote><para>For more on this, see the blog
+        post <emphasis>Authz and Anon Authn Agony</emphasis> at
+        <ulink url="https://subversion.apache.org/blog/2007-03-27-authz-and-anon-authn-agony.html"
+        />.</para></footnote></para>
     </sidebar>
 
   </sect1>