Skip to content
This repository was archived by the owner on Aug 2, 2019. It is now read-only.

Commit 5442b2a

Browse files
abrennan89abrennan89
committed
Additional content structuring
1 parent 42d2c13 commit 5442b2a

11 files changed

+637
-42
lines changed

Diff for: ‎ocf-install-deploy/docs/assembly_intro.adoc renamed to ‎common/assembly_intro.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@
1010
Serverless concepts like scaling pods and containers on demand, or managing apps using Operators via the {OLM} (OLM), are now possible on OpenShift using {ProjectName}.
1111

1212
include::con_ocf-components.adoc[leveloffset=+1]
13+
//include::con_architecture.adoc[leveloffset=+1]
14+
15+
include::assembly_ocf-prereqs.adoc[leveloffset=+1]

Diff for: ‎ocf-install-deploy/docs/assembly_ocf-prereqs.adoc renamed to ‎common/assembly_ocf-prereqs.adoc

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
// Module included in the following assemblies:
22
//
3-
// <List assemblies here, each on a new line>
3+
// assembly_intro.adoc
44

55
[id='ocf-prereqs-{context}']
66
= Before you begin
77

88
include::con_supported.adoc[leveloffset=+1]
9-
include::con_add-config.adoc[leveloffset=+1]
109

1110
.Additional resources
1211

Diff for: ‎common/attributes.adoc

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
:toc:
2-
:ProjectName: OpenShift{nbsp}Cloud{nbsp}Functions
3-
:ProjectNameID: ocf
4-
:ProjectVersion: 0.2.0
5-
6-
//documentation attributes for file structure - do not modify
7-
:rootdir: ../ocf-docs/
8-
:commondir: ../ocf-docs/common/
9-
10-
//include::{includedir}/fragment1.adoc[]
11-
121
// Standard document attributes
132
:data-uri!:
143
:doctype: article
@@ -23,6 +12,10 @@
2312
:linkattrs:
2413
:toclevels: 2
2514

15+
//documentation attributes for file structure - do not modify
16+
:rootdir: ../ocf-docs/
17+
:commondir: ../ocf-docs/common/
18+
2619
// Product attributes
2720
:ProjectName: OpenShift{nbsp}Cloud{nbsp}Functions
2821
:ProjectNameID: OCF

Diff for: ‎ocf-install-deploy/docs/con_architecture.adoc renamed to ‎common/con_architecture.adoc

File renamed without changes.

Diff for: ‎ocf-install-deploy/docs/con_ocf-components.adoc renamed to ‎common/con_ocf-components.adoc

File renamed without changes.

Diff for: ‎ocf-install-deploy/docs/con_supported.adoc renamed to ‎common/con_supported.adoc

File renamed without changes.

Diff for: ‎master.adoc

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
include::common/attributes.adoc[]
2+
3+
= Introducing {ProjectName} {ProjectVersion}
4+
5+
include::common/assembly_intro.adoc[leveloffset=+1]
6+
7+
//installation
8+
include::ocf-install-deploy/master.adoc[leveloffset=+1]

Diff for: ‎master.html

+594
Large diffs are not rendered by default.

Diff for: ‎ocf-install-deploy/docs/assembly_install-deploy.adoc

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
:parent-context: {context}
66

77
[id='assembly-2-{context}']
8-
= Installing and deploying {ProjectName}
9-
10-
include::assembly_ocf-prereqs.adoc[leveloffset=+1]
118
include::proc_installing-OLM.adoc[leveloffset=+1]
129
include::proc_installing-knative-operators.adoc[leveloffset=+1]
1310

Diff for: ‎ocf-install-deploy/master.adoc

+14-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
include::../common/attributes.adoc[]
22

3-
= {ProjectName} {ProjectVersion}
4-
:context: {ProjectNameID}
5-
6-
//intro
7-
include::docs/assembly_intro.adoc[leveloffset=+1]
3+
= Installing {ProjectName} on OKD/Minishift
4+
//need official names glossary for referring to other products consistently.
85

96
//installation
107
include::docs/assembly_install-deploy.adoc[leveloffset=+1]
8+
9+
//configuration
10+
//include::assembly_configure.adoc[leveloffset=+1]
11+
12+
//post-installation steps / tutorials?
13+
//include::assembly_tutorials.adoc[leveloffset=+1]
14+
15+
//reference information
16+
//include::assembly_reference.adoc[leveloffset=+1]
17+
18+
// Revision information
19+
//include::common/revision-info.adoc[leveloffset=+1]

Diff for: ‎ocf-install-deploy/master.html

+13-21
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge"><![endif]-->
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta name="generator" content="Asciidoctor 1.5.6.1">
8-
<title>OpenShift&#160;Cloud&#160;Functions 0.2.0</title>
8+
<title>Deploying OpenShift&#160;Cloud&#160;Functions on OKD/Minishift</title>
99
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
1010
<style>
1111
/* Asciidoctor default stylesheet | MIT License | http://asciidoctor.org */
@@ -427,22 +427,18 @@
427427
</head>
428428
<body class="article toc2 toc-left">
429429
<div id="header">
430-
<h1>OpenShift&#160;Cloud&#160;Functions 0.2.0</h1>
431-
<<<<<<< HEAD
430+
<h1>Deploying OpenShift&#160;Cloud&#160;Functions on OKD/Minishift</h1>
432431
<div id="toc" class="toc2">
433-
=======
434-
<div id="toc" class="toc">
435-
>>>>>>> Corrections to project structure and book sub-structures
436432
<div id="toctitle">Table of Contents</div>
437433
<ul class="sectlevel1">
438-
<li><a href="#intro-OCF">1. Introduction</a>
434+
<li><a href="#intro-{context}">1. Introduction</a>
439435
<ul class="sectlevel2">
440-
<li><a href="#ocf-components-OCF">1.1. OpenShift&#160;Cloud&#160;Functions components</a></li>
436+
<li><a href="#ocf-components-{context}">1.1. OpenShift&#160;Cloud&#160;Functions components</a></li>
441437
</ul>
442438
</li>
443-
<li><a href="#assembly-2-OCF">2. Installing and deploying OpenShift&#160;Cloud&#160;Functions</a>
439+
<li><a href="#assembly-2-{context}">2. Installing and deploying OpenShift&#160;Cloud&#160;Functions</a>
444440
<ul class="sectlevel2">
445-
<li><a href="#ocf-prereqs-OCF">2.1. Before you begin</a></li>
441+
<li><a href="#ocf-prereqs-{context}">2.1. Before you begin</a></li>
446442
<li><a href="#installing-OLM">2.2. Installing Operator Lifecycle Manager</a></li>
447443
<li><a href="#installing-knative-operators">2.3. Installing Knative Operators</a></li>
448444
</ul>
@@ -452,14 +448,14 @@ <h1>OpenShift&#160;Cloud&#160;Functions 0.2.0</h1>
452448
</div>
453449
<div id="content">
454450
<div class="sect1">
455-
<h2 id="intro-OCF">1. Introduction</h2>
451+
<h2 id="intro-{context}">1. Introduction</h2>
456452
<div class="sectionbody">
457453
<div class="paragraph">
458454
<p>OpenShift&#160;Cloud&#160;Functions provides the missing integration link between OpenShift deployments and components which enable serverless functionality, like Knative and Istio (Service Mesh).
459455
Serverless concepts like scaling pods and containers on demand, or managing apps using Operators via the Operator Lifecycle Manager (OLM), are now possible on OpenShift using OpenShift&#160;Cloud&#160;Functions.</p>
460456
</div>
461457
<div class="sect2">
462-
<h3 id="ocf-components-OCF">1.1. OpenShift&#160;Cloud&#160;Functions components</h3>
458+
<h3 id="ocf-components-{context}">1.1. OpenShift&#160;Cloud&#160;Functions components</h3>
463459
<div class="dlist">
464460
<dl>
465461
<dt class="hdlist1">Knative</dt>
@@ -487,12 +483,12 @@ <h3 id="ocf-components-OCF">1.1. OpenShift&#160;Cloud&#160;Functions components<
487483
</div>
488484
</div>
489485
<div class="sect1">
490-
<h2 id="assembly-2-OCF">2. Installing and deploying OpenShift&#160;Cloud&#160;Functions</h2>
486+
<h2 id="assembly-2-{context}">2. Installing and deploying OpenShift&#160;Cloud&#160;Functions</h2>
491487
<div class="sectionbody">
492488
<div class="sect2">
493-
<h3 id="ocf-prereqs-OCF">2.1. Before you begin</h3>
489+
<h3 id="ocf-prereqs-{context}">2.1. Before you begin</h3>
494490
<div class="sect3">
495-
<h4 id="supported-OCF">2.1.1. Supported platforms</h4>
491+
<h4 id="supported-{context}">2.1.1. Supported platforms</h4>
496492
<div class="paragraph">
497493
<p>OpenShift&#160;Cloud&#160;Functions deployment is supported on the following platforms and versions.</p>
498494
</div>
@@ -521,7 +517,7 @@ <h4 id="supported-OCF">2.1.1. Supported platforms</h4>
521517
</div>
522518
</div>
523519
<div class="sect3">
524-
<h4 id="add-config-OCF">2.1.2. Additional configuration requirements</h4>
520+
<h4 id="add-config-{context}">2.1.2. Additional configuration requirements</h4>
525521
<div class="ulist">
526522
<div class="title">Additional resources</div>
527523
<ul>
@@ -597,11 +593,7 @@ <h4 id="applying_yaml_configuration_for_knative_operators">2.3.1. Applying YAML
597593
</div>
598594
<div id="footer">
599595
<div id="footer-text">
600-
<<<<<<< HEAD
601-
Last updated 2018-10-30 17:15:49 GMT
602-
=======
603-
Last updated 2018-10-31 14:39:34 GMT
604-
>>>>>>> Corrections to project structure and book sub-structures
596+
Last updated 2018-10-31 15:00:59 GMT
605597
</div>
606598
</div>
607599
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github.min.css">

0 commit comments

Comments
 (0)