[svnbook] r6064 committed - branches/1.7/en

[danielsahlberg at users.sourceforge.net]

Revision: 6064
          http://sourceforge.net/p/svnbook/source/6064
Author:   danielsahlberg
Date:     2023-07-14 20:13:11 +0000 (Fri, 14 Jul 2023)
Log Message:
-----------
Merge from ^/trunk/en r6063.

Modified Paths:
--------------
    branches/1.7/en/book/appc-webdav.xml
    branches/1.7/en/book/ch00-preface.xml
    branches/1.7/en/book/ch04-branching-and-merging.xml
    branches/1.7/en/book/ch06-server-configuration.xml

Property Changed:
----------------
    branches/1.7/en/

Index: branches/1.7/en
===================================================================
--- branches/1.7/en	2023-07-14 15:13:57 UTC (rev 6063)
+++ branches/1.7/en	2023-07-14 20:13:11 UTC (rev 6064)

Property changes on: branches/1.7/en
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en:4202,4211,4216,4226,4231,4251,4261,4267-4270,4273,4296,4299,4305,4316,4320,4328,4335,4352,4364,4368,4370-4372,4374-4375,4378,4380,4382,4384,4386-4387,4390,4392-4393,4463,4516,4742,4958,5041,5043,5082,5089,5094,5165,5285,5288,5290,5365-5366,5391,5493,5572-5574,5684,5697,5717,5722,5736,5747,5752,5765,5768,5776,5778,5799,5806,6061
\ No newline at end of property
+/trunk/en:4202,4211,4216,4226,4231,4251,4261,4267-4270,4273,4296,4299,4305,4316,4320,4328,4335,4352,4364,4368,4370-4372,4374-4375,4378,4380,4382,4384,4386-4387,4390,4392-4393,4463,4516,4742,4958,5041,5043,5082,5089,5094,5165,5285,5288,5290,5365-5366,5391,5493,5572-5574,5684,5697,5717,5722,5736,5747,5752,5765,5768,5776,5778,5799,5806,6061,6063
\ No newline at end of property
Modified: branches/1.7/en/book/appc-webdav.xml
===================================================================
--- branches/1.7/en/book/appc-webdav.xml	2023-07-14 15:13:57 UTC (rev 6063)
+++ branches/1.7/en/book/appc-webdav.xml	2023-07-14 20:13:11 UTC (rev 6064)
@@ -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 @@
           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>
 

Modified: branches/1.7/en/book/ch00-preface.xml
===================================================================
--- branches/1.7/en/book/ch00-preface.xml	2023-07-14 15:13:57 UTC (rev 6063)
+++ branches/1.7/en/book/ch00-preface.xml	2023-07-14 20:13:11 UTC (rev 6064)
@@ -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

Modified: branches/1.7/en/book/ch04-branching-and-merging.xml
===================================================================
--- branches/1.7/en/book/ch04-branching-and-merging.xml	2023-07-14 15:13:57 UTC (rev 6063)
+++ branches/1.7/en/book/ch04-branching-and-merging.xml	2023-07-14 20:13:11 UTC (rev 6064)
@@ -2909,8 +2909,9 @@
         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

Modified: branches/1.7/en/book/ch06-server-configuration.xml
===================================================================
--- branches/1.7/en/book/ch06-server-configuration.xml	2023-07-14 15:13:57 UTC (rev 6063)
+++ branches/1.7/en/book/ch06-server-configuration.xml	2023-07-14 20:13:11 UTC (rev 6064)
@@ -3793,7 +3793,10 @@
         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>