[svnbook] r5807 committed - branches/1.7/en
cmpilato at users.sourceforge.net
cmpilato at users.sourceforge.net
Wed Oct 24 10:27:19 CDT 2018
Revision: 5807
http://sourceforge.net/p/svnbook/source/5807
Author: cmpilato
Date: 2018-10-24 15:27:17 +0000 (Wed, 24 Oct 2018)
Log Message:
-----------
Merge a bunch of relatively recent trunk changes (some of which where not
applicable): r5717,5722,5736,5747,5752,5765,5768,5776,5778,5799,5806
Modified Paths:
--------------
branches/1.7/en/book/appc-webdav.xml
branches/1.7/en/book/ch00-preface.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 2018-10-24 14:36:02 UTC (rev 5806)
+++ branches/1.7/en 2018-10-24 15:27:17 UTC (rev 5807)
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
\ 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
\ No newline at end of property
Modified: branches/1.7/en/book/appc-webdav.xml
===================================================================
--- branches/1.7/en/book/appc-webdav.xml 2018-10-24 14:36:02 UTC (rev 5806)
+++ branches/1.7/en/book/appc-webdav.xml 2018-10-24 15:27:17 UTC (rev 5807)
@@ -193,7 +193,7 @@
<para>Another feature that may be a useful complement for
Subversion's autoversioning comes from Apache's
- <literal>mod_mime</literal> module. If a WebDAV client adds a
+ <command>mod_mime</command> module. If a WebDAV client adds a
new file to the repository, there's no opportunity for the user
to set the the <literal>svn:mime-type</literal> property. This
might cause the file to appear as a generic icon when viewed
@@ -219,7 +219,7 @@
</programlisting>
</informalexample>
- <para>This directive allows <literal>mod_mime</literal> to attempt
+ <para>This directive allows <command>mod_mime</command> to attempt
automatic deduction of the MIME type on new files that enter the
repository via autoversioning. The module looks at the file's
named extension and possibly the contents as well; if the file
Modified: branches/1.7/en/book/ch00-preface.xml
===================================================================
--- branches/1.7/en/book/ch00-preface.xml 2018-10-24 14:36:02 UTC (rev 5806)
+++ branches/1.7/en/book/ch00-preface.xml 2018-10-24 15:27:17 UTC (rev 5807)
@@ -73,7 +73,7 @@
<para>Subversion is a free/open source <firstterm>version control
system</firstterm> (VCS). That is, Subversion manages files and
directories, and the changes made to them, over time. This
- allows you to recover older versions of your data or examine the
+ allows you to recover older versions of your data, or examine the
history of how your data changed. In this regard, many people
think of a version control system as a sort of <quote>time
machine.</quote></para>
@@ -315,7 +315,7 @@
fit for the ASF, many of whose members were already active
Subversion contributors. In early 2010, Subversion was fully
adopted into the ASF's family of top-level projects, moved its
- project web presence to
+ web presence to
<ulink url="http://subversion.apache.org"/>, and was
rechristened <quote>Apache Subversion</quote>.</para>
Modified: branches/1.7/en/book/ch06-server-configuration.xml
===================================================================
--- branches/1.7/en/book/ch06-server-configuration.xml 2018-10-24 14:36:02 UTC (rev 5806)
+++ branches/1.7/en/book/ch06-server-configuration.xml 2018-10-24 15:27:17 UTC (rev 5807)
@@ -1962,9 +1962,9 @@
<para>Next, ensure that Apache has access to the modules which
provide the Basic authentication and related
- functionality: <literal>mod_auth_basic</literal>,
- <literal>mod_authn_file</literal>, and
- <literal>mod_authz_user</literal>. In many cases, these
+ functionality: <command>mod_auth_basic</command>,
+ <command>mod_authn_file</command>, and
+ <command>mod_authz_user</command>. In many cases, these
modules are compiled into <command>httpd</command> itself,
but if not, you might need to explicitly load one or more of
them using the <literal>LoadModule</literal> directive:</para>
@@ -2086,8 +2086,8 @@
<para>Configuring Apache to use Digest authentication is
straightforward. You'll need to ensure that
- the <literal>mod_auth_digest</literal> module is available
- (instead of <literal>mod_auth_basic</literal>), and then
+ the <command>mod_auth_digest</command> module is available
+ (instead of <command>mod_auth_basic</command>), and then
make a few small variations on our prior example:</para>
<informalexample>
@@ -2121,7 +2121,7 @@
<literal>AuthName</literal> directive.</para>
<note>
- <para>For digest authentication, the authentication provider
+ <para>For Digest authentication, the authentication provider
is selected using the <literal>AuthDigestProvider</literal>
as shown in the previous example. As was the case with
the <literal>AuthBasicProvider</literal> directive,
@@ -2749,7 +2749,7 @@
examples include ViewVC
(<ulink url="http://viewvc.tigris.org"/>), Trac
(<ulink url="http://trac.edgewall.org"/>) and WebSVN
- (<ulink url="http://websvn.info"/>). These third-party
+ (<ulink url="http://websvnphp.github.io"/>). These third-party
tools don't affect <command>mod_dav_svn</command>'s
built-in <quote>browseability</quote>, and generally offer
a much wider set of features, including the display of the
@@ -2837,7 +2837,7 @@
Subversion source distribution's
<filename>tools/xslt/</filename> directory.
Keep in mind that the path provided to the
- <literal>SVNIndexXSLT</literal> directory is actually a
+ <literal>SVNIndexXSLT</literal> directive is actually a
URL path—browsers need to be able to read your
stylesheets to make use of them!</para>
More information about the svnbook-dev
mailing list