You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mw...@apache.org on 2018/10/18 19:47:40 UTC
[accumulo-website] branch master updated: Fixes #67 - Move features
and glossary pages into docs (#121)
This is an automated email from the ASF dual-hosted git repository.
mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git
The following commit(s) were added to refs/heads/master by this push:
new 2ca95a8 Fixes #67 - Move features and glossary pages into docs (#121)
2ca95a8 is described below
commit 2ca95a87e850236798d1a1b277f71d7c1bfe375e
Author: Mike Walch <mw...@apache.org>
AuthorDate: Thu Oct 18 15:47:36 2018 -0400
Fixes #67 - Move features and glossary pages into docs (#121)
* Improved linking to docs from main page
---
_docs-2/getting-started/clients.md | 2 +-
{pages => _docs-2/getting-started}/features.md | 7 +++++--
{pages => _docs-2/getting-started}/glossary.md | 4 +++-
_docs-2/getting-started/quick-install.md | 2 +-
_docs-2/getting-started/shell.md | 2 +-
_docs-2/getting-started/table_configuration.md | 2 +-
_docs-2/getting-started/table_design.md | 2 +-
_includes/nav.html | 4 +---
index.html | 8 ++++----
9 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/_docs-2/getting-started/clients.md b/_docs-2/getting-started/clients.md
index c07d326..2943b42 100644
--- a/_docs-2/getting-started/clients.md
+++ b/_docs-2/getting-started/clients.md
@@ -1,7 +1,7 @@
---
title: Accumulo Clients
category: getting-started
-order: 3
+order: 4
---
## Creating Client Code
diff --git a/pages/features.md b/_docs-2/getting-started/features.md
similarity index 99%
rename from pages/features.md
rename to _docs-2/getting-started/features.md
index 2e866e8..8c12516 100644
--- a/pages/features.md
+++ b/_docs-2/getting-started/features.md
@@ -1,7 +1,10 @@
---
title: Features
-permalink: /features/
-redirect_from: /notable_features
+category: getting-started
+order: 2
+redirect_from:
+ - /features/
+ - /notable_features/
---
{::options toc_levels="2" /}
diff --git a/pages/glossary.md b/_docs-2/getting-started/glossary.md
similarity index 98%
rename from pages/glossary.md
rename to _docs-2/getting-started/glossary.md
index fbbea1d..91ff353 100644
--- a/pages/glossary.md
+++ b/_docs-2/getting-started/glossary.md
@@ -1,6 +1,8 @@
---
title: Glossary
-permalink: /glossary/
+category: getting-started
+order: 8
+redirect_from: /glossary/
---
authorizations
diff --git a/_docs-2/getting-started/quick-install.md b/_docs-2/getting-started/quick-install.md
index 0307ed8..e2034a3 100644
--- a/_docs-2/getting-started/quick-install.md
+++ b/_docs-2/getting-started/quick-install.md
@@ -1,7 +1,7 @@
---
title: Quick Installation
category: getting-started
-order: 2
+order: 3
---
<!-- IMPORTANT: This file should mirror (with minor differences) INSTALL.md in the Accumulo repo -->
diff --git a/_docs-2/getting-started/shell.md b/_docs-2/getting-started/shell.md
index ab6edcd..60b4368 100644
--- a/_docs-2/getting-started/shell.md
+++ b/_docs-2/getting-started/shell.md
@@ -1,7 +1,7 @@
---
title: Accumulo Shell
category: getting-started
-order: 4
+order: 5
---
Accumulo provides a simple shell that can be used to examine the contents and
diff --git a/_docs-2/getting-started/table_configuration.md b/_docs-2/getting-started/table_configuration.md
index 21a648e..03bf212 100644
--- a/_docs-2/getting-started/table_configuration.md
+++ b/_docs-2/getting-started/table_configuration.md
@@ -1,7 +1,7 @@
---
title: Table Configuration
category: getting-started
-order: 6
+order: 7
---
Accumulo tables have a few options that can be configured to alter the default
diff --git a/_docs-2/getting-started/table_design.md b/_docs-2/getting-started/table_design.md
index babb9af..0d10e88 100644
--- a/_docs-2/getting-started/table_design.md
+++ b/_docs-2/getting-started/table_design.md
@@ -1,7 +1,7 @@
---
title: Table Design
category: getting-started
-order: 5
+order: 6
---
### Basic Table
diff --git a/_includes/nav.html b/_includes/nav.html
index 943dc28..f4c3fe1 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -25,12 +25,10 @@
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
<ul class="dropdown-menu">
+ <li><a href="{{ site.docs_baseurl }}/getting-started/design/">User Manual (2.x)</a></li>
<li><a href="{{ site.baseurl }}/quickstart-1.x">Quickstart (1.x)</a></li>
<li><a href="{{ site.baseurl }}/{{ site.latest_minor_release }}/accumulo_user_manual.html">User Manual ({{ site.latest_minor_release }})</a></li>
<li><a href="{{ site.baseurl }}/{{ site.latest_minor_release }}/apidocs">Javadocs ({{ site.latest_minor_release }})</a></li>
- <li><a href="{{ site.baseurl }}/{{ site.latest_minor_release }}/examples">Examples ({{ site.latest_minor_release }})</a></li>
- <li><a href="{{ site.baseurl }}/features">Features</a></li>
- <li><a href="{{ site.baseurl }}/glossary">Glossary</a></li>
<li><a href="{{ site.baseurl }}/external-docs">External Docs</a></li>
<li><a href="{{ site.baseurl }}/docs-archive/">Archive</a></li>
</ul>
diff --git a/index.html b/index.html
index 4fb54a7..f10f9db 100644
--- a/index.html
+++ b/index.html
@@ -17,21 +17,21 @@ skiph1fortitle: true
<div class="row">
<div class="col-md-6">
<h4>Server-side programming</h4>
- <p>Accumulo has a programing meachinism (called Iterators) that can modify key/value pairs at various points in the data management process.</p>
+ <p>Accumulo has a programing meachinism (called <a href="{{ site.docs_baseurl }}/development/iterators">Iterators</a>) that can modify key/value pairs at various points in the data management process.</p>
</div>
<div class="col-md-6">
<h4>Cell-based access control</h4>
- <p>Every Accumulo key/value pair has its own security label which limits query results based off user authorizations.</p>
+ <p>Every Accumulo key/value pair has its own <a href="{{ site.docs_baseurl }}/development/security#security-label-expressions">security label</a> which limits query results based off user authorizations.</p>
</div>
</div>
<div class="row">
<div class="col-md-6">
<h4>Designed to scale</h4>
- <p>Accumulo runs on a cluster using one or more HDFS instances. Nodes can be added or removed as the amount of data stored in Accumulo changes.</p>
+ <p>Accumulo runs on a cluster using <a href="{{ site.docs_baseurl }}/administration/multivolume">one or more HDFS instances</a>. Nodes can be added or removed as the amount of data stored in Accumulo changes.</p>
</div>
<div class="col-md-6">
<h4>Stable</h4>
- <p>Accumulo has a stable <a href="/latest/apidocs">client API</a> that follows <a href="https://semver.org">semantic versioning</a>. Each Accumulo release goes through <a href="/features/#testing">extensive testing</a>.</p>
+ <p>Accumulo has a stable <a href="/latest/apidocs">client API</a> that follows <a href="https://semver.org">semantic versioning</a>. Each Accumulo release goes through <a href="{{ site.docs_baseurl }}/getting-started/features/#testing">extensive testing</a>.</p>
</div>
</div>
</div>