taigrr/yq
1
0
Fork 0
mirror of https://github.com/taigrr/yq synced 2025-01-18 04:53:17 -08:00
Code Issues Projects Releases Wiki Activity

Task: Add merge command docs

Browse Source 
Resolves: #35
This commit is contained in:
kenjones
2017-09-23 15:33:23 -04:00
parent dda9b1f087
commit 66c8390d54
39 changed files with 993 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
docs/convert/index.html
View File

@@ -1,17 +1,18 @@
<!DOCTYPE html>
<html class="no-js">
<html lang="en" class="no-js">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<link rel="shortcut icon" href="../assets/images/favicon.png">
<meta name="generator" content="mkdocs-0.16.3, mkdocs-material-1.5.4">
<meta name="generator" content="mkdocs-0.16.3, mkdocs-material-1.10.1">
@@ -19,10 +20,10 @@
<script src="../assets/javascripts/modernizr-56ade86843.js"></script>
<script src="../assets/javascripts/modernizr-e826f8942a.js"></script>
<link rel="stylesheet" href="../assets/stylesheets/application-b1a1975878.css">
<link rel="stylesheet" href="../assets/stylesheets/application-a20f419c8e.css">
@@ -60,10 +61,11 @@
<nav class="md-header-nav md-grid">
<div class="md-flex">
<div class="md-flex__cell md-flex__cell--shrink">
<a href=".." title="Yaml" class="md-icon md-icon--home md-header-nav__button">
</a>
<a href=".." title="Yaml" class="md-header-nav__button md-logo">
<i class="md-icon md-icon--home"></i>
</a>
</div>
<div class="md-flex__cell md-flex__cell--shrink">
<label class="md-icon md-icon--menu md-header-nav__button" for="drawer"></label>
@@ -82,17 +84,17 @@
<label class="md-icon md-icon--search md-header-nav__button" for="search"></label>
<div class="md-search" data-md-component="search">
<div class="md-search__overlay"></div>
<div class="md-search" data-md-component="search" role="dialog">
<label class="md-search__overlay" for="search"></label>
<div class="md-search__inner">
<form class="md-search__form" name="search">
<input type="text" class="md-search__input" name="query" required placeholder="Search" accesskey="s" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" data-md-component="query">
<input type="text" class="md-search__input" name="query" required placeholder="Search" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" data-md-component="query">
<label class="md-icon md-search__icon" for="search"></label>
<button type="reset" class="md-icon md-search__icon" data-md-component="reset">close</button>
<button type="reset" class="md-icon md-search__icon" data-md-component="reset">&#xE5CD;</button>
</form>
<div class="md-search__output">
<div class="md-search__scrollwrap" data-md-scrollfix>
<div class="md-search-result" data-md-component="result">
<div class="md-search-result" data-md-component="result" data-md-lang-search="" data-md-lang-tokenizer="[\s\-]+">
<div class="md-search-result__meta" data-md-lang-result-none="No matching documents" data-md-lang-result-one="1 matching document" data-md-lang-result-other="# matching documents">
Type to start searching
</div>
@@ -104,9 +106,9 @@
</div>
</div>
<div class="md-flex__cell md-flex__cell--shrink">
<div class="md-header-nav__source">
<div class="md-flex__cell md-flex__cell--shrink">
<div class="md-header-nav__source">
@@ -126,9 +128,9 @@
</div>
</a>
</div>
</div>
</div>
</div>
</nav>
</header>
@@ -145,9 +147,11 @@
<div class="md-sidebar__inner">
<nav class="md-nav md-nav--primary" data-md-level="0">
<label class="md-nav__title md-nav__title--site" for="drawer">
<i class="md-icon md-icon--home md-nav__button"></i>
<div class="md-nav__button md-logo">
<i class="md-icon md-icon--home"></i>
</div>
Yaml
</label>
@@ -274,6 +278,18 @@
</li>
<li class="md-nav__item">
<a href="../merge/" title="Merge" class="md-nav__link">
Merge
</a>
</li>
</ul>
</nav>
</div>
@@ -389,6 +405,20 @@ b:
</a>
<a href="../merge/" title="Merge" class="md-flex md-footer-nav__link md-footer-nav__link--next" rel="next">
<div class="md-flex__cell md-flex__cell--stretch md-footer-nav__title">
<span class="md-flex__ellipsis">
<span class="md-footer-nav__direction">
Next
</span>
Merge
</span>
</div>
<div class="md-flex__cell md-flex__cell--shrink">
<i class="md-icon md-icon--arrow-forward md-footer-nav__button"></i>
</div>
</a>
</nav>
</div>
@@ -421,7 +451,9 @@ b:
</div>
<script src="../assets/javascripts/application-0b7df094bf.js"></script>
<script src="../assets/javascripts/application-f3ab9e5ff8.js"></script>
<script>app.initialize({url:{base:".."}})</script>