httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Randy Terbush <ra...@zyzzyva.com>
Subject Re: cvs commit: apache/htdocs/manual/mod mod_alias.html mod_userdir.html
Date Sun, 01 Dec 1996 06:49:54 GMT

Alexei, I'm trying to do a commit and get the following.

=> cvs ci
cvs commit: Examining .
cvs commit: Examining cgi-bin
cvs commit: Examining cgi-src
cvs commit: Examining conf
cvs commit: Examining htdocs
cvs commit: Examining htdocs/manual
cvs commit: Examining htdocs/manual/images
cvs commit: Examining htdocs/manual/info
cvs commit: Examining htdocs/manual/misc
cvs commit: Examining htdocs/manual/mod
cvs commit: Up-to-date check failed for `htdocs/manual/mod/mod_alias.html'
cvs commit: Up-to-date check failed for `htdocs/manual/mod/mod_userdir.html'
cvs commit: Examining icons
cvs commit: Examining logs
cvs commit: Examining src
cvs commit: Examining src/helpers
cvs commit: Examining src/modules
cvs commit: Examining src/modules/proxy
cvs commit: Examining src/regex
cvs commit: Examining support
cvs [commit aborted]: correct above errors first!



> akosut      96/11/30 22:44:41
> 
>   Modified:    htdocs/manual/mod  mod_alias.html mod_userdir.html
>   Log:
>   Fix compat notes, and make the UserDir docs to be (a) correct, and (b)
>   to use more "friendly" expamples (hah).
>   
>   Revision  Changes    Path
>   1.5       +0 -4      apache/htdocs/manual/mod/mod_alias.html
>   
>   Index: mod_alias.html
>   ===================================================================
>   RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_alias.html,v
>   retrieving revision 1.4
>   retrieving revision 1.5
>   diff -C3 -r1.4 -r1.5
>   *** mod_alias.html	1996/11/27 09:30:51	1.4
>   --- mod_alias.html	1996/12/01 06:44:39	1.5
>   ***************
>   *** 30,37 ****
>     <Strong>Context:</strong> server config, virtual host<br>
>     <strong>Status:</strong> Base<br>
>     <strong>Module:</strong> mod_alias<br>
>   - <strong>Compatibility:</strong> Alias is only available in Apache 1.1
>   - and later<p>
>     
>     The Alias directive allows documents to be stored in the local filesystem
>     other than under the <A HREF="core.html#documentroot">DocumentRoot</A>.
>   --- 30,35 ----
>   ***************
>   *** 115,122 ****
>     <Strong>Context:</strong> server config, virtual host<br>
>     <strong>Status:</strong> Base<br>
>     <strong>Module:</strong> mod_alias<br>
>   - <strong>Compatibility:</strong> ScriptAlias is only available in Apache
1.1
>   - and later<p>
>     
>     The ScriptAlias directive has the same behaviour as the
>     <A HREF="#alias">Alias</A> directive, except that in addition it
>   --- 113,118 ----
>   
>   
>   
>   1.3       +9 -7      apache/htdocs/manual/mod/mod_userdir.html
>   
>   Index: mod_userdir.html
>   ===================================================================
>   RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_userdir.html,v
>   retrieving revision 1.2
>   retrieving revision 1.3
>   diff -C3 -r1.2 -r1.3
>   *** mod_userdir.html	1996/11/21 10:30:53	1.2
>   --- mod_userdir.html	1996/12/01 06:44:40	1.3
>   ***************
>   *** 24,46 ****
>     <strong>Default:</strong> <code>UserDir public_html</code><br>
>     <Strong>Context:</strong> server config, virtual host<br>
>     <strong>Status:</strong> Base<br>
>   ! <strong>Module:</strong> mod_userdir<p>
>     
>     The UserDir directive sets the real directory in a user's home directory
>     to use when a request for a document for a user is received.
>     <em>Directory</em> is either <code>disabled</code>, to disable
this feature,
>      or the name of a directory, following one of the following
>     patterns. If not disabled, then a request for
>   ! <code>http://www.foo.com/~bar/one/two.html</code> will be translated
to:
>     <pre>
>   ! UserDir public_html     -> ~bar/public_html/one/two.html
>   ! UserDir /usr/web        -> /usr/web/bar/one/two.html
>   ! UserDir /home/*/www     -> /home/bar/www/one/two.html
>     </pre>
>     The following directives will send redirects to the client:
>     <pre>
>   ! UserDir http://www.x.com/users   -> http//www.x.com/users/bar/one/two.html
>   ! UserDir http://www.x.com/*/y     -> http://www.x.com/y/one/two.html
>     </pre>
>     
>     <!--#include virtual="footer.html" -->
>   --- 24,48 ----
>     <strong>Default:</strong> <code>UserDir public_html</code><br>
>     <Strong>Context:</strong> server config, virtual host<br>
>     <strong>Status:</strong> Base<br>
>   ! <strong>Module:</strong> mod_userdir<br>
>   ! <strong>Compatibility:</strong> All forms except the <code>UserDir
>   ! public_html</code> form are only available in Apache 1.1 or above.<p>
>     
>     The UserDir directive sets the real directory in a user's home directory
>     to use when a request for a document for a user is received.
>     <em>Directory</em> is either <code>disabled</code>, to disable
this feature,
>      or the name of a directory, following one of the following
>     patterns. If not disabled, then a request for
>   ! <code>http://www.foo.com/~bob/one/two.html</code> will be translated
to:
>     <pre>
>   ! UserDir public_html     -> ~bob/public_html/one/two.html
>   ! UserDir /usr/web        -> /usr/web/bob/one/two.html
>   ! UserDir /home/*/www     -> /home/bob/www/one/two.html
>     </pre>
>     The following directives will send redirects to the client:
>     <pre>
>   ! UserDir http://www.foo.com/users   -> http//www.foo.com/users/bob/one/two.html
>   ! UserDir http://www.foo.com/*/usr   -> http://www.foo.com/bob/usr/one/two.html
>     </pre>
>     
>     <!--#include virtual="footer.html" -->
>   
>   
>   




Mime
View raw message