You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/05/04 00:50:18 UTC

svn commit: r1742205 [19/24] - in /mesos/site/publish: ./ blog/ blog/announcing-mesoscon-eu-2015-hackathon/ blog/framework-authentication-in-apache-mesos-0-15-0/ blog/mesos-0-14-2-released/ blog/mesos-0-16-0-released/ blog/mesos-0-17-0-released-featuri...

Modified: mesos/site/publish/documentation/latest/testing-patterns/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/testing-patterns/index.html?rev=1742205&r1=1742204&r2=1742205&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/testing-patterns/index.html (original)
+++ mesos/site/publish/documentation/latest/testing-patterns/index.html Tue May  3 22:50:16 2016
@@ -3,76 +3,76 @@
     <head>
         <meta charset="utf-8">
         <title>Apache Mesos - Testing Patterns</title>
-		    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-		    <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
-		    <link rel="alternate" type="application/atom+xml" title="Apache Mesos Blog" href="/blog/feed.xml">
-		    
-		    <link href="../../../assets/css/main.css" media="screen" rel="stylesheet" type="text/css" />
-				
-		    
-			
-			<!-- Google Analytics Magic -->
-			<script type="text/javascript">
-			  var _gaq = _gaq || [];
-			  _gaq.push(['_setAccount', 'UA-20226872-1']);
-			  _gaq.push(['_setDomainName', 'apache.org']);
-			  _gaq.push(['_trackPageview']);
-
-			  (function() {
-			    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-			  })();
-			</script>
+        <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+        <link rel="alternate" type="application/atom+xml" title="Apache Mesos Blog" href="/blog/feed.xml">
+        
+        <link href="../../../assets/css/main.css" media="screen" rel="stylesheet" type="text/css" />
+
+        
+
+      <!-- Google Analytics Magic -->
+      <script type="text/javascript">
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-20226872-1']);
+        _gaq.push(['_setDomainName', 'apache.org']);
+        _gaq.push(['_trackPageview']);
+
+        (function() {
+          var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+          ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+          var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+        })();
+      </script>
     </head>
     <body>
-			<!-- magical breadcrumbs -->
-			<div class="topnav">
-			<ul class="breadcrumb">
-			  <li>
-					<div class="dropdown">
-					  <a data-toggle="dropdown" href="#">Apache Software Foundation <span class="caret"></span></a>
-					  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-							<li><a href="http://www.apache.org">Apache Homepage</a></li>
-							<li><a href="http://www.apache.org/licenses/">License</a></li>
-					  	<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>  
-					  	<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-							<li><a href="http://www.apache.org/security/">Security</a></li>
-					  </ul>
-					</div>
-				</li>
-				<li><a href="http://mesos.apache.org">Apache Mesos</a></li>
-				
-				
-					<li><a href="/documentation
+      <!-- magical breadcrumbs -->
+      <div class="topnav">
+      <ul class="breadcrumb">
+        <li>
+          <div class="dropdown">
+            <a data-toggle="dropdown" href="#">Apache Software Foundation <span class="caret"></span></a>
+            <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+              <li><a href="http://www.apache.org">Apache Homepage</a></li>
+              <li><a href="http://www.apache.org/licenses/">License</a></li>
+              <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+              <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              <li><a href="http://www.apache.org/security/">Security</a></li>
+            </ul>
+          </div>
+        </li>
+        <li><a href="http://mesos.apache.org">Apache Mesos</a></li>
+        
+        
+          <li><a href="/documentation
 /">Documentation
 </a></li>
-				
-				
-			</ul><!-- /breadcrumb -->
-			</div>
-			
-			<!-- navbar excitement -->
-	    <div class="navbar navbar-static-top" role="navigation">
-	      <div class="navbar-inner">
-	        <div class="container">
-						<a href="/" class="logo"><img src="/assets/img/mesos_logo.png" alt="Apache Mesos logo" /></a>
-					<div class="nav-collapse">
-						<ul class="nav nav-pills navbar-right">
-						  <li><a href="/gettingstarted/">Getting Started</a></li>
-						  <li><a href="/documentation/latest/">Documentation</a></li>
-						  <li><a href="/downloads/">Downloads</a></li>
-						  <li><a href="/community/">Community</a></li>
-						</ul>
-					</div>
-	        </div>
-	      </div>
-	    </div><!-- /.navbar -->
+        
+        
+      </ul><!-- /breadcrumb -->
+      </div>
+
+      <!-- navbar excitement -->
+      <div class="navbar navbar-static-top" role="navigation">
+        <div class="navbar-inner">
+          <div class="container">
+            <a href="/" class="logo"><img src="/assets/img/mesos_logo.png" alt="Apache Mesos logo" /></a>
+          <div class="nav-collapse">
+            <ul class="nav nav-pills navbar-right">
+              <li><a href="/gettingstarted/">Getting Started</a></li>
+              <li><a href="/documentation/latest/">Documentation</a></li>
+              <li><a href="/downloads/">Downloads</a></li>
+              <li><a href="/community/">Community</a></li>
+            </ul>
+          </div>
+          </div>
+        </div>
+      </div><!-- /.navbar -->
 
       <div class="container">
 
-			<div class="row-fluid">
+      <div class="row-fluid">
 	<div class="col-md-4">
 		<h4>If you're new to Mesos</h4>
 		<p>See the <a href="/gettingstarted/">getting started</a> page for more information about downloading, building, and deploying Mesos.</p>
@@ -224,19 +224,19 @@ Clock::resume();
 	</div>
 </div>
 
-			
-	      <hr>
 
-				<!-- footer -->
-	      <div class="footer">
-	        <p>&copy; 2012-2015 <a href="http://apache.org">The Apache Software Foundation</a>.
-	        Apache Mesos, the Apache feather logo, and the Apache Mesos project logo are trademarks of The Apache Software Foundation.<p>
-	      </div><!-- /footer -->
-
-	    </div> <!-- /container -->
-
-	    <!-- JS -->
-	    <script src="//code.jquery.com/jquery-1.11.0.min.js" type="text/javascript"></script>
-			<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" type="text/javascript"></script>
+        <hr>
+
+        <!-- footer -->
+        <div class="footer">
+          <p>&copy; 2012-2016 <a href="http://apache.org">The Apache Software Foundation</a>.
+          Apache Mesos, the Apache feather logo, and the Apache Mesos project logo are trademarks of The Apache Software Foundation.<p>
+        </div><!-- /footer -->
+
+      </div> <!-- /container -->
+
+      <!-- JS -->
+      <script src="//code.jquery.com/jquery-1.11.0.min.js" type="text/javascript"></script>
+      <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" type="text/javascript"></script>
     </body>
 </html>

Modified: mesos/site/publish/documentation/latest/tools/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/tools/index.html?rev=1742205&r1=1742204&r2=1742205&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/tools/index.html (original)
+++ mesos/site/publish/documentation/latest/tools/index.html Tue May  3 22:50:16 2016
@@ -3,76 +3,76 @@
     <head>
         <meta charset="utf-8">
         <title>Apache Mesos - Tools</title>
-		    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-		    <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
-		    <link rel="alternate" type="application/atom+xml" title="Apache Mesos Blog" href="/blog/feed.xml">
-		    
-		    <link href="../../../assets/css/main.css" media="screen" rel="stylesheet" type="text/css" />
-				
-		    
-			
-			<!-- Google Analytics Magic -->
-			<script type="text/javascript">
-			  var _gaq = _gaq || [];
-			  _gaq.push(['_setAccount', 'UA-20226872-1']);
-			  _gaq.push(['_setDomainName', 'apache.org']);
-			  _gaq.push(['_trackPageview']);
-
-			  (function() {
-			    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-			  })();
-			</script>
+        <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+        <link rel="alternate" type="application/atom+xml" title="Apache Mesos Blog" href="/blog/feed.xml">
+        
+        <link href="../../../assets/css/main.css" media="screen" rel="stylesheet" type="text/css" />
+
+        
+
+      <!-- Google Analytics Magic -->
+      <script type="text/javascript">
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-20226872-1']);
+        _gaq.push(['_setDomainName', 'apache.org']);
+        _gaq.push(['_trackPageview']);
+
+        (function() {
+          var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+          ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+          var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+        })();
+      </script>
     </head>
     <body>
-			<!-- magical breadcrumbs -->
-			<div class="topnav">
-			<ul class="breadcrumb">
-			  <li>
-					<div class="dropdown">
-					  <a data-toggle="dropdown" href="#">Apache Software Foundation <span class="caret"></span></a>
-					  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-							<li><a href="http://www.apache.org">Apache Homepage</a></li>
-							<li><a href="http://www.apache.org/licenses/">License</a></li>
-					  	<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>  
-					  	<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-							<li><a href="http://www.apache.org/security/">Security</a></li>
-					  </ul>
-					</div>
-				</li>
-				<li><a href="http://mesos.apache.org">Apache Mesos</a></li>
-				
-				
-					<li><a href="/documentation
+      <!-- magical breadcrumbs -->
+      <div class="topnav">
+      <ul class="breadcrumb">
+        <li>
+          <div class="dropdown">
+            <a data-toggle="dropdown" href="#">Apache Software Foundation <span class="caret"></span></a>
+            <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+              <li><a href="http://www.apache.org">Apache Homepage</a></li>
+              <li><a href="http://www.apache.org/licenses/">License</a></li>
+              <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+              <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              <li><a href="http://www.apache.org/security/">Security</a></li>
+            </ul>
+          </div>
+        </li>
+        <li><a href="http://mesos.apache.org">Apache Mesos</a></li>
+        
+        
+          <li><a href="/documentation
 /">Documentation
 </a></li>
-				
-				
-			</ul><!-- /breadcrumb -->
-			</div>
-			
-			<!-- navbar excitement -->
-	    <div class="navbar navbar-static-top" role="navigation">
-	      <div class="navbar-inner">
-	        <div class="container">
-						<a href="/" class="logo"><img src="/assets/img/mesos_logo.png" alt="Apache Mesos logo" /></a>
-					<div class="nav-collapse">
-						<ul class="nav nav-pills navbar-right">
-						  <li><a href="/gettingstarted/">Getting Started</a></li>
-						  <li><a href="/documentation/latest/">Documentation</a></li>
-						  <li><a href="/downloads/">Downloads</a></li>
-						  <li><a href="/community/">Community</a></li>
-						</ul>
-					</div>
-	        </div>
-	      </div>
-	    </div><!-- /.navbar -->
+        
+        
+      </ul><!-- /breadcrumb -->
+      </div>
+
+      <!-- navbar excitement -->
+      <div class="navbar navbar-static-top" role="navigation">
+        <div class="navbar-inner">
+          <div class="container">
+            <a href="/" class="logo"><img src="/assets/img/mesos_logo.png" alt="Apache Mesos logo" /></a>
+          <div class="nav-collapse">
+            <ul class="nav nav-pills navbar-right">
+              <li><a href="/gettingstarted/">Getting Started</a></li>
+              <li><a href="/documentation/latest/">Documentation</a></li>
+              <li><a href="/downloads/">Downloads</a></li>
+              <li><a href="/community/">Community</a></li>
+            </ul>
+          </div>
+          </div>
+        </div>
+      </div><!-- /.navbar -->
 
       <div class="container">
 
-			<div class="row-fluid">
+      <div class="row-fluid">
 	<div class="col-md-4">
 		<h4>If you're new to Mesos</h4>
 		<p>See the <a href="/gettingstarted/">getting started</a> page for more information about downloading, building, and deploying Mesos.</p>
@@ -116,19 +116,19 @@
 	</div>
 </div>
 
-			
-	      <hr>
 
-				<!-- footer -->
-	      <div class="footer">
-	        <p>&copy; 2012-2015 <a href="http://apache.org">The Apache Software Foundation</a>.
-	        Apache Mesos, the Apache feather logo, and the Apache Mesos project logo are trademarks of The Apache Software Foundation.<p>
-	      </div><!-- /footer -->
-
-	    </div> <!-- /container -->
-
-	    <!-- JS -->
-	    <script src="//code.jquery.com/jquery-1.11.0.min.js" type="text/javascript"></script>
-			<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" type="text/javascript"></script>
+        <hr>
+
+        <!-- footer -->
+        <div class="footer">
+          <p>&copy; 2012-2016 <a href="http://apache.org">The Apache Software Foundation</a>.
+          Apache Mesos, the Apache feather logo, and the Apache Mesos project logo are trademarks of The Apache Software Foundation.<p>
+        </div><!-- /footer -->
+
+      </div> <!-- /container -->
+
+      <!-- JS -->
+      <script src="//code.jquery.com/jquery-1.11.0.min.js" type="text/javascript"></script>
+      <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" type="text/javascript"></script>
     </body>
 </html>

Modified: mesos/site/publish/documentation/latest/upgrades/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/upgrades/index.html?rev=1742205&r1=1742204&r2=1742205&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/upgrades/index.html (original)
+++ mesos/site/publish/documentation/latest/upgrades/index.html Tue May  3 22:50:16 2016
@@ -3,76 +3,76 @@
     <head>
         <meta charset="utf-8">
         <title>Apache Mesos - Upgrading Mesos</title>
-		    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-		    <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
-		    <link rel="alternate" type="application/atom+xml" title="Apache Mesos Blog" href="/blog/feed.xml">
-		    
-		    <link href="../../../assets/css/main.css" media="screen" rel="stylesheet" type="text/css" />
-				
-		    
-			
-			<!-- Google Analytics Magic -->
-			<script type="text/javascript">
-			  var _gaq = _gaq || [];
-			  _gaq.push(['_setAccount', 'UA-20226872-1']);
-			  _gaq.push(['_setDomainName', 'apache.org']);
-			  _gaq.push(['_trackPageview']);
-
-			  (function() {
-			    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-			  })();
-			</script>
+        <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+        <link rel="alternate" type="application/atom+xml" title="Apache Mesos Blog" href="/blog/feed.xml">
+        
+        <link href="../../../assets/css/main.css" media="screen" rel="stylesheet" type="text/css" />
+
+        
+
+      <!-- Google Analytics Magic -->
+      <script type="text/javascript">
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-20226872-1']);
+        _gaq.push(['_setDomainName', 'apache.org']);
+        _gaq.push(['_trackPageview']);
+
+        (function() {
+          var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+          ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+          var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+        })();
+      </script>
     </head>
     <body>
-			<!-- magical breadcrumbs -->
-			<div class="topnav">
-			<ul class="breadcrumb">
-			  <li>
-					<div class="dropdown">
-					  <a data-toggle="dropdown" href="#">Apache Software Foundation <span class="caret"></span></a>
-					  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-							<li><a href="http://www.apache.org">Apache Homepage</a></li>
-							<li><a href="http://www.apache.org/licenses/">License</a></li>
-					  	<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>  
-					  	<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-							<li><a href="http://www.apache.org/security/">Security</a></li>
-					  </ul>
-					</div>
-				</li>
-				<li><a href="http://mesos.apache.org">Apache Mesos</a></li>
-				
-				
-					<li><a href="/documentation
+      <!-- magical breadcrumbs -->
+      <div class="topnav">
+      <ul class="breadcrumb">
+        <li>
+          <div class="dropdown">
+            <a data-toggle="dropdown" href="#">Apache Software Foundation <span class="caret"></span></a>
+            <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+              <li><a href="http://www.apache.org">Apache Homepage</a></li>
+              <li><a href="http://www.apache.org/licenses/">License</a></li>
+              <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+              <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              <li><a href="http://www.apache.org/security/">Security</a></li>
+            </ul>
+          </div>
+        </li>
+        <li><a href="http://mesos.apache.org">Apache Mesos</a></li>
+        
+        
+          <li><a href="/documentation
 /">Documentation
 </a></li>
-				
-				
-			</ul><!-- /breadcrumb -->
-			</div>
-			
-			<!-- navbar excitement -->
-	    <div class="navbar navbar-static-top" role="navigation">
-	      <div class="navbar-inner">
-	        <div class="container">
-						<a href="/" class="logo"><img src="/assets/img/mesos_logo.png" alt="Apache Mesos logo" /></a>
-					<div class="nav-collapse">
-						<ul class="nav nav-pills navbar-right">
-						  <li><a href="/gettingstarted/">Getting Started</a></li>
-						  <li><a href="/documentation/latest/">Documentation</a></li>
-						  <li><a href="/downloads/">Downloads</a></li>
-						  <li><a href="/community/">Community</a></li>
-						</ul>
-					</div>
-	        </div>
-	      </div>
-	    </div><!-- /.navbar -->
+        
+        
+      </ul><!-- /breadcrumb -->
+      </div>
+
+      <!-- navbar excitement -->
+      <div class="navbar navbar-static-top" role="navigation">
+        <div class="navbar-inner">
+          <div class="container">
+            <a href="/" class="logo"><img src="/assets/img/mesos_logo.png" alt="Apache Mesos logo" /></a>
+          <div class="nav-collapse">
+            <ul class="nav nav-pills navbar-right">
+              <li><a href="/gettingstarted/">Getting Started</a></li>
+              <li><a href="/documentation/latest/">Documentation</a></li>
+              <li><a href="/downloads/">Downloads</a></li>
+              <li><a href="/community/">Community</a></li>
+            </ul>
+          </div>
+          </div>
+        </div>
+      </div><!-- /.navbar -->
 
       <div class="container">
 
-			<div class="row-fluid">
+      <div class="row-fluid">
 	<div class="col-md-4">
 		<h4>If you're new to Mesos</h4>
 		<p>See the <a href="/gettingstarted/">getting started</a> page for more information about downloading, building, and deploying Mesos.</p>
@@ -122,6 +122,25 @@ R Removed feature/behavior
   </thead>
 <tr>
   <td style="word-wrap: break-word; overflow-wrap: break-word;"><!--Version-->
+  0.29.x
+  </td>
+  <td style="word-wrap: break-word; overflow-wrap: break-word;"><!--Mesos Core-->
+    <ul style="padding-left:10px;">
+      <li>CD <a href="#0-29-x-allocator-metrics">Allocator Metrics</a></li>
+      <li>D <a href="#0-29-x-credentials">--credential(s) (plain text format)</a></li>
+    </ul>
+  </td>
+  <td style="word-wrap: break-word; overflow-wrap: break-word;"><!--Flags-->
+  </td>
+  <td style="word-wrap: break-word; overflow-wrap: break-word;"><!--Framework API-->
+  </td>
+  <td style="word-wrap: break-word; overflow-wrap: break-word;"><!--Module API-->
+  </td>
+  <td style="word-wrap: break-word; overflow-wrap: break-word;"><!--Endpoints-->
+  </td>
+</tr>
+<tr>
+  <td style="word-wrap: break-word; overflow-wrap: break-word;"><!--Version-->
   0.28.x
   </td>
   <td style="word-wrap: break-word; overflow-wrap: break-word;"><!--Mesos Core-->
@@ -200,7 +219,7 @@ R Removed feature/behavior
   </td>
   <td style="word-wrap: break-word; overflow-wrap: break-word;"><!--Framework API-->
     <ul style="padding-left:10px;">
-      <li>C <a href="#0-25-x-scheduler-bindings">C++/Java/Python Scheduler Bindings</a></li?
+      <li>C <a href="#0-25-x-scheduler-bindings">C++/Java/Python Scheduler Bindings</a></li>
     </ul>
   </td>
   <td style="word-wrap: break-word; overflow-wrap: break-word;"><!--Module API-->
@@ -214,6 +233,32 @@ R Removed feature/behavior
 </table>
 
 
+<h2>Upgrading from 0.28.x to 0.29.x</h2>
+
+<p><a name="0-29-x-allocator-metrics"></a></p>
+
+<ul>
+<li>The allocator metric named <code>allocator/event_queue_dispatches</code> is now deprecated and will be removed with 0.30. The new name is <code>allocator/mesos/event_queue_dispatches</code> to better support metrics for alternative allocator implementations.</li>
+</ul>
+
+
+<p><a name="0-29-x-credentials"></a>
+* Mesos 0.29 deprecates the use of plain text credential files in favor of JSON-formatted credential files.</p>
+
+<ul>
+<li><p>When a persistent volume is destroyed, Mesos will now remove any data that was stored on the volume from the filesystem of the appropriate slave. In prior versions of Mesos, destroying a volume would not delete data (this was a known missing feature that has now been implemented).</p></li>
+<li><p>Mesos 0.29 changes the HTTP status code of the following endpoints from <code>200 OK</code> to <code>202 Accepted</code>:</p>
+
+<ul>
+<li><code>/reserve</code></li>
+<li><code>/unreserve</code></li>
+<li><code>/create-volumes</code></li>
+<li><code>/destroy-volumes</code></li>
+</ul>
+</li>
+</ul>
+
+
 <h2>Upgrading from 0.27.x to 0.28.x</h2>
 
 <p><a name="0-28-x-resource-precision"></a></p>
@@ -712,19 +757,19 @@ Restart the masters with &ndash;authenti
 	</div>
 </div>
 
-			
-	      <hr>
 
-				<!-- footer -->
-	      <div class="footer">
-	        <p>&copy; 2012-2015 <a href="http://apache.org">The Apache Software Foundation</a>.
-	        Apache Mesos, the Apache feather logo, and the Apache Mesos project logo are trademarks of The Apache Software Foundation.<p>
-	      </div><!-- /footer -->
-
-	    </div> <!-- /container -->
-
-	    <!-- JS -->
-	    <script src="//code.jquery.com/jquery-1.11.0.min.js" type="text/javascript"></script>
-			<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" type="text/javascript"></script>
+        <hr>
+
+        <!-- footer -->
+        <div class="footer">
+          <p>&copy; 2012-2016 <a href="http://apache.org">The Apache Software Foundation</a>.
+          Apache Mesos, the Apache feather logo, and the Apache Mesos project logo are trademarks of The Apache Software Foundation.<p>
+        </div><!-- /footer -->
+
+      </div> <!-- /container -->
+
+      <!-- JS -->
+      <script src="//code.jquery.com/jquery-1.11.0.min.js" type="text/javascript"></script>
+      <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" type="text/javascript"></script>
     </body>
 </html>

Modified: mesos/site/publish/documentation/latest/versioning/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/versioning/index.html?rev=1742205&r1=1742204&r2=1742205&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/versioning/index.html (original)
+++ mesos/site/publish/documentation/latest/versioning/index.html Tue May  3 22:50:16 2016
@@ -2,77 +2,77 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <title>Apache Mesos - Versioning</title>
-		    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Apache Mesos - Release and Support policy</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-		    <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
-		    <link rel="alternate" type="application/atom+xml" title="Apache Mesos Blog" href="/blog/feed.xml">
-		    
-		    <link href="../../../assets/css/main.css" media="screen" rel="stylesheet" type="text/css" />
-				
-		    
-			
-			<!-- Google Analytics Magic -->
-			<script type="text/javascript">
-			  var _gaq = _gaq || [];
-			  _gaq.push(['_setAccount', 'UA-20226872-1']);
-			  _gaq.push(['_setDomainName', 'apache.org']);
-			  _gaq.push(['_trackPageview']);
-
-			  (function() {
-			    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-			  })();
-			</script>
+        <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+        <link rel="alternate" type="application/atom+xml" title="Apache Mesos Blog" href="/blog/feed.xml">
+        
+        <link href="../../../assets/css/main.css" media="screen" rel="stylesheet" type="text/css" />
+
+        
+
+      <!-- Google Analytics Magic -->
+      <script type="text/javascript">
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-20226872-1']);
+        _gaq.push(['_setDomainName', 'apache.org']);
+        _gaq.push(['_trackPageview']);
+
+        (function() {
+          var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+          ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+          var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+        })();
+      </script>
     </head>
     <body>
-			<!-- magical breadcrumbs -->
-			<div class="topnav">
-			<ul class="breadcrumb">
-			  <li>
-					<div class="dropdown">
-					  <a data-toggle="dropdown" href="#">Apache Software Foundation <span class="caret"></span></a>
-					  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-							<li><a href="http://www.apache.org">Apache Homepage</a></li>
-							<li><a href="http://www.apache.org/licenses/">License</a></li>
-					  	<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>  
-					  	<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-							<li><a href="http://www.apache.org/security/">Security</a></li>
-					  </ul>
-					</div>
-				</li>
-				<li><a href="http://mesos.apache.org">Apache Mesos</a></li>
-				
-				
-					<li><a href="/documentation
+      <!-- magical breadcrumbs -->
+      <div class="topnav">
+      <ul class="breadcrumb">
+        <li>
+          <div class="dropdown">
+            <a data-toggle="dropdown" href="#">Apache Software Foundation <span class="caret"></span></a>
+            <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+              <li><a href="http://www.apache.org">Apache Homepage</a></li>
+              <li><a href="http://www.apache.org/licenses/">License</a></li>
+              <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+              <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              <li><a href="http://www.apache.org/security/">Security</a></li>
+            </ul>
+          </div>
+        </li>
+        <li><a href="http://mesos.apache.org">Apache Mesos</a></li>
+        
+        
+          <li><a href="/documentation
 /">Documentation
 </a></li>
-				
-				
-			</ul><!-- /breadcrumb -->
-			</div>
-			
-			<!-- navbar excitement -->
-	    <div class="navbar navbar-static-top" role="navigation">
-	      <div class="navbar-inner">
-	        <div class="container">
-						<a href="/" class="logo"><img src="/assets/img/mesos_logo.png" alt="Apache Mesos logo" /></a>
-					<div class="nav-collapse">
-						<ul class="nav nav-pills navbar-right">
-						  <li><a href="/gettingstarted/">Getting Started</a></li>
-						  <li><a href="/documentation/latest/">Documentation</a></li>
-						  <li><a href="/downloads/">Downloads</a></li>
-						  <li><a href="/community/">Community</a></li>
-						</ul>
-					</div>
-	        </div>
-	      </div>
-	    </div><!-- /.navbar -->
+        
+        
+      </ul><!-- /breadcrumb -->
+      </div>
+
+      <!-- navbar excitement -->
+      <div class="navbar navbar-static-top" role="navigation">
+        <div class="navbar-inner">
+          <div class="container">
+            <a href="/" class="logo"><img src="/assets/img/mesos_logo.png" alt="Apache Mesos logo" /></a>
+          <div class="nav-collapse">
+            <ul class="nav nav-pills navbar-right">
+              <li><a href="/gettingstarted/">Getting Started</a></li>
+              <li><a href="/documentation/latest/">Documentation</a></li>
+              <li><a href="/downloads/">Downloads</a></li>
+              <li><a href="/community/">Community</a></li>
+            </ul>
+          </div>
+          </div>
+        </div>
+      </div><!-- /.navbar -->
 
       <div class="container">
 
-			<div class="row-fluid">
+      <div class="row-fluid">
 	<div class="col-md-4">
 		<h4>If you're new to Mesos</h4>
 		<p>See the <a href="/gettingstarted/">getting started</a> page for more information about downloading, building, and deploying Mesos.</p>
@@ -81,9 +81,9 @@
 		<p>See our <a href="/community/">community</a> page for more details.</p>
 	</div>
 	<div class="col-md-8">
-		<h1>Mesos Versioning</h1>
+		<h1>Mesos Release and Support policy</h1>
 
-<p>The Mesos API and release versioning policy gives operators and developers clear guidelines on:</p>
+<p>The Mesos versioning and release policy gives operators and developers clear guidelines on:</p>
 
 <ul>
 <li>Making modifications to the existing APIs without affecting backward compatibility.</li>
@@ -92,17 +92,58 @@
 </ul>
 
 
-<p>API versioning was introduced in Mesos 0.24.0 and this scheme only applies to Mesos 1.0.0 and higher.</p>
+<p>This document describes the release strategy for Mesos post 1.0.0 release. This might not be applicable for pre 1.0 releases, though parts of the strategy (e.g., release cadence) might be tested for in pre 1.0 releases.</p>
 
-<h2>Terminology</h2>
+<h2>Release Schedule</h2>
+
+<p>Mesos releases are time based and not feature based. This gives users and developers a predictable cadence to consume and produce features.</p>
+
+<p>If a feature is not ready by the time a release is cut, that feature should be disabled. This means that features should be developed in such a way that they are opt-in by default and can be easily disabled (e.g., flag). A feature completion should not typically block a release.</p>
+
+<p>A new Mesos release is cut every <strong>2 months</strong>. The versioning scheme is <a href="http://semver.org">SemVer</a>. Typically, the minor release version is incremented by 1 (e.g., 1.1, 1.2, 1.3 etc) for every release, unless it is a major release.</p>
+
+<p>Every (minor) release is a stable release and recommended for production use. This means a release candidate will go through rigorous testing (unit tests, integration tests, benchmark tests, cluster tests, scalability etc) before being officially released. In the rare case that a regular release is not deemed stable, a patch release will be released that will stabilize it.</p>
+
+<p>Every (minor) release is supported for a period of <strong>6 months</strong>. Support means fixing of <em>critical issues</em> that affect the release. Once a release reaches End Of Life (i.e., support period has ended) no more patch releases will be made for that release. Note that this is not related to backwards compatibility guarantees and deprecation periods (discussed later).</p>
+
+<p>Which issues are considered critical?</p>
+
+<ul>
+<li>Security fixes</li>
+<li>Compatibility regressions</li>
+<li>Functional regressions</li>
+<li>Performance regressions</li>
+<li>Fixes for 3rd party integration (e.g., Docker remote API)</li>
+</ul>
+
+
+<p>Whether an issue is considered critical or not is sometimes subjective. In some cases it is obvious and sometimes it is fuzzy. Users should work with committers to figure out the criticality of an issue and get agreement and commitment for support.</p>
+
+<p>Once an issue is deemed critical, it will be fixed in only those <strong>affected</strong> releases that are still <strong>supported</strong>. This is called a patch release and increments the patch version by 1 (e.g., 1.2.1).</p>
+
+<p>Patch releases are normally done once <strong>a month</strong>.</p>
+
+<p>If a particular issue is affecting a user and the user cannot wait until the next scheduled patch release, he/she can request an off-schedule patch release for a specific supported version. This should be done by sending an email to the dev list.</p>
+
+<h2>Upgrades</h2>
+
+<p>All stable releases will be loosely compatible. Loose compatibility means:</p>
 
 <ul>
-<li><strong>Release Versioning</strong>: This refers to the version of Mesos that is being released. It is of the form <strong>Mesos X.Y.Z</strong> (X is the major version, Y is the minor version, and Z is the patch version).</li>
-<li><strong>API Versioning</strong>: This refers to the version of the Mesos API. It is of the form <strong>vX</strong> (X is the major version).</li>
+<li>Master or agent can be upgraded to a new release version as long as they or the ecosystem components (scheduler, executor, zookeeper, service discovery layer, monitoring etc) do not depend on deprecated features (e.g., deprecated flags, deprecated metrics).</li>
+<li>There should be no unexpected effect on externally visible behavior that is not deprecated. See API compatibility section for what should be expected for Mesos APIs.</li>
 </ul>
 
 
-<h2>How does it work?</h2>
+<blockquote><p>NOTE: The compatibility guarantees do not apply to modules yet. See Modules section below for details.</p></blockquote>
+
+<p>Note that this means users should be able to upgrade (as long as they are not depending on deprecated / removed features) Mesos master or agent from a stable release version N directly to another stable release version M without having to go through intermediate release versions. For the purposes of upgrades, a stable release means the release with the latest patch version. For example, among 1.2.0, 1.2.1, 1.3.0, 1.4.0, 1.4.1 releases 1.2.1, 1.3.0 and 1.4.1 are considered stable and so a user should be able to upgrade from 1.2.1 directly to 1.4.1. Look at the API compatability section below for how frameworks can do seamless upgrades.</p>
+
+<p>The deprecation period for any given feature will be <strong>6 months</strong>. Having a set period allows Mesos developers to not indefinitely accrue technical debt and allows users time to plan for upgrades.</p>
+
+<p>The detailed information about upgrading to a particular Mesos version would be posted <a href="/documentation/latest/./upgrades/">here</a>.</p>
+
+<h2>API versioning</h2>
 
 <p>The Mesos APIs (constituting Scheduler, Executor, Internal, Operator/Admin APIs) will have a version in the URL. The versioned URL will have a prefix of <strong><code>/api/vN</code></strong> where &ldquo;N&rdquo; is the version of the API. The &ldquo;/api&rdquo; prefix is chosen to distinguish API resources from Web UI paths.</p>
 
@@ -129,12 +170,9 @@
 <li>For example, v2 of the API might be introduced in Mesos 1.12.0 release but it is only considered stable in Mesos 1.21.0 release if it is the last release of “1” series. Note that all Mesos 1.x.y versions will still support v1 of the API.</li>
 <li>The API version is only bumped if we need to make a backwards <a href="#api-compatibility">incompatible</a> API change. We will strive to support a given API version for at least a year.</li>
 <li>The deprecation clock for vN-1 API will start as soon as we release “N.0.0” version of Mesos. We will strive to give enough time (e.g., 6 months) for frameworks/operators to upgrade to vN API before we stop supporting vN-1 API.</li>
-<li>Minor release version is bumped roughly on a monthly cycle to give a cadence of new features to users.</li>
 </ul>
 
 
-<p>NOTE: Presently, for &ldquo;0.X.Y&rdquo; releases i.e. till we reach &ldquo;1.0.0&rdquo;, we wait for at least 6 monthly releases before deprecating functionality. So, functionality that has been deprecated in 0.26.0 can be safely removed in 0.32.0.</p>
-
 <h3>API Compatibility</h3>
 
 <p>The API compatibility is determined by the corresponding protobuf guarantees.</p>
@@ -161,19 +199,19 @@
 </ul>
 
 
-<h2>Upgrades</h2>
+<h2>Implementation Details</h2>
 
-<ul>
-<li>The master and agent are typically compatible as long as they are running the same major version.</li>
-<li>For example, 1.3.0 master is compatible with 1.13.0 agent.</li>
-<li>In rare cases, we might require the master and agent to go through a specific minor version for upgrades.</li>
-<li>For example, we might require that a 1.1.0 master (and/or agent) be upgraded to 1.8.0 before it can be upgraded to 1.9.0 or later versions.</li>
-</ul>
+<h3>Release branches</h3>
 
+<p>For regular releases, the work is done on the master branch. There are no feature branches but there will be release branches.</p>
 
-<p>The detailed information about upgrading to a particular Mesos version would be posted <a href="/documentation/latest/./upgrades/">here</a>.</p>
+<p>When it is time to cut a minor release, a new branch (e.g., 1.2.x) is created off the master branch. We chose ‘x’ instead of patch release number to disambiguate branch names from tag names. Then the first RC (-rc1) is tagged on the release branch. Subsequent RCs, in case the previous RCs fail testing, should be tagged on the release branch.</p>
 
-<h3>Implementation Details</h3>
+<p>Patch releases are also based off the release branches. Typically the fix for an issue that is affecting supported releases lands on the master branch and is then backported to the release branch(es). In rare cases, the fix might directly go into a release branch without landing on master (e.g.,  fix / issue is not applicable to master).</p>
+
+<p>Having a branch for each minor release reduces the amount of work a release manager needs to do when it is time to do a release. It is the responsibility of the committer of a fix to commit it to all the affecting release branches. This is important because the committer has more context about the issue / fix at the time of the commit than a release manager at the time of release. The release manager of a minor release will be responsible for all its patch releases as well. Just like the master branch, history rewrites are not allowed in the release branch (i.e., no git push &ndash;force).</p>
+
+<h3>API protobufs</h3>
 
 <p>Most APIs in Mesos accept protobuf messages with a corresponding JSON field mapping. To support multiple versions of the API, we decoupled the versioned protobufs backing the API from the “internal” protobufs used by the Mesos code.</p>
 
@@ -184,7 +222,7 @@
 package mesos.v1.scheduler;
 option java_package = "org.apache.mesos.v1.scheduler";
 option java_outer_classname = "Protos";
-…
+...
 </code></pre>
 
 <p>The corresponding internal protobufs for the Scheduler API are located at:</p>
@@ -194,7 +232,7 @@ option java_outer_classname = "Protos";
 package mesos.scheduler;
 option java_package = "org.apache.mesos.scheduler";
 option java_outer_classname = "Protos";
-…
+...
 </code></pre>
 
 <p>The users of the API send requests (and receive responses) based on the versioned protobufs. We implemented <a href="https://github.com/apache/mesos/blob/master/src/internal/evolve.hpp">evolve</a>/<a href="https://github.com/apache/mesos/blob/master/src/internal/devolve.hpp">devolve</a> converters that can convert protobufs from any supported version to the internal protobuf and vice versa.</p>
@@ -204,19 +242,19 @@ option java_outer_classname = "Protos";
 	</div>
 </div>
 
-			
-	      <hr>
 
-				<!-- footer -->
-	      <div class="footer">
-	        <p>&copy; 2012-2015 <a href="http://apache.org">The Apache Software Foundation</a>.
-	        Apache Mesos, the Apache feather logo, and the Apache Mesos project logo are trademarks of The Apache Software Foundation.<p>
-	      </div><!-- /footer -->
-
-	    </div> <!-- /container -->
-
-	    <!-- JS -->
-	    <script src="//code.jquery.com/jquery-1.11.0.min.js" type="text/javascript"></script>
-			<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" type="text/javascript"></script>
+        <hr>
+
+        <!-- footer -->
+        <div class="footer">
+          <p>&copy; 2012-2016 <a href="http://apache.org">The Apache Software Foundation</a>.
+          Apache Mesos, the Apache feather logo, and the Apache Mesos project logo are trademarks of The Apache Software Foundation.<p>
+        </div><!-- /footer -->
+
+      </div> <!-- /container -->
+
+      <!-- JS -->
+      <script src="//code.jquery.com/jquery-1.11.0.min.js" type="text/javascript"></script>
+      <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" type="text/javascript"></script>
     </body>
 </html>

Modified: mesos/site/publish/documentation/latest/weights/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/weights/index.html?rev=1742205&r1=1742204&r2=1742205&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/weights/index.html (original)
+++ mesos/site/publish/documentation/latest/weights/index.html Tue May  3 22:50:16 2016
@@ -3,76 +3,76 @@
     <head>
         <meta charset="utf-8">
         <title></title>
-		    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-		    <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
-		    <link rel="alternate" type="application/atom+xml" title="Apache Mesos Blog" href="/blog/feed.xml">
-		    
-		    <link href="../../../assets/css/main.css" media="screen" rel="stylesheet" type="text/css" />
-				
-		    
-			
-			<!-- Google Analytics Magic -->
-			<script type="text/javascript">
-			  var _gaq = _gaq || [];
-			  _gaq.push(['_setAccount', 'UA-20226872-1']);
-			  _gaq.push(['_setDomainName', 'apache.org']);
-			  _gaq.push(['_trackPageview']);
-
-			  (function() {
-			    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-			  })();
-			</script>
+        <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+        <link rel="alternate" type="application/atom+xml" title="Apache Mesos Blog" href="/blog/feed.xml">
+        
+        <link href="../../../assets/css/main.css" media="screen" rel="stylesheet" type="text/css" />
+
+        
+
+      <!-- Google Analytics Magic -->
+      <script type="text/javascript">
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-20226872-1']);
+        _gaq.push(['_setDomainName', 'apache.org']);
+        _gaq.push(['_trackPageview']);
+
+        (function() {
+          var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+          ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+          var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+        })();
+      </script>
     </head>
     <body>
-			<!-- magical breadcrumbs -->
-			<div class="topnav">
-			<ul class="breadcrumb">
-			  <li>
-					<div class="dropdown">
-					  <a data-toggle="dropdown" href="#">Apache Software Foundation <span class="caret"></span></a>
-					  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-							<li><a href="http://www.apache.org">Apache Homepage</a></li>
-							<li><a href="http://www.apache.org/licenses/">License</a></li>
-					  	<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>  
-					  	<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-							<li><a href="http://www.apache.org/security/">Security</a></li>
-					  </ul>
-					</div>
-				</li>
-				<li><a href="http://mesos.apache.org">Apache Mesos</a></li>
-				
-				
-					<li><a href="/documentation
+      <!-- magical breadcrumbs -->
+      <div class="topnav">
+      <ul class="breadcrumb">
+        <li>
+          <div class="dropdown">
+            <a data-toggle="dropdown" href="#">Apache Software Foundation <span class="caret"></span></a>
+            <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+              <li><a href="http://www.apache.org">Apache Homepage</a></li>
+              <li><a href="http://www.apache.org/licenses/">License</a></li>
+              <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+              <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              <li><a href="http://www.apache.org/security/">Security</a></li>
+            </ul>
+          </div>
+        </li>
+        <li><a href="http://mesos.apache.org">Apache Mesos</a></li>
+        
+        
+          <li><a href="/documentation
 /">Documentation
 </a></li>
-				
-				
-			</ul><!-- /breadcrumb -->
-			</div>
-			
-			<!-- navbar excitement -->
-	    <div class="navbar navbar-static-top" role="navigation">
-	      <div class="navbar-inner">
-	        <div class="container">
-						<a href="/" class="logo"><img src="/assets/img/mesos_logo.png" alt="Apache Mesos logo" /></a>
-					<div class="nav-collapse">
-						<ul class="nav nav-pills navbar-right">
-						  <li><a href="/gettingstarted/">Getting Started</a></li>
-						  <li><a href="/documentation/latest/">Documentation</a></li>
-						  <li><a href="/downloads/">Downloads</a></li>
-						  <li><a href="/community/">Community</a></li>
-						</ul>
-					</div>
-	        </div>
-	      </div>
-	    </div><!-- /.navbar -->
+        
+        
+      </ul><!-- /breadcrumb -->
+      </div>
+
+      <!-- navbar excitement -->
+      <div class="navbar navbar-static-top" role="navigation">
+        <div class="navbar-inner">
+          <div class="container">
+            <a href="/" class="logo"><img src="/assets/img/mesos_logo.png" alt="Apache Mesos logo" /></a>
+          <div class="nav-collapse">
+            <ul class="nav nav-pills navbar-right">
+              <li><a href="/gettingstarted/">Getting Started</a></li>
+              <li><a href="/documentation/latest/">Documentation</a></li>
+              <li><a href="/downloads/">Downloads</a></li>
+              <li><a href="/community/">Community</a></li>
+            </ul>
+          </div>
+          </div>
+        </div>
+      </div><!-- /.navbar -->
 
       <div class="container">
 
-			<div class="row-fluid">
+      <div class="row-fluid">
 	<div class="col-md-4">
 		<h4>If you're new to Mesos</h4>
 		<p>See the <a href="/gettingstarted/">getting started</a> page for more information about downloading, building, and deploying Mesos.</p>
@@ -98,13 +98,25 @@ is deprecated.</p>
 
 <h1>Operator HTTP Endpoint</h1>
 
-<p>The master <code>/weights</code> HTTP endpoint enables operators to update weights. The
-endpoint currently offers a REST-like interface and only supports update
-requests using PUT.</p>
+<p>The master <code>/weights</code> HTTP endpoint enables operators to configure weights. The
+endpoint currently offers a REST-like interface and supports the following operations:</p>
+
+<ul>
+<li><a href="#putRequest">Updating</a> weights with PUT.</li>
+<li><a href="#getRequest">Querying</a> the currently set weights with GET.</li>
+</ul>
+
 
 <p>The endpoint can optionally use authentication and authorization. See the
 <a href="/documentation/latest/./authentication/">authentication guide</a> for details.</p>
 
+<p><a name="putRequest"></a></p>
+
+<h2>Update</h2>
+
+<p>The operator can update the weights by sending an HTTP PUT request to the <code>/weights</code>
+endpoint.</p>
+
 <p>An example request to the <code>/weights</code> endpoint could look like this (using the
 JSON definitions below):</p>
 
@@ -144,22 +156,55 @@ the registry value instead.</p>
 </ul>
 
 
+<p><a name="getRequest"></a></p>
+
+<h2>Query</h2>
+
+<p>The operator can query the configured weights by sending an HTTP GET request
+to the <code>/weights</code> endpoint.</p>
+
+<pre><code>$ curl -X GET http://&lt;master-ip&gt;:&lt;port&gt;/weights
+</code></pre>
+
+<p>The response message body includes a JSON representation of the current
+configured weights, for example:</p>
+
+<pre><code>    [
+      {
+        "role": "role2",
+        "weight": 3.5
+      },
+      {
+        "role": "role1",
+        "weight": 2.0
+      }
+    ]
+</code></pre>
+
+<p>The operator will receive one of the following HTTP response codes:</p>
+
+<ul>
+<li><code>200 OK</code>: Success.</li>
+<li><code>401 Unauthorized</code>: Unauthenticated request.</li>
+</ul>
+
+
 	</div>
 </div>
 
-			
-	      <hr>
 
-				<!-- footer -->
-	      <div class="footer">
-	        <p>&copy; 2012-2015 <a href="http://apache.org">The Apache Software Foundation</a>.
-	        Apache Mesos, the Apache feather logo, and the Apache Mesos project logo are trademarks of The Apache Software Foundation.<p>
-	      </div><!-- /footer -->
-
-	    </div> <!-- /container -->
-
-	    <!-- JS -->
-	    <script src="//code.jquery.com/jquery-1.11.0.min.js" type="text/javascript"></script>
-			<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" type="text/javascript"></script>
+        <hr>
+
+        <!-- footer -->
+        <div class="footer">
+          <p>&copy; 2012-2016 <a href="http://apache.org">The Apache Software Foundation</a>.
+          Apache Mesos, the Apache feather logo, and the Apache Mesos project logo are trademarks of The Apache Software Foundation.<p>
+        </div><!-- /footer -->
+
+      </div> <!-- /container -->
+
+      <!-- JS -->
+      <script src="//code.jquery.com/jquery-1.11.0.min.js" type="text/javascript"></script>
+      <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" type="text/javascript"></script>
     </body>
 </html>

Modified: mesos/site/publish/documentation/logging/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/logging/index.html?rev=1742205&r1=1742204&r2=1742205&view=diff
==============================================================================
--- mesos/site/publish/documentation/logging/index.html (original)
+++ mesos/site/publish/documentation/logging/index.html Tue May  3 22:50:16 2016
@@ -3,76 +3,76 @@
     <head>
         <meta charset="utf-8">
         <title>Apache Mesos - Logging</title>
-		    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-		    <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
-		    <link rel="alternate" type="application/atom+xml" title="Apache Mesos Blog" href="/blog/feed.xml">
-		    
-		    <link href="../../assets/css/main.css" media="screen" rel="stylesheet" type="text/css" />
-				
-		    
-			
-			<!-- Google Analytics Magic -->
-			<script type="text/javascript">
-			  var _gaq = _gaq || [];
-			  _gaq.push(['_setAccount', 'UA-20226872-1']);
-			  _gaq.push(['_setDomainName', 'apache.org']);
-			  _gaq.push(['_trackPageview']);
-
-			  (function() {
-			    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-			  })();
-			</script>
+        <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+        <link rel="alternate" type="application/atom+xml" title="Apache Mesos Blog" href="/blog/feed.xml">
+        
+        <link href="../../assets/css/main.css" media="screen" rel="stylesheet" type="text/css" />
+
+        
+
+      <!-- Google Analytics Magic -->
+      <script type="text/javascript">
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-20226872-1']);
+        _gaq.push(['_setDomainName', 'apache.org']);
+        _gaq.push(['_trackPageview']);
+
+        (function() {
+          var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+          ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+          var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+        })();
+      </script>
     </head>
     <body>
-			<!-- magical breadcrumbs -->
-			<div class="topnav">
-			<ul class="breadcrumb">
-			  <li>
-					<div class="dropdown">
-					  <a data-toggle="dropdown" href="#">Apache Software Foundation <span class="caret"></span></a>
-					  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-							<li><a href="http://www.apache.org">Apache Homepage</a></li>
-							<li><a href="http://www.apache.org/licenses/">License</a></li>
-					  	<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>  
-					  	<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-							<li><a href="http://www.apache.org/security/">Security</a></li>
-					  </ul>
-					</div>
-				</li>
-				<li><a href="http://mesos.apache.org">Apache Mesos</a></li>
-				
-				
-					<li><a href="/documentation
+      <!-- magical breadcrumbs -->
+      <div class="topnav">
+      <ul class="breadcrumb">
+        <li>
+          <div class="dropdown">
+            <a data-toggle="dropdown" href="#">Apache Software Foundation <span class="caret"></span></a>
+            <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+              <li><a href="http://www.apache.org">Apache Homepage</a></li>
+              <li><a href="http://www.apache.org/licenses/">License</a></li>
+              <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+              <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              <li><a href="http://www.apache.org/security/">Security</a></li>
+            </ul>
+          </div>
+        </li>
+        <li><a href="http://mesos.apache.org">Apache Mesos</a></li>
+        
+        
+          <li><a href="/documentation
 /">Documentation
 </a></li>
-				
-				
-			</ul><!-- /breadcrumb -->
-			</div>
-			
-			<!-- navbar excitement -->
-	    <div class="navbar navbar-static-top" role="navigation">
-	      <div class="navbar-inner">
-	        <div class="container">
-						<a href="/" class="logo"><img src="/assets/img/mesos_logo.png" alt="Apache Mesos logo" /></a>
-					<div class="nav-collapse">
-						<ul class="nav nav-pills navbar-right">
-						  <li><a href="/gettingstarted/">Getting Started</a></li>
-						  <li><a href="/documentation/latest/">Documentation</a></li>
-						  <li><a href="/downloads/">Downloads</a></li>
-						  <li><a href="/community/">Community</a></li>
-						</ul>
-					</div>
-	        </div>
-	      </div>
-	    </div><!-- /.navbar -->
+        
+        
+      </ul><!-- /breadcrumb -->
+      </div>
+
+      <!-- navbar excitement -->
+      <div class="navbar navbar-static-top" role="navigation">
+        <div class="navbar-inner">
+          <div class="container">
+            <a href="/" class="logo"><img src="/assets/img/mesos_logo.png" alt="Apache Mesos logo" /></a>
+          <div class="nav-collapse">
+            <ul class="nav nav-pills navbar-right">
+              <li><a href="/gettingstarted/">Getting Started</a></li>
+              <li><a href="/documentation/latest/">Documentation</a></li>
+              <li><a href="/downloads/">Downloads</a></li>
+              <li><a href="/community/">Community</a></li>
+            </ul>
+          </div>
+          </div>
+        </div>
+      </div><!-- /.navbar -->
 
       <div class="container">
 
-			<div class="row-fluid">
+      <div class="row-fluid">
 	<div class="col-md-4">
 		<h4>If you're new to Mesos</h4>
 		<p>See the <a href="/gettingstarted/">getting started</a> page for more information about downloading, building, and deploying Mesos.</p>
@@ -288,19 +288,19 @@ type of <code>ContainerLogger</code>.</l
 	</div>
 </div>
 
-			
-	      <hr>
 
-				<!-- footer -->
-	      <div class="footer">
-	        <p>&copy; 2012-2015 <a href="http://apache.org">The Apache Software Foundation</a>.
-	        Apache Mesos, the Apache feather logo, and the Apache Mesos project logo are trademarks of The Apache Software Foundation.<p>
-	      </div><!-- /footer -->
-
-	    </div> <!-- /container -->
-
-	    <!-- JS -->
-	    <script src="//code.jquery.com/jquery-1.11.0.min.js" type="text/javascript"></script>
-			<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" type="text/javascript"></script>
+        <hr>
+
+        <!-- footer -->
+        <div class="footer">
+          <p>&copy; 2012-2016 <a href="http://apache.org">The Apache Software Foundation</a>.
+          Apache Mesos, the Apache feather logo, and the Apache Mesos project logo are trademarks of The Apache Software Foundation.<p>
+        </div><!-- /footer -->
+
+      </div> <!-- /container -->
+
+      <!-- JS -->
+      <script src="//code.jquery.com/jquery-1.11.0.min.js" type="text/javascript"></script>
+      <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" type="text/javascript"></script>
     </body>
 </html>

Modified: mesos/site/publish/documentation/maintenance/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/maintenance/index.html?rev=1742205&r1=1742204&r2=1742205&view=diff
==============================================================================
--- mesos/site/publish/documentation/maintenance/index.html (original)
+++ mesos/site/publish/documentation/maintenance/index.html Tue May  3 22:50:16 2016
@@ -3,76 +3,76 @@
     <head>
         <meta charset="utf-8">
         <title>Apache Mesos - Maintenance Primitives</title>
-		    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-		    <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
-		    <link rel="alternate" type="application/atom+xml" title="Apache Mesos Blog" href="/blog/feed.xml">
-		    
-		    <link href="../../assets/css/main.css" media="screen" rel="stylesheet" type="text/css" />
-				
-		    
-			
-			<!-- Google Analytics Magic -->
-			<script type="text/javascript">
-			  var _gaq = _gaq || [];
-			  _gaq.push(['_setAccount', 'UA-20226872-1']);
-			  _gaq.push(['_setDomainName', 'apache.org']);
-			  _gaq.push(['_trackPageview']);
-
-			  (function() {
-			    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-			  })();
-			</script>
+        <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+        <link rel="alternate" type="application/atom+xml" title="Apache Mesos Blog" href="/blog/feed.xml">
+        
+        <link href="../../assets/css/main.css" media="screen" rel="stylesheet" type="text/css" />
+
+        
+
+      <!-- Google Analytics Magic -->
+      <script type="text/javascript">
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-20226872-1']);
+        _gaq.push(['_setDomainName', 'apache.org']);
+        _gaq.push(['_trackPageview']);
+
+        (function() {
+          var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+          ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+          var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+        })();
+      </script>
     </head>
     <body>
-			<!-- magical breadcrumbs -->
-			<div class="topnav">
-			<ul class="breadcrumb">
-			  <li>
-					<div class="dropdown">
-					  <a data-toggle="dropdown" href="#">Apache Software Foundation <span class="caret"></span></a>
-					  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-							<li><a href="http://www.apache.org">Apache Homepage</a></li>
-							<li><a href="http://www.apache.org/licenses/">License</a></li>
-					  	<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>  
-					  	<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-							<li><a href="http://www.apache.org/security/">Security</a></li>
-					  </ul>
-					</div>
-				</li>
-				<li><a href="http://mesos.apache.org">Apache Mesos</a></li>
-				
-				
-					<li><a href="/documentation
+      <!-- magical breadcrumbs -->
+      <div class="topnav">
+      <ul class="breadcrumb">
+        <li>
+          <div class="dropdown">
+            <a data-toggle="dropdown" href="#">Apache Software Foundation <span class="caret"></span></a>
+            <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+              <li><a href="http://www.apache.org">Apache Homepage</a></li>
+              <li><a href="http://www.apache.org/licenses/">License</a></li>
+              <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+              <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+              <li><a href="http://www.apache.org/security/">Security</a></li>
+            </ul>
+          </div>
+        </li>
+        <li><a href="http://mesos.apache.org">Apache Mesos</a></li>
+        
+        
+          <li><a href="/documentation
 /">Documentation
 </a></li>
-				
-				
-			</ul><!-- /breadcrumb -->
-			</div>
-			
-			<!-- navbar excitement -->
-	    <div class="navbar navbar-static-top" role="navigation">
-	      <div class="navbar-inner">
-	        <div class="container">
-						<a href="/" class="logo"><img src="/assets/img/mesos_logo.png" alt="Apache Mesos logo" /></a>
-					<div class="nav-collapse">
-						<ul class="nav nav-pills navbar-right">
-						  <li><a href="/gettingstarted/">Getting Started</a></li>
-						  <li><a href="/documentation/latest/">Documentation</a></li>
-						  <li><a href="/downloads/">Downloads</a></li>
-						  <li><a href="/community/">Community</a></li>
-						</ul>
-					</div>
-	        </div>
-	      </div>
-	    </div><!-- /.navbar -->
+        
+        
+      </ul><!-- /breadcrumb -->
+      </div>
+
+      <!-- navbar excitement -->
+      <div class="navbar navbar-static-top" role="navigation">
+        <div class="navbar-inner">
+          <div class="container">
+            <a href="/" class="logo"><img src="/assets/img/mesos_logo.png" alt="Apache Mesos logo" /></a>
+          <div class="nav-collapse">
+            <ul class="nav nav-pills navbar-right">
+              <li><a href="/gettingstarted/">Getting Started</a></li>
+              <li><a href="/documentation/latest/">Documentation</a></li>
+              <li><a href="/downloads/">Downloads</a></li>
+              <li><a href="/community/">Community</a></li>
+            </ul>
+          </div>
+          </div>
+        </div>
+      </div><!-- /.navbar -->
 
       <div class="container">
 
-			<div class="row-fluid">
+      <div class="row-fluid">
 	<div class="col-md-4">
 		<h4>If you're new to Mesos</h4>
 		<p>See the <a href="/gettingstarted/">getting started</a> page for more information about downloading, building, and deploying Mesos.</p>
@@ -91,7 +91,7 @@ For example:</p>
 <ul>
 <li>Hardware repair</li>
 <li>Kernel upgrades</li>
-<li>Agent upgrades (e.g. adjusting agent attributes or resources)</li>
+<li>Agent upgrades (e.g., adjusting agent attributes or resources)</li>
 </ul>
 
 
@@ -106,30 +106,29 @@ frameworks and operator.</p>
 <h2>Terminology</h2>
 
 <p>For the purpose of this document, an &ldquo;Operator&rdquo; is a person, tool, or script
-which manages the Mesos cluster.</p>
+that manages a Mesos cluster.</p>
 
-<p>Maintenance primitives add several new concepts to the Mesos cluster.
-Those concepts are:</p>
+<p>Maintenance primitives add several new concepts to Mesos. Those concepts are:</p>
 
 <ul>
-<li><strong>Maintenance</strong> - An operation that makes resources on a machine unavailable,
+<li><strong>Maintenance</strong>: An operation that makes resources on a machine unavailable,
 either temporarily or permanently.</li>
-<li><strong>Maintenance window</strong> - A set of machines and an associated interval during
+<li><strong>Maintenance window</strong>: A set of machines and an associated time interval during
 which some maintenance is planned on those machines.</li>
-<li><strong>Maintenance schedule</strong> - A list of maintenance windows.
+<li><strong>Maintenance schedule</strong>: A list of maintenance windows.
 A single machine may only appear in a schedule once.</li>
-<li><strong>Unavailability</strong> - An operator-specified interval, defined by a start time
+<li><strong>Unavailability</strong>: An operator-specified interval, defined by a start time
 and duration, during which an associated machine may become unavailable.
 In general, no assumptions should be made about the availability of the
 machine (or resources) after the unavailability.</li>
-<li><strong>Drain</strong> - An interval between the scheduling of maintenance and when the
+<li><strong>Drain</strong>: An interval between the scheduling of maintenance and when the
 machine(s) become unavailable.  Offers sent with resources from draining
 machines will contain unavailability information.  Frameworks running on
 draining machines will receive inverse offers (see next).  Frameworks
 utilizing resources on affected machines are expected either to take
 preemptive steps to prepare for the unavailability; or to communicate the
 framework&rsquo;s inability to conform to the maintenance schedule.</li>
-<li><strong>Inverse offer</strong> - A communication mechanism for the master to ask for
+<li><strong>Inverse offer</strong>: A communication mechanism for the master to ask for
 resources back from a framework.  This notifies frameworks about any
 unavailability and gives frameworks a mechanism to respond about their
 capability to comply.  Inverse offers are similar to offers in that they
@@ -154,21 +153,28 @@ the maintenance schedule.</p>
 
 <h3>Scheduling maintenance</h3>
 
-<p>A machine is transitioned from Up mode into Draining mode as soon as it
-is scheduled for maintenance.  To transition a machine into Draining mode,
-an operator constructs a maintenance schedule and posts it to the Mesos master.</p>
+<p>A machine is transitioned from Up mode into Draining mode as soon as it is
+scheduled for maintenance.  To transition a machine into Draining mode, an
+operator constructs a maintenance schedule as a JSON document and posts it to
+<a href="/documentation/latest/./endpoints/master/maintenance/schedule/">/maintenance/schedule</a> HTTP endpoint on
+the Mesos master. A given Mesos master has a single maintenance schedule;
+posting a new schedule replaces the previous schedule, if any.</p>
 
 <p>See the definition of a <a href="https://github.com/apache/mesos/blob/016b02d7ed5a65bcad9261a133c8237c2df66e6e/include/mesos/maintenance/maintenance.proto#L48-L67">maintenance::Schedule</a>
 and of <a href="https://github.com/apache/mesos/blob/016b02d7ed5a65bcad9261a133c8237c2df66e6e/include/mesos/v1/mesos.proto#L140-L154">Unavailability</a>.</p>
 
-<p>In a production environment, the schedule must be constructed to ensure that
+<p>In a production environment, the schedule should be constructed to ensure that
 enough agents are operational at any given point in time to ensure
 uninterrupted service by the frameworks.</p>
 
-<p>For example, in a cluster of three machines, the operator can schedule two
+<p>For example, in a cluster of three machines, the operator might schedule two
 machines for one hour of maintenance, followed by another hour for the last
-machine.  The timestamps for unavailability are in nanoseconds since the epoch.
-The schedule might look like:</p>
+machine.  The timestamps for unavailability are expressed in nanoseconds since
+the Unix epoch (note that making reliable use of maintenance primitives requires
+that the system clocks of all machines in the cluster are roughly synchronized,
+including any machines hosting frameworks).</p>
+
+<p>The schedule might look like:</p>
 
 <pre><code>{
   "windows" : [
@@ -194,18 +200,20 @@ The schedule might look like:</p>
 }
 </code></pre>
 
-<p>The operator then posts the schedule to the master&rsquo;s maintenance endpoints.</p>
+<p>The operator can then post the schedule to the master&rsquo;s
+<a href="/documentation/latest/./endpoints/master/maintenance/schedule/">/maintenance/schedule</a> endpoint:</p>
 
-<pre><code>curl http://localhost:5050/master/maintenance/schedule
+<pre><code>curl http://localhost:5050/maintenance/schedule
   -H "Content-type: application/json"
   -X POST
   -d @schedule.json
 </code></pre>
 
-<p>The machines in a maintenance schedule do not necessarily need to be registered
-with the Mesos master.  The operator may add a machine to the maintenance
-schedule prior to launching an agent on the machine.  For example, this is
-useful for preventing a faulty machine from launching an agent on boot.</p>
+<p>The machines in a maintenance schedule do not need to be registered with the
+Mesos master at the time when the schedule is set.  The operator may add a
+machine to the maintenance schedule prior to launching an agent on the machine.
+For example, this can be useful to prevent a faulty machine from launching an
+agent on boot.</p>
 
 <p><strong>Note</strong>: Each machine in the maintenance schedule should have as
 complete information as possible.  In order for Mesos to recognize an agent
@@ -231,12 +239,14 @@ from Down mode to Up mode.</li>
 
 
 <p>If any of these properties are not met, the maintenance schedule is rejected
-with a corresponding error message and the master&rsquo;s state does not change.</p>
+with a corresponding error message and the master&rsquo;s state is not changed.</p>
 
-<p>To update a maintenance schedule, the operator should first read the existing
-schedule, make the necessary changes, and then post the modified schedule.</p>
+<p>To update the maintenance schedule, the operator should first read the current
+schedule, make any necessary changes, and then post the modified schedule. The
+current maintenance schedule can be obtained by sending a GET request to the
+master&rsquo;s <code>maintenance/schedule</code> endpoint.</p>
 
-<p>To cancel a maintenance schedule, the operator should post an empty schedule.</p>
+<p>To cancel the maintenance schedule, the operator should post an empty schedule.</p>
 
 <h3>Draining mode</h3>
 
@@ -249,7 +259,7 @@ This means the schedule is persisted in
 mode.  The mode of each machine is also persisted in the replicated log.</li>
 <li>All frameworks using resources on affected agents are immediately
 notified.  Existing offers from the affected agents are rescinded
-and re-sent with additional unavailability data.  All Frameworks using
+and re-sent with additional unavailability data.  All frameworks using
 resources from the affected agents are given inverse offers.</li>
 <li>New offers from the affected agents will also include
 the additional unavailability data.</li>
@@ -258,23 +268,22 @@ the additional unavailability data.</li>
 
 <p>With this additional information, frameworks should perform scheduling in a
 maintenance-aware fashion.  Inverse offers communicate the frameworks' ability
-to conform to the maintenance schedule.
-For example:</p>
+to conform to the maintenance schedule. For example:</p>
 
 <ul>
 <li>A framework with long-running tasks may choose agents with no unavailability
 or with unavailability further in the future.</li>
 <li>A datastore may choose to start a new replica if one of its agents is
-scheduled for extensive maintenance or decommissioning.  If the datastore
+scheduled for maintenance or decommissioning.  If the datastore
 can reasonably copy data into a new agent before maintenance,
 it would accept any inverse offers.  Otherwise, it would decline them.</li>
-<li>A stateful task, on an eminently unavailable agent, may be migrated to
-another available agent.  If the framework has sufficient resources to do
+<li>A stateful task on an agent with an impending unavailability may be migrated
+to another available agent.  If the framework has sufficient resources to do
 so, it would accept any inverse offers.  Otherwise, it would decline them.</li>
 </ul>
 
 
-<p>Accepting an inverse offer indicates that the framework is ok with the
+<p>Accepting an inverse offer indicates that the framework is okay with the
 maintenance schedule as it currently stands, given the current state of
 the framework&rsquo;s resources.  The master and operator should perceive acceptance
 as a best-effort promise by the framework to free all the resources contained
@@ -288,18 +297,18 @@ the viability of the maintenance schedul
 identical to the existing mechanism for re-offering offers to frameworks.</p>
 
 <p><strong>Note</strong>: Accepting or declining an inverse offer does not result in
-immediate changes in the maintenance schedule, or in the way Mesos acts.
-Inverse offers only represent some extra information that frameworks may
-find useful. In the same manner, a rejection or acceptance of an offer is a
-hint for an operator. The operator may or may not chose to take that hint
+immediate changes in the maintenance schedule or in the way Mesos acts.
+Inverse offers only represent extra information that frameworks may
+find useful. In the same manner, rejecting or accepting an inverse offer is a
+hint for an operator. The operator may or may not choose to take that hint
 into account.</p>
 
 <h3>Starting maintenance</h3>
 
-<p>The operator starts maintenance by posting a list of machines to the master&rsquo;s
-maintenance endpoint.</p>
+<p>The operator starts maintenance by posting a list of machines to the
+<a href="/documentation/latest/./endpoints/master/machine/down/">/machine/down</a> HTTP endpoint.</p>
 
-<p>See the definition of a <a href="https://github.com/apache/mesos/blob/016b02d7ed5a65bcad9261a133c8237c2df66e6e/include/mesos/v1/mesos.proto#L157-L167">MachineID</a>.</p>
+<p>The list of machines is specified in JSON format; each element of the list is a <a href="https://github.com/apache/mesos/blob/016b02d7ed5a65bcad9261a133c8237c2df66e6e/include/mesos/v1/mesos.proto#L157-L167">MachineID</a>.</p>
 
 <p>For example, to start maintenance on two machines:</p>
 
@@ -309,7 +318,7 @@ maintenance endpoint.</p>
 ]
 </code></pre>
 
-<pre><code>curl http://localhost:5050/master/machine/down
+<pre><code>curl http://localhost:5050/machine/down
   -H "Content-type: application/json"
   -X POST
   -d @machines.json
@@ -328,31 +337,31 @@ The hostname is not case-sensitive.</li>
 
 
 <p>If any of these properties are not met, the list of machines is rejected
-with a corresponding error message and the master&rsquo;s state does not change.</p>
+with a corresponding error message and the master&rsquo;s state is not changed.</p>
 
 <p>The operator can start maintenance on any machine that is scheduled for
 maintenance.  Machines that are not scheduled for maintenance cannot be
 directly transitioned from Up mode into Down mode.  However, the operator
-may schedule a machine for maintenance with a timestamp of the current
-time or in the past; and then immediately start maintenance on that machine.</p>
+may schedule a machine for maintenance with a timestamp equal to the current
+time or in the past, and then immediately start maintenance on that machine.</p>
 
-<p>It is up to the operator to transition a machine from Draining to Deactivated
-mode.  Mesos will keep a machine in Draining mode even if the unavailability
-window arrives or passes.  This means that the operation of the machine is not
-disrupted in any way and offers (with unavailability information) are still
-sent for this machine.</p>
+<p>The operator must explicitly transition a machine from Draining to Deactived
+mode. That is, Mesos will keep a machine in Draining mode even if the
+unavailability window arrives or passes.  This means that the operation of the
+machine is not disrupted in any way and offers (with unavailability information)
+are still sent for this machine.</p>
 
 <p>When maintenance is triggered by the operator, all agents on the machine are
-told to shutdown.  These agents are subsequently removed from the master
+told to shutdown.  These agents are subsequently removed from the master,
 which causes tasks to be updated as <code>TASK_LOST</code>.  Any agents from
 machines in maintenance are also prevented from registering with the master.</p>
 
 <h3>Completing maintenance</h3>
 
-<p>When maintenance is complete, or if maintenance needs to be cancelled,
+<p>When maintenance is complete or if maintenance needs to be cancelled,
 the operator can stop maintenance.  The process is very similar
-to starting maintenance (same validation criterion as the previous section).
-The operator posts a list of machines to the master&rsquo;s endpoints:</p>
+to starting maintenance (same validation criteria as the previous section).
+The operator posts a list of machines to the master&rsquo;s <a href="/documentation/latest/./endpoints/master/machine/up/">/machine/up</a> endpoint:</p>
 
 <pre><code>[
   { "hostname" : "machine1", "ip" : "10.0.0.1" },
@@ -360,7 +369,7 @@ The operator posts a list of machines to
 ]
 </code></pre>
 
-<pre><code>curl http://localhost:5050/master/machine/up
+<pre><code>curl http://localhost:5050/machine/up
   -H "Content-type: application/json"
   -X POST
   -d @machines.json
@@ -369,31 +378,44 @@ The operator posts a list of machines to
 <p><strong>Note</strong>: The duration of the maintenance, as indicated by the &ldquo;unavailability&rdquo;
 field, is a best-effort guess made by the operator.  Stopping maintenance
 before the end of the unavailability interval is allowed, as is stopping
-maintenance after the end of the unavailability interval.  The machines are
+maintenance after the end of the unavailability interval.  Machines are
 never automatically transitioned out of maintenance.</p>
 
-<p>Frameworks are informed about the completion or cancellation of maintenance
-when offers from that machine start being sent.  There is no explicit mechanism
-for notifying frameworks when maintenance is stopped.  After maintenance is
-stopped, new offers are no longer tagged with unavailability and inverse offers
-are no longer sent.  Also, new agents can start to register from the machine.</p>
+<p>Frameworks are informed about the completion or cancellation of maintenance when
+offers from that machine start being sent.  There is no explicit mechanism for
+notifying frameworks when maintenance is stopped.  After maintenance is stopped,
+new offers are no longer tagged with unavailability and inverse offers are no
+longer sent.  Also, agents running on the machine will be allowed to register
+with the Mesos master.</p>
+
+<h3>Viewing maintenance status</h3>
+
+<p>The current maintenance status (Up, Draining, or Down) of each machine in the
+cluster can be viewed by accessing the master&rsquo;s
+<a href="/documentation/latest/./endpoints/master/maintenance/status/">/maintenance/status</a> HTTP endpoint. For
+each machine that is Draining, this endpoint also includes the frameworks' responses to
+inverse offers for resources on that machine. For more information, see the
+format of the <a href="https://github.com/apache/mesos/blob/fa36917dd142f66924c5f7ed689b87d5ceabbf79/include/mesos/maintenance/maintenance.proto#L73-L84">ClusterStatus message</a>.</p>
+
+<blockquote><p>NOTE: The format of the data returned by this endpoint may change in a
+future release of Mesos.</p></blockquote>
 
 	</div>
 </div>
 
-			
-	      <hr>
 
-				<!-- footer -->
-	      <div class="footer">
-	        <p>&copy; 2012-2015 <a href="http://apache.org">The Apache Software Foundation</a>.
-	        Apache Mesos, the Apache feather logo, and the Apache Mesos project logo are trademarks of The Apache Software Foundation.<p>
-	      </div><!-- /footer -->
-
-	    </div> <!-- /container -->
-
-	    <!-- JS -->
-	    <script src="//code.jquery.com/jquery-1.11.0.min.js" type="text/javascript"></script>
-			<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" type="text/javascript"></script>
+        <hr>
+
+        <!-- footer -->
+        <div class="footer">
+          <p>&copy; 2012-2016 <a href="http://apache.org">The Apache Software Foundation</a>.
+          Apache Mesos, the Apache feather logo, and the Apache Mesos project logo are trademarks of The Apache Software Foundation.<p>
+        </div><!-- /footer -->
+
+      </div> <!-- /container -->
+
+      <!-- JS -->
+      <script src="//code.jquery.com/jquery-1.11.0.min.js" type="text/javascript"></script>
+      <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" type="text/javascript"></script>
     </body>
 </html>