httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject svn commit: r1415551 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/mod/ docs/manual/mod/core.xml
Date Fri, 30 Nov 2012 09:09:34 GMT
Author: igalic
Date: Fri Nov 30 09:09:33 2012
New Revision: 1415551

URL: http://svn.apache.org/viewvc?rev=1415551&view=rev
Log:
merge r1415549

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

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1415075

Propchange: httpd/httpd/branches/2.4.x/docs/manual/mod/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 30 09:09:33 2012
@@ -0,0 +1,3 @@
+/httpd/httpd/branches/revert-ap-ldap/docs/manual/mod:1150158-1150173
+/httpd/httpd/branches/wombat-integration/docs/manual/mod:723609-723841
+/httpd/httpd/trunk/docs/manual/mod:1200475,1200478,1200482,1200491,1200496,1200513,1200550,1200556,1200580,1200605,1200612,1200614,1200639,1200646,1200656,1200667,1200679,1200699,1200702,1200955,1200957,1200961,1200963,1200968,1200975,1200977,1201032,1201042,1201111,1201194,1201198,1201202,1201443,1201450,1201460,1201956,1202236,1202453,1202456,1202886,1203400,1203491,1203632,1203714,1203859,1203980,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206472,1206587,1206850,1206940,1206978,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,1210067,1210080,1210120,1210124,1210130,1210148,1210219,1210221,1210252,1210284,1210336,1210378,1210725,1210892,1210951,1210954,1211351-1211352,1211364,1211490,1211495,1211528,1211663,1211680,1212872,1212883,1213338,1213380-1213381,1213391,1213399,1213567,12
 14003,1214005,1214015,1215514,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221205,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1222930,1223048,1225060,1225197-1225199,1225223,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1227910,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1230286,1231255,1231257,1231442,1231446,1231508,1231510,1231518,1232575,1232594,1232630,1232838,1234180,1234297,1234479,1234511,1234565,1234574,1234642-1234643,1234876,1234899,1235019,1236122,1236701,1237407,1238545,1238768,1239029-1239030,1239071,1239565,1240315,1240470,1240778,1241069,1241071,1242089,1242798,1242967,1243176,1243246,1243797,1243799,1244211,1245717,1290823,1290835,1291819-1291820,1291834,1291840,1292043,1293405,1293534-1293535,1293658,1293678,1293708,1294306,1294349,1294356,1294358,1294372,1294471,1297560,1299718,1299786,1300766,1301111,1301725,1302444,1302483,1302653,1302665,1302674,1303201,1303435,1303827
 ,1304087,1304874-1304875,1305586,1306350,1306409,1306426,1306841,1307790,1308327,1308459,1309536,1309567,1324760,1325218,1325227,1325250,1325265,1325275,1325632,1325724,1326980,1326984,1326991,1327689,1328325-1328326,1328339,1328345,1328950,1331115,1331942,1331977,1332378,1333969,1334343,1335882,1341906,1341913,1343085,1343087,1343094,1343099,1343935,1345319,1345329,1346905,1348036,1348656,1348660,1349905,1351012-1351020,1351071-1351072,1351074,1351737,1352047,1352534,1352909-1352912,1357685,1358061,1359057,1359881,1361153,1361298,1361766,1361773,1361778,1361784,1361791-1361792,1361801,1361803,1362020,1362538,1362707,1363035,1363183,1363186,1363440,1363557,1363589,1363829,1363832,1363836-1363837,1363853,1364133,1364138,1364229,1364601,1365001,1365020,1365029,1365479,1366319,1366344,1366621,1367778,1367819,1368053,1368058,1368094,1368131,1368393,1368396,1369419,1369568,1369604,1369618,1369904,1369995,1369999,1370001,1370466,1370592,1370615-1370616,1370763,1371387,1371791,1371
 801,1371878,1371903,1373270,1373447,1373898,1373955,1374157,1374199,1374877,1374880,1375006,1375009,1375011,1375013,1375584,1376695,1376700,1383490,1384408,1386576,1386578,1386726,1386822,1386913,1387085,1387088,1387633,1388825,1389316,1389481,1389506,1389564,1390562,1390564,1392347,1392850,1393033,1393058,1393338,1393564,1395225,1397710,1397716,1399413,1400700,1403041,1414094,1415075,1415549

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml?rev=1415551&r1=1415550&r2=1415551&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml Fri Nov 30 09:09:33 2012
@@ -2966,7 +2966,7 @@ resource </description>
     <usage>
         <p>The <directive>MaxRangeOverlaps</directive> directive
             limits the number of overlapping HTTP ranges the server is willing to
-            return to the client.  If more overlapping ranges then permitted are requested,
+            return to the client. If more overlapping ranges than permitted are requested,
             the complete resource is returned instead.</p>
 
         <dl>
@@ -3001,7 +3001,7 @@ resource </description>
     <usage>
         <p>The <directive>MaxRangeReversals</directive> directive
             limits the number of HTTP Range reversals the server is willing to
-            return to the client.  If more ranges reversals then permitted are requested,
+            return to the client. If more ranges reversals than permitted are requested,
             the complete resource is returned instead.</p>
 
         <dl>



Mime
View raw message