Merge remote-tracking branch 'origin/master'
# Conflicts: # .DS_Store # css/styles.css
This commit is contained in:
scotty
Vendored
BIN
Binary file not shown.
@@ -1,2 +1,4 @@
|
|||||||
|
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
||||||
|
_includes/.DS_Store
|
||||||
|
|||||||
+23
-4
@@ -4,7 +4,7 @@ kramdown:
|
|||||||
input: GFM
|
input: GFM
|
||||||
html_to_native: true
|
html_to_native: true
|
||||||
hard_wrap: false
|
hard_wrap: false
|
||||||
use_coderay: true
|
enable_coderay: true
|
||||||
baseurl: /
|
baseurl: /
|
||||||
|
|
||||||
safe: false
|
safe: false
|
||||||
@@ -18,9 +18,28 @@ defaults:
|
|||||||
layout: "docwithnav"
|
layout: "docwithnav"
|
||||||
-
|
-
|
||||||
scope:
|
scope:
|
||||||
path: "v1.2"
|
path: "v1.1"
|
||||||
values:
|
values:
|
||||||
version: "v1.2"
|
version: "v1.1"
|
||||||
versionfilesafe: "v1_1"
|
versionfilesafe: "v1_1"
|
||||||
|
-
|
||||||
|
scope:
|
||||||
|
path: "v1.1/reference"
|
||||||
|
values:
|
||||||
|
section: "reference"
|
||||||
|
-
|
||||||
|
scope:
|
||||||
|
path: "v1.1/guides"
|
||||||
|
values:
|
||||||
|
section: "guides"
|
||||||
|
-
|
||||||
|
scope:
|
||||||
|
path: "v1.1/support"
|
||||||
|
values:
|
||||||
|
section: "support"
|
||||||
|
-
|
||||||
|
scope:
|
||||||
|
path: "v1.1/samples"
|
||||||
|
values:
|
||||||
|
section: "samples"
|
||||||
permalink: pretty
|
permalink: pretty
|
||||||
@@ -4,7 +4,7 @@ toc:
|
|||||||
section:
|
section:
|
||||||
- title: Kubernetes API Overview
|
- title: Kubernetes API Overview
|
||||||
path: http://kubernetes.io/v1.1/docs/api.html
|
path: http://kubernetes.io/v1.1/docs/api.html
|
||||||
- title: Kubernetes API Reference (pretend the child nodes are here)
|
- title: Kubernetes API Reference
|
||||||
path: http://kubernetes.io/v1.1/api-ref.html
|
path: http://kubernetes.io/v1.1/api-ref.html
|
||||||
|
|
||||||
- title: kubectl
|
- title: kubectl
|
||||||
|
|||||||
+6
-45
@@ -1,45 +1,6 @@
|
|||||||
|
{% for item in tree %}{% if item.section %}
|
||||||
<ul {% if subsection %}style="display: none; opacity: 0; margin-left: 15px;"{% endif %}>
|
<div class="item" data-title="{{ item.title }}">
|
||||||
{% for item in tree %}
|
<div class="container">{% assign tree = item.section %}{% include tree.html %}
|
||||||
|
</div>
|
||||||
{% if item.status %}
|
</div>{% else %}
|
||||||
{% capture statusHTML %} <sup style="color: red">{{item.status}}</sup>{% endcapture %}
|
<a class="item" data-title="{{ item.title }}" href="{{ item.path }}" ></a>{% endif %}{% endfor %}
|
||||||
{% else %}
|
|
||||||
{% assign statusHTML = "" %}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if item.section %}
|
|
||||||
{% capture sectionHTML %}<a class="tlw-control tlw-collapsed">▸</a>{% endcapture %}
|
|
||||||
{% else %}
|
|
||||||
{% assign sectionHTML = "" %}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
|
|
||||||
{% if item.path %}
|
|
||||||
{% if page.url | remove: ".html" | remove "index" == item.path %}
|
|
||||||
{% capture tocItemColor %}style="color:red;"{% endcapture %}
|
|
||||||
{% else %}
|
|
||||||
{% capture tocItemColor %}{% endcapture %}
|
|
||||||
{% endif %}
|
|
||||||
<li {{ tocItemColor }}>{{ sectionHTML }}<a href="{{ item.path }}" title="{{ item.title }}" data-title="{{ item.title }} - {{ item.path }}"><span>{{ item.title }} {{ statusHTML }}</span></a></li>
|
|
||||||
{% else %}
|
|
||||||
{% if item.include %}
|
|
||||||
{% assign tree = site.data[item.include].toc %}
|
|
||||||
{% assign subsection=false %}
|
|
||||||
{% include tree.html %}
|
|
||||||
{% else %}
|
|
||||||
<li>{{ sectionHTML }}<span class="tlw-title tlw-control-title" data-title="{{ item.title }}">{{ item.title }}{{ statusHTML }}</span></li>
|
|
||||||
{% endif %}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if item.break %}
|
|
||||||
<hr>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if item.section %}
|
|
||||||
{% assign tree = item.section %}
|
|
||||||
{% assign subsection=true %}
|
|
||||||
{% include tree.html %}
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
|
|||||||
+10
-50
@@ -7,15 +7,15 @@ layout: headerfooter
|
|||||||
<h5>{{ page.abstract }}</h5>
|
<h5>{{ page.abstract }}</h5>
|
||||||
<div id="vendorStrip" class="light-text">
|
<div id="vendorStrip" class="light-text">
|
||||||
<ul>
|
<ul>
|
||||||
<li><a href="#">GUIDES</a></li>
|
<li><a href="/{{ page.version }}/guides">GUIDES</a></li>
|
||||||
<li><a href="#">REFERENCE</a></li>
|
<li><a href="/{{ page.version }}/reference">REFERENCE</a></li>
|
||||||
<li><a href="#">SAMPLES</a></li>
|
<li><a href="/{{ page.version }}/samples">SAMPLES</a></li>
|
||||||
<li><a href="#">SUPPORT</a></li>
|
<li><a href="/{{ page.version }}/support">SUPPORT</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="dropdown">
|
<div class="dropdown">
|
||||||
<div class="readout"></div>
|
<div class="readout"></div>
|
||||||
<a href="#">Version 1.1</a>
|
<a href="/v1.1">Version 1.1</a>
|
||||||
<a href="#">Version 1.0</a>
|
<a href="/v1.0">Version 1.0</a>
|
||||||
</div>
|
</div>
|
||||||
<input type="text" id="search" placeholder="Search the docs">
|
<input type="text" id="search" placeholder="Search the docs">
|
||||||
</div>
|
</div>
|
||||||
@@ -23,50 +23,10 @@ layout: headerfooter
|
|||||||
|
|
||||||
<section id="encyclopedia">
|
<section id="encyclopedia">
|
||||||
<div id="docsToc">
|
<div id="docsToc">
|
||||||
{% comment %} assign tree = site.data[page.toc].toc
|
<div class="pi-accordion">
|
||||||
{% assign tree = site.data[page.versionfilesafe][page.section].toc %}
|
{% assign tree = site.data[page.versionfilesafe][page.section].toc %}
|
||||||
{% include tree.html %}{% endcomment %}
|
{% include tree.html %}
|
||||||
<!--
|
</div> <!-- /pi-accordion -->
|
||||||
|
|
||||||
Here's your API ref for this accordion element:
|
|
||||||
|
|
||||||
Each line is class "item". Use the data-title attribute for the text label.
|
|
||||||
Use a.item for direct links; use div.item to wrap containers.
|
|
||||||
|
|
||||||
A div.container inside a div.item is a nested accordion. The clickable text which toggles the
|
|
||||||
container open/closed is the data-title attribute of the parent div.item.
|
|
||||||
|
|
||||||
-->
|
|
||||||
|
|
||||||
<div class="pi-accordion">
|
|
||||||
<a class="item" data-title="Overview" href="path-to-page"></a>
|
|
||||||
|
|
||||||
<div class="item" data-title="Quickstarts">
|
|
||||||
<div class="container">
|
|
||||||
<a class="item" data-title="Setting Up Your Local Environment" href="path-to-page"></a>
|
|
||||||
<a class="item" data-title="5-minute Quickstart" href="path-to-page"></a>
|
|
||||||
<a class="item" data-title="Kubernetes 101" href="path-to-page"></a>
|
|
||||||
<a class="item" data-title="Kubernetes 201" href="path-to-page"></a>
|
|
||||||
</div>
|
|
||||||
</div> <!-- /quickstarts -->
|
|
||||||
|
|
||||||
<div class="item" data-title="Running Kubernetes">
|
|
||||||
<div class="container">
|
|
||||||
<a class="item" data-title="Running Kubernetes on Your Local Machine" href="path-to-page"></a>
|
|
||||||
<a class="item" data-title="Running Kubernetes on Google Container Engine" href="path-to-page"></a>
|
|
||||||
<div class="item" data-title="Third-level Schtuff">
|
|
||||||
<div class="container">
|
|
||||||
<a class="item" data-title="Third Level One" href="path-to-page"></a>
|
|
||||||
<a class="item" data-title="Third Level Two" href="path-to-page"></a>
|
|
||||||
<a class="item" data-title="Third Level Three" href="path-to-page"></a>
|
|
||||||
<a class="item" data-title="Third Level Four" href="path-to-page"></a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<a class="item" data-title="Running Kubernetes on Turn-Key Cloud Solutions" href="path-to-page"></a>
|
|
||||||
<a class="item" data-title="Running Kubernetes on Custom Solutions" href="path-to-page"></a>
|
|
||||||
</div>
|
|
||||||
</div> <!-- /running kubernetes -->
|
|
||||||
</div> <!-- /pi-accordion -->
|
|
||||||
</div> <!-- /docsToc -->
|
</div> <!-- /docsToc -->
|
||||||
<div id="docsContent">
|
<div id="docsContent">
|
||||||
{{ content }}
|
{{ content }}
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
# CreaturesInUnitards
|
|
||||||
Kubernetes Documentation
|
|
||||||
File diff suppressed because one or more lines are too long
Binary file not shown.
|
Before Width: | Height: | Size: 5.8 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 7.1 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 7.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 35 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.0 KiB |
@@ -1,114 +0,0 @@
|
|||||||
<!Doctype html>
|
|
||||||
<html id="docs">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<link href='https://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
|
|
||||||
<link rel="stylesheet" href="/css/styles.css"/>
|
|
||||||
<script src="/js/script.js"></script>
|
|
||||||
<title>Kubernetes - Index test</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="cellophane" onclick="kub.toggleMenu()"></div>
|
|
||||||
<header>
|
|
||||||
<a href="/" class="logo"></a>
|
|
||||||
<div class="nav-buttons" data-auto-burger="primary">
|
|
||||||
<a href="/docs" class="button" id="viewDocs">View Documentation</a>
|
|
||||||
<a href="/get-started" class="button" id="tryKubernetes">Try Kubernetes</a>
|
|
||||||
<button id="hamburger" onclick="kub.toggleMenu()" data-auto-burger-exclude><div></div></button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<nav id="mainNav">
|
|
||||||
<main data-auto-burger="primary">
|
|
||||||
<div class="nav-box">
|
|
||||||
<h3><a href="">Get Started</a></h3>
|
|
||||||
<p>Built for a multi-cloud world, public, private or hybrid. Seamlessly roll out new features.</p>
|
|
||||||
</div>
|
|
||||||
<div class="nav-box">
|
|
||||||
<h3><a href="">Documentation</a></h3>
|
|
||||||
<p>Pellentesque in ipsum id orci porta dapibus. Nulla porttitor accumsan tincidunt. </p>
|
|
||||||
</div>
|
|
||||||
<div class="nav-box">
|
|
||||||
<h3><a href="">Community</a></h3>
|
|
||||||
<p>Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. </p>
|
|
||||||
</div>
|
|
||||||
<div class="nav-box">
|
|
||||||
<h3><a href="">Blog</a></h3>
|
|
||||||
<p>Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Quisque velit nisi, pretium ut lacinia in. </p>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
<main data-auto-burger="primary">
|
|
||||||
<div class="left">
|
|
||||||
<h5 class="github-invite">Interested in hacking on the core Kubernetes code base?</h5>
|
|
||||||
<a href="" class="button">View On Github</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="right">
|
|
||||||
<h5 class="github-invite">Explore the community</h5>
|
|
||||||
<div class="social">
|
|
||||||
<a href="https://twitter.com/kubernetesio" class="Twitter"><span>twitter</span></a>
|
|
||||||
<a href="https://github.com/kubernetes/kubernetes" class="github"><span>Github</span></a>
|
|
||||||
<a href="http://slack.k8s.io/" class="slack"><span>Slack</span></a>
|
|
||||||
<a href="http://stackoverflow.com/questions/tagged/kubernetes" class="stack-overflow"><span>stackoverflow</span></a>
|
|
||||||
<a href="https://groups.google.com/forum/#!forum/google-containers" class="mailing-list"><span>Mailing List</span></a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="clear" style="clear: both"></div>
|
|
||||||
</main>
|
|
||||||
</nav>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<!-- HERO -->
|
|
||||||
<section id="hero" class="light-text">
|
|
||||||
<h1>Index test</h1>
|
|
||||||
<h5>Cool content goes here</h5>
|
|
||||||
<div id="vendorStrip" class="light-text">
|
|
||||||
<ul>
|
|
||||||
<li><a href="#">GUIDES</a></li>
|
|
||||||
<li><a href="#">REFERENCE</a></li>
|
|
||||||
<li><a href="#">SAMPLES</a></li>
|
|
||||||
<li><a href="#">SUPPORT</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section id="encyclopedia">
|
|
||||||
<div id="docsToc">
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<ul >
|
|
||||||
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<div id="docsContent">
|
|
||||||
Yep.
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<footer>
|
|
||||||
<main class="light-text">
|
|
||||||
<nav>
|
|
||||||
<a href="/getting-started.html">Getting Started</a>
|
|
||||||
<a href="/docs.html">Documentation</a>
|
|
||||||
<a href="http://blog.kubernetes.io/">Blog</a>
|
|
||||||
<a href="/foobang.html">Community</a>
|
|
||||||
</nav>
|
|
||||||
<div class="social">
|
|
||||||
<a href="https://twitter.com/kubernetesio" class="twitter"><span>twitter</span></a>
|
|
||||||
<a href="https://github.com/kubernetes/kubernetes" class="github"><span>Github</span></a>
|
|
||||||
<a href="http://slack.k8s.io/" class="slack"><span>Slack</span></a>
|
|
||||||
<a href="http://stackoverflow.com/questions/tagged/kubernetes" class="stack-overflow"><span>stackoverflow</span></a>
|
|
||||||
<a href="https://groups.google.com/forum/#!forum/google-containers" class="mailing-list"><span>Mailing List</span></a>
|
|
||||||
<label for="wishField">I wish this page <input type="text" id="wishField" name="wishField" placeholder="made better textfield suggestions"></label>
|
|
||||||
</div>
|
|
||||||
<div class="center">© 2016 Kubernetes</div>
|
|
||||||
</main>
|
|
||||||
</footer>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
+5
-1
File diff suppressed because one or more lines are too long
Vendored
@@ -0,0 +1,28 @@
|
|||||||
|
---
|
||||||
|
title: Doc test
|
||||||
|
abstract: Testing the doducmentation with cascading layouts
|
||||||
|
---
|
||||||
|
|
||||||
|
# This is a test of the documentation layout use
|
||||||
|
|
||||||
|
Testing version {{ page.version }}
|
||||||
|
|
||||||
|
## Heading 2
|
||||||
|
|
||||||
|
Test of heading 2 is above
|
||||||
|
|
||||||
|
### Heading 3
|
||||||
|
|
||||||
|
Test of heading 3 is above
|
||||||
|
|
||||||
|
#### Heading 4
|
||||||
|
|
||||||
|
Test of heading 4 is above
|
||||||
|
|
||||||
|
# Code tests
|
||||||
|
|
||||||
|
Testing `inline code` and below is a code example:
|
||||||
|
|
||||||
|
console.log("Hello, world!");
|
||||||
|
|
||||||
|
Okeedoke.
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
---
|
||||||
|
title: Doc test
|
||||||
|
abstract: Testing the doducmentation with cascading layouts
|
||||||
|
section: guides
|
||||||
|
---
|
||||||
|
|
||||||
|
# This is a test of the documentation layout use
|
||||||
|
|
||||||
|
Testing version {{ page.version }}
|
||||||
|
|
||||||
|
## Heading 2
|
||||||
|
|
||||||
|
Test of heading 2 is above
|
||||||
|
|
||||||
|
### Heading 3
|
||||||
|
|
||||||
|
Test of heading 3 is above
|
||||||
|
|
||||||
|
#### Heading 4
|
||||||
|
|
||||||
|
Test of heading 4 is above
|
||||||
|
|
||||||
|
# Code tests
|
||||||
|
|
||||||
|
Testing `inline code` and below is a code example:
|
||||||
|
|
||||||
|
console.log("Hello, world!");
|
||||||
|
|
||||||
|
Okeedoke.
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
---
|
||||||
|
title: Doc test
|
||||||
|
abstract: Testing the doducmentation with cascading layouts
|
||||||
|
---
|
||||||
|
|
||||||
|
# This is a test of the documentation layout use
|
||||||
|
|
||||||
|
Testing version {{ page.version }}
|
||||||
|
|
||||||
|
## Heading 2
|
||||||
|
|
||||||
|
Test of heading 2 is above
|
||||||
|
|
||||||
|
### Heading 3
|
||||||
|
|
||||||
|
Test of heading 3 is above
|
||||||
|
|
||||||
|
#### Heading 4
|
||||||
|
|
||||||
|
Test of heading 4 is above
|
||||||
|
|
||||||
|
# Code tests
|
||||||
|
|
||||||
|
Testing `inline code` and below is a code example:
|
||||||
|
|
||||||
|
console.log("Hello, world!");
|
||||||
|
|
||||||
|
Okeedoke.
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
---
|
||||||
|
title: Doc test
|
||||||
|
abstract: Testing the doducmentation with cascading layouts
|
||||||
|
---
|
||||||
|
|
||||||
|
# This is a test of the documentation layout use
|
||||||
|
|
||||||
|
Testing version {{ page.version }}
|
||||||
|
|
||||||
|
## Heading 2
|
||||||
|
|
||||||
|
Test of heading 2 is above
|
||||||
|
|
||||||
|
### Heading 3
|
||||||
|
|
||||||
|
Test of heading 3 is above
|
||||||
|
|
||||||
|
#### Heading 4
|
||||||
|
|
||||||
|
Test of heading 4 is above
|
||||||
|
|
||||||
|
# Code tests
|
||||||
|
|
||||||
|
Testing `inline code` and below is a code example:
|
||||||
|
|
||||||
|
console.log("Hello, world!");
|
||||||
|
|
||||||
|
Okeedoke.
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
---
|
||||||
|
title: Doc test
|
||||||
|
abstract: Testing the doducmentation with cascading layouts
|
||||||
|
---
|
||||||
|
|
||||||
|
# This is a test of the documentation layout use
|
||||||
|
|
||||||
|
Testing version {{ page.version }}
|
||||||
|
|
||||||
|
## Heading 2
|
||||||
|
|
||||||
|
Test of heading 2 is above
|
||||||
|
|
||||||
|
### Heading 3
|
||||||
|
|
||||||
|
Test of heading 3 is above
|
||||||
|
|
||||||
|
#### Heading 4
|
||||||
|
|
||||||
|
Test of heading 4 is above
|
||||||
|
|
||||||
|
# Code tests
|
||||||
|
|
||||||
|
Testing `inline code` and below is a code example:
|
||||||
|
|
||||||
|
console.log("Hello, world!");
|
||||||
|
|
||||||
|
Okeedoke.
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
---
|
|
||||||
title: Doc test
|
|
||||||
abstract: Testing the doducmentation with cascading layouts
|
|
||||||
section: reference
|
|
||||||
---
|
|
||||||
|
|
||||||
# This is a test of the documentation layout use
|
|
||||||
|
|
||||||
Testing version {{ page.version }}
|
|
||||||
dfas
|
|
||||||
df
|
|
||||||
asd
|
|
||||||
f
|
|
||||||
asdkop
|
|
||||||
f
|
|
||||||
[kk
|
|
||||||
|
|
||||||
|
|
||||||
aosdijfoiasjdfiojasd fiaiosd jfoiasjdf oiasjdf os
|
|
||||||
|
|
||||||
## Heading 2
|
|
||||||
|
|
||||||
aspdjfas
|
|
||||||
dfas
|
|
||||||
df
|
|
||||||
asd
|
|
||||||
f
|
|
||||||
asdkop
|
|
||||||
f
|
|
||||||
[kk
|
|
||||||
|
|
||||||
|
|
||||||
aosdijfoiasjdfiojasd fiaiosd jfoiasjdf oiasjdf os
|
|
||||||
|
|
||||||
### Heading 3
|
|
||||||
|
|
||||||
aspdjfas
|
|
||||||
dfas
|
|
||||||
df
|
|
||||||
asd
|
|
||||||
f
|
|
||||||
asdkop
|
|
||||||
f
|
|
||||||
[kk
|
|
||||||
|
|
||||||
|
|
||||||
aosdijfoiasjdfiojasd fiaiosd jfoiasjdf oiasjdf os
|
|
||||||
Reference in New Issue
Block a user