httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From taka...@apache.org
Subject svn commit: r1231443 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/mod/mod_watchdog.xml
Date Sat, 14 Jan 2012 06:49:17 GMT
Author: takashi
Date: Sat Jan 14 06:49:17 2012
New Revision: 1231443

URL: http://svn.apache.org/viewvc?rev=1231443&view=rev
Log:
Merge r1229099 and r1231442 from trunk:

Fix XML validation error.
Add svn:keywords LastChangedRevision

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_watchdog.xml   (contents, props changed)

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 14 06:49:17 2012
@@ -1,3 +1,3 @@
 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
 /httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225198,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1228700,1228816,1229024,1229059,1229116,1229134,1229136
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225198,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1231442

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_watchdog.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_watchdog.xml?rev=1231443&r1=1231442&r2=1231443&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_watchdog.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_watchdog.xml Sat Jan 14 06:49:17 2012
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
+<!-- $LastChangedRevision$ -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -52,8 +53,8 @@ core or, if a dynamic module, be loaded 
 <contextlist><context>server config</context></contextlist>
 
 <usage>
-Sets the interval at which the watchdog_step hook runs.  Default is to run every 
-second.
+<p>Sets the interval at which the watchdog_step hook runs.  Default is to run every

+second.</p>
 </usage>
 </directivesynopsis>
 </modulesynopsis>

Propchange: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_watchdog.xml
------------------------------------------------------------------------------
    svn:keywords = LastChangedRevision



Mime
View raw message