Merge branch 'master' of https://github.com/cfengine/documentation in…

…to glossary-ii
tzz · Apr 3, 2014 · 168e756 · 168e756
2 parents adb03bb + f0d9d32
commit 168e756
Show file tree

Hide file tree

Showing 82 changed files with 890 additions and 577 deletions.
diff --git a/examples/tutorials/deploy_sketch.markdown b/examples/tutorials/deploy_sketch.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Configure and Deploy a Policy Using Sketches (Enterprise Only) 
 sorting: 16
-categories: [Examples, Tutorials]
+categories: [Examples, Tutorials, Sketches]
 published: true
 alias: examples-tutorials-deploy-sketch.html
 tags: [Examples, Tutorials, Sketch]

diff --git a/examples/tutorials/distribute-files-from-a-central-location.markdown b/examples/tutorials/distribute-files-from-a-central-location.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Distribute files from a central location
 sorting: 10
-categories: [Examples, Tutorials]
+categories: [Examples, Tutorials, File Distribution]
 published: true
 alias: examples-tutorials-distribute-files-from-a-central-location.html
 tags: [Examples, Tutorials, file distribution]

diff --git a/examples/tutorials/hello_world.markdown b/examples/tutorials/hello_world.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Hello World
 sorting: 15
-categories: [Examples, Tutorials]
+categories: [Examples, Tutorials, Hello World]
 published: true
 alias: examples-tutorials-hello-world.html
 tags: [Examples, Tutorials, hello-world, stand-alone]

diff --git a/examples/tutorials/template.markdown b/examples/tutorials/template.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Template
 sorting: 15
-categories: [Examples, Tutorials]
+categories: [Examples, Tutorials, Template]
 published: false
 alias: examples-tutorials-template.html
 tags: [Examples, Tutorials, Template]

diff --git a/overviews.markdown b/overviews.markdown
@@ -1,10 +1,10 @@
 ---
 layout: default
 title: Overviews
-categories: [Getting Started, Overviews]
+categories: [Overviews]
 published: true
 sorting: 30
-alias: getting-started-overviews.html
+alias: overviews.html
 ---
 
 Read these overviews to get a good understanding of CFEngine fundamentals.

diff --git a/overviews/learning-resources.markdown b/overviews/learning-resources.markdown
@@ -0,0 +1,9 @@
+---
+layout: default
+title: Learning Resources 
+categories: [Overviews, Learning Resources]
+published: true
+sorting: 40
+alias: overviews-learning-resources.html
+tags: [overviews, learning]
+---
diff --git a/overviews/learning-resources/latest-release.markdown b/overviews/learning-resources/latest-release.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Latest Release
-categories: [Overviews,Resources,Latest Release]
+categories: [Overviews,Learning Resources,Latest Release]
 published: true
 sorting: 60
 alias: overviews-resources-latest-release.html

diff --git a/overviews/learning-resources/latest-release/known-issues.markdown b/overviews/learning-resources/latest-release/known-issues.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Known Issues
 sorting: 30
-categories: [Overviews,Resources,Latest Release, Known Issues]
+categories: [Overviews,Learning Resources,Latest Release, Known Issues]
 published: true
 alias: overviews-resources-latest-release-known-issues.html
 tags: [overviews, releases, latest release, 3.6.0, platforms, versions, known issues]

diff --git a/overviews/learning-resources/latest-release/supported-platforms.markdown b/overviews/learning-resources/latest-release/supported-platforms.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Supported Platforms and Versions
 sorting: 40
-categories: [Overviews,Resources,Latest Release,Supported Platforms]
+categories: [Overviews,Learning Resources,Latest Release,Supported Platforms]
 published: true
 alias: overviews-resources-latest-release-supported-platforms.html
 tags: [overviews, releases, latest release, 3.6.0, platforms, versions, support]

diff --git a/overviews/learning-resources/latest-release/upgrade.markdown b/overviews/learning-resources/latest-release/upgrade.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Upgrade Instructions
 sorting: 50
-categories: [Overviews,Resources,Latest Release, Upgrade]
+categories: [Overviews,Learning Resources,Latest Release, Upgrade]
 published: true
 alias: overviews-resources-latest-release-upgrade.html
 tags: [overviews, releases, latest release, 3.6.0, platforms, versions, upgrade]

diff --git a/overviews/learning-resources/latest-release/whatsnew.markdown b/overviews/learning-resources/latest-release/whatsnew.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: New in CFEngine
-categories: [Overviews,Resources,Latest Release, New in CFEngine]
+categories: [Overviews,Learning Resources,Latest Release, New in CFEngine]
 published: true
 sorting: 10
 alias: overviews-resources-latest-release-whats-new.html

diff --git a/overviews/learning-resources/learning-tools.markdown b/overviews/learning-resources/learning-tools.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Learning Tools 
-categories: [Overviews, Learning Tools]
+categories: [Overviews, Learning Resources, Learning Tools]
 published: true
 sorting: 40
 alias: overviews-learning-tools.html

diff --git a/overviews/learning-resources/new-users.markdown b/overviews/learning-resources/new-users.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Up and Running
 sorting: 13
-categories: [Examples, Tutorials]
+categories: [Overviews, Learning Resources, Tutorials]
 published: true
 alias: new-users.html
 tags: [Examples, Tutorials, Community]

diff --git a/overviews/learning-resources/support-and-community.markdown b/overviews/learning-resources/support-and-community.markdown
@@ -2,7 +2,7 @@
 layout: default
 title: Support and Community
 sorting: 50
-categories: [Overviews, Support and Community]
+categories: [Overviews, Learning Resources,Support and Community]
 published: true
 alias: overviews-support-and-community.html
 tags: [overviews, support, community, bugs, help]

diff --git a/overviews/manuals.markdown b/overviews/manuals.markdown
@@ -4,7 +4,7 @@ title: Learning CFEngine
 categories: [Overviews, Manuals]
 published: true
 sorting: 30
-alias: overviews,manuals.html
+alias: overviews-manuals.html
 tags: [overviews, manuals]
 ---
 

diff --git a/overviews/policy-promises-overview.markdown → ...ews/policy-and-promises-overview.markdown b/overviews/policy-promises-overview.markdown → ...ews/policy-and-promises-overview.markdown
@@ -1,8 +1,8 @@
 ---
 layout: default
-title: Promises Overview
+title: Policy and Promises Overview
 sorting: 100
-categories: [Overviews, Promises Overview]
+categories: [Overviews, Policy and Promises Overview]
 published: true
 alias: overviews-promises.html
 tags: [overviews, promises overview]

diff --git a/...mises-overview/language-concepts.markdown → ...mises-overview/language-concepts.markdown b/...mises-overview/language-concepts.markdown → ...mises-overview/language-concepts.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Language Concepts
-categories: [Overviews, Language Concepts]
+categories: [Overviews, Policy and Promises Overview, Language Concepts]
 published: true
 sorting: 40
 alias: overviews-language-concepts.html

diff --git a/...verview/language-concepts/bodies.markdown → ...verview/language-concepts/bodies.markdown b/...verview/language-concepts/bodies.markdown → ...verview/language-concepts/bodies.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Bodies
-categories: [Manuals, Language Concepts, Bodies]
+categories: [Overviews,Policy and Promises Overview, Language Concepts, Bodies]
 published: true
 sorting: 30
 alias: manuals-language-concepts-bodies.html

diff --git a/...erview/language-concepts/bundles.markdown → ...erview/language-concepts/bundles.markdown b/...erview/language-concepts/bundles.markdown → ...erview/language-concepts/bundles.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Bundles
-categories: [Manuals, Language Concepts, Bundles]
+categories: [Overviews,Policy and Promises Overview, Language Concepts, Bundles]
 published: true
 sorting: 20
 alias: manuals-language-concepts-bundles.html

diff --git a/...erview/language-concepts/classes.markdown → ...erview/language-concepts/classes.markdown b/...erview/language-concepts/classes.markdown → ...erview/language-concepts/classes.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Classes and Decisions
-categories: [Manuals, Language Concepts, Classes]
+categories: [Overviews,Policy and Promises Overview, Language Concepts, Classes]
 published: true
 sorting: 40
 alias: manuals-language-concepts-classes.html

diff --git a/...overview/language-concepts/loops.markdown → ...overview/language-concepts/loops.markdown b/...overview/language-concepts/loops.markdown → ...overview/language-concepts/loops.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Loops
-categories: [Manuals, Language Concepts, Loops]
+categories: [Overviews, Policy and Promises Overview, Language Concepts, Loops]
 published: true
 sorting: 70
 alias: manuals-language-concepts-loops.html

diff --git a/...iew/language-concepts/namespaces.markdown → ...iew/language-concepts/namespaces.markdown b/...iew/language-concepts/namespaces.markdown → ...iew/language-concepts/namespaces.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Namespaces
-categories: [Manuals, Language Concepts, Namespaces]
+categories: [Overviews,Policy and Promises Overview, Language Concepts, Namespaces]
 published: true
 sorting: 90
 alias: manuals-language-concepts-namespaces.html

diff --git a/...anguage-concepts/normal-ordering.markdown → ...anguage-concepts/normal-ordering.markdown b/...anguage-concepts/normal-ordering.markdown → ...anguage-concepts/normal-ordering.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Normal Ordering
-categories: [Manuals, Language Concepts, Normal Ordering]
+categories: [Overviews,Policy and Promises Overview, Language Concepts, Normal Ordering]
 published: true
 sorting: 60
 alias: manuals-language-concepts-normal-ordering.html

diff --git a/...pattern-matching-and-referencing.markdown → ...pattern-matching-and-referencing.markdown b/...pattern-matching-and-referencing.markdown → ...pattern-matching-and-referencing.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Pattern Matching and Referencing
-categories: [Manuals, Language Concepts, Pattern Matching and Referencing]
+categories: [Overviews,Policy and Promises Overview, Language Concepts, Pattern Matching and Referencing]
 published: true
 sorting: 80
 alias: manuals-language-concepts-pattern-matching-and-referencing.html

diff --git a/...rview/language-concepts/promises.markdown → ...rview/language-concepts/promises.markdown b/...rview/language-concepts/promises.markdown → ...rview/language-concepts/promises.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Promises
-categories: [Manuals, Language Concepts, Promises]
+categories: [Overviews,Policy and Promises Overview, Language Concepts, Promises]
 published: true
 sorting: 10
 alias: manuals-language-concepts-promises.html

diff --git a/...view/language-concepts/variables.markdown → ...view/language-concepts/variables.markdown b/...view/language-concepts/variables.markdown → ...view/language-concepts/variables.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Variables
-categories: [Manuals, Language Concepts, Variables]
+categories: [Overviews,Policy and Promises Overview, Language Concepts, Variables]
 published: true
 sorting: 50
 alias: manuals-language-concepts-variables.html

diff --git a/...promises-overview/writing-policy.markdown → ...promises-overview/writing-policy.markdown b/...promises-overview/writing-policy.markdown → ...promises-overview/writing-policy.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Writing Policy
-categories: [Overviews, Writing Policy]
+categories: [Overviews, Policy and Promises Overview, Writing Policy]
 published: true
 sorting: 50
 alias: overviews-writing-policy.html

diff --git a/...ew/writing-policy/best-practices.markdown → ...ew/writing-policy/best-practices.markdown b/...ew/writing-policy/best-practices.markdown → ...ew/writing-policy/best-practices.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Best Practices
-categories: [Manuals, Writing Policy, Best Practices]
+categories: [Overviews, Policy and Promises Overview, Writing Policy, Best Practices]
 published: true
 sorting: 15
 alias: manuals-writing-policy-best-practices.html

diff --git a/...practices/bundles-best-practices.markdown → ...practices/bundles-best-practices.markdown b/...practices/bundles-best-practices.markdown → ...practices/bundles-best-practices.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Bundles Best Practices
-categories: [Manuals, Writing Policy, Best Practices, Bundles Best
+categories: [Overviews, Policy and Promises Overview, Writing Policy, Best Practices, Bundles Best
 Practices]
 published: true
 sorting: 20

diff --git a/...ces/configuration-file-structure.markdown → ...ces/configuration-file-structure.markdown b/...ces/configuration-file-structure.markdown → ...ces/configuration-file-structure.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Default Configuration File Structure
-categories: [Manuals, Writing Policy, Best Practices, Configuration File Structure]
+categories: [Overviews, Policy and Promises Overview, Writing Policy, Best Practices, Configuration File Structure]
 published: true
 sorting: 40
 alias: manuals-writing-policy-configuration-file-structure.html

diff --git a/...licy/best-practices/policy-style.markdown → ...licy/best-practices/policy-style.markdown b/...licy/best-practices/policy-style.markdown → ...licy/best-practices/policy-style.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Policy Style Guide
-categories: [Manuals, Writing Policy, Best Practices, Policy Style Guide]
+categories: [Overviews, Policy and Promises Overview, Writing Policy, Best Practices, Policy Style Guide]
 published: true
 sorting: 10
 alias: manuals-writing-policy-policy-style-guide.html

diff --git a/...ces/testing_non_privelegded_user.markdown → ...ces/testing_non_privelegded_user.markdown b/...ces/testing_non_privelegded_user.markdown → ...ces/testing_non_privelegded_user.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Testing Policies
-categories: [Manuals, Writing Policy, Best Practices, Testing Policies]
+categories: [Overviews, Policy and Promises Overview, Writing Policy, Best Practices, Testing Policies]
 published: true
 sorting: 50
 alias: manuals-writing-policy-testing-policies.html

diff --git a/...riting-policy/configure-cfengine.markdown → ...riting-policy/configure-cfengine.markdown b/...riting-policy/configure-cfengine.markdown → ...riting-policy/configure-cfengine.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Configure CFEngine
-categories: [Manuals, Writing Policy, Configure CFEngine]
+categories: [Overviews, Policy and Promises Overview, Writing Policy, Configure CFEngine]
 published: true
 sorting: 30
 alias: manuals-writing-policy-configure-cfengine.html

diff --git a/...e-cfengine/controlling-frequency.markdown → ...e-cfengine/controlling-frequency.markdown b/...e-cfengine/controlling-frequency.markdown → ...e-cfengine/controlling-frequency.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Controlling Frequency
-categories: [Manuals, Writing Policy, Configure CFEngine, Controlling Frequency]
+categories: [Overviews, Policy and Promises Overview, Writing Policy, Configure CFEngine, Controlling Frequency]
 published: true
 sorting: 20
 alias: manuals-writing-policy-controlling-frequency.html

diff --git a/...nfigure-cfengine/version-control.markdown → ...nfigure-cfengine/version-control.markdown b/...nfigure-cfengine/version-control.markdown → ...nfigure-cfengine/version-control.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Version Control
-categories: [Manuals, Writing Policy, Configure CFEngine, Version Control]
+categories: [Overviews, Policy and Promises Overview, Writing Policy, Configure CFEngine, Version Control]
 published: true
 sorting: 40
 alias: manuals-writing-policy-version-control.html

diff --git a/...w/writing-policy/policy-concepts.markdown → ...w/writing-policy/policy-concepts.markdown b/...w/writing-policy/policy-concepts.markdown → ...w/writing-policy/policy-concepts.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Policy Concepts
-categories: [Manuals, Writing Policy, Policy Concepts]
+categories: [Overviews, Policy and Promises Overview, Writing Policy, Policy Concepts]
 published: true
 sorting: 20
 alias: manuals-writing-policy-policy-concepts.html

diff --git a/...policy-concepts/policy-framework.markdown → ...policy-concepts/policy-framework.markdown b/...policy-concepts/policy-framework.markdown → ...policy-concepts/policy-framework.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Policy Framework
-categories: [Manuals, Writing Policy, Policy Concepts, Policy Framework]
+categories: [Overviews, Policy and Promises Overview, Writing Policy, Policy Concepts, Policy Framework]
 published: true
 sorting: 20
 alias: manuals-writing-policy-policy-framework.html

diff --git a/overviews/reports/command-line-reports.markdown b/overviews/reports/command-line-reports.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Command-Line Reports
-categories: [Manuals, Reports, Command-Line Reports]
+categories: [Overviews, Reports, Command-Line Reports]
 published: true
 sorting: 60
 alias: manuals-reports-command-line.html

diff --git a/overviews/reports/enterprise-reporting.markdown b/overviews/reports/enterprise-reporting.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
-title: Enterprise Report API
-categories: [Manuals, Reports, Enterprise Report API]
+title: Enterprise Reporting
+categories: [Overviews, Reports, Enterprise Reporting]
 published: true
 sorting: 20
 alias: manuals-enterprise-reporting.html

diff --git a/overviews/reports/enterprise-reporting/multi-site-queries.markdown b/overviews/reports/enterprise-reporting/multi-site-queries.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title:  Multi-Site Queries
-categories: [Manuals, Reports, Enterprise Report API, Multi-Site Queries]
+categories: [Overviews, Reports, Enterprise Reporting, Multi-Site Queries]
 published: true
 sorting: 40
 alias: manuals-enterprise-reporting-multi-site-queries.html

diff --git a/overviews/reports/enterprise-reporting/porting-guide.markdown b/overviews/reports/enterprise-reporting/porting-guide.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title:  API Porting Guide
-categories: [Manuals, Enterprise API, Porting Guide]
+categories: [Overviews, Reports, Enterprise Reporting, Porting Guide]
 published: true
 sorting: 90
 alias: manuals-enterprise-reporting-porting-guide.html

diff --git a/overviews/reports/enterprise-reporting/reporting-architecture.markdown b/overviews/reports/enterprise-reporting/reporting-architecture.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Reporting Architecture
-categories: [Manuals, Reports, Enterprise Report API, Architecture]
+categories: [Overviews, Reports, Enterprise Reporting, Architecture]
 published: true
 sorting: 10
 alias: manuals-enterprise-reporting-architecture.html

diff --git a/overviews/reports/enterprise-reporting/sql-queries.markdown b/overviews/reports/enterprise-reporting/sql-queries.markdown
@@ -1,7 +1,7 @@
 ---
 layout: default
 title:  SQL Queries
-categories: [Manuals, Reports, Enterprise Report API, SQL Queries]
+categories: [Overviews, Reports, Enterprise Reporting, SQL Queries]
 published: true
 sorting: 30
 alias: manuals-enterprise-reporting-sql-queries.html