diff --git a/.github/workflows/bump-hugo-version.yml b/.github/workflows/bump-hugo-version.yml new file mode 100644 index 000000000..0617c3cf7 --- /dev/null +++ b/.github/workflows/bump-hugo-version.yml @@ -0,0 +1,42 @@ +name: Hugo version update + +on: + schedule: + - cron: "0 0 * * 0" #perform every sunday's night + workflow_dispatch: + +jobs: + update_hugo_version: + if: github.repository_owner == 'cfengine' || github.repository_owner == 'mendersoftware' || github.repository_owner == 'NorthernTechHQ' + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + steps: + - uses: actions/checkout@v4 + - name: Fetch latest Hugo release info + id: fetch_hugo_version + run: | + release_info=$(curl -s https://api.github.com/repos/gohugoio/hugo/releases/latest) + version=$(echo "$release_info" | jq -r '.tag_name' | sed 's/v//') + # download checksums and find checksum of hugo_${version}_Linux-64bit.tar.gz + checksum=$( curl -sSL https://github.com/gohugoio/hugo/releases/download/v${version}/hugo_${version}_checksums.txt | grep hugo_${version}_Linux-64bit.tar.gz | grep -oE "[a-z0-9]{64}") + echo "version=$version" >> $GITHUB_OUTPUT + echo "checksum=$checksum" >> $GITHUB_OUTPUT + + - name: Update install_hugo.sh + run: | + sed -i "s|https://github.com/gohugoio/hugo/releases/download/v.*_Linux-64bit.tar.gz|https://github.com/gohugoio/hugo/releases/download/v${{ steps.fetch_hugo_version.outputs.version }}/hugo_${{ steps.fetch_hugo_version.outputs.version }}_Linux-64bit.tar.gz|" generator/build/install_hugo.sh + sed -i "s/.*sha256sum.*/RUN echo \"${{ steps.fetch_hugo_version.outputs.checksum }} hugo.tar.gz\" | sha256sum -c/" generator/build/install_hugo.sh + - name: Create Pull Request + uses: cfengine/create-pull-request@v7 + with: + commit-message: Upgraded Hugo version to ${{ steps.fetch_hugo_version.outputs.version }} + title: Upgraded Hugo version to ${{ steps.fetch_hugo_version.outputs.version }} + body: | + This PR updates the version of Hugo used in the generator/build/install_hugo.sh to ${{ steps.fetch_hugo_version.outputs.version }}. + reviewers: | + aleksandrychev + + branch: hugo-version-update-${{ steps.fetch_hugo_version.outputs.version }} + sign-commits: true diff --git a/README.md b/README.md index 496fc4c5b..9888017c7 100644 --- a/README.md +++ b/README.md @@ -223,18 +223,14 @@ Note: Do not use markdown files prefixed with `.`. They are not picked up by the Additional META tags you should set are: - layout: default - -Leave this as `default`. - title: "The Title" The title of the page. Quoting is only necessary if the title contains YAML keywords (like "on"). - published: true|false + hidden: true -Pages that set this tag to `false` will not be part of the navigation structure. +Pages that set this tag to `true` will not be part of the navigation structure. The HTML content will however be generated. tags: [list, of, tags with space, all lowercase] @@ -326,7 +322,7 @@ With single backticks, this would link to the documentation of the `meta` attrib ### Custom macros The documentation generator will pre-process the markdown content -before passing it to Jekyll for the rendering. The pre-processor +before passing it to Hugo for the rendering. The pre-processor understands and replaces the macros. Macros all have the form `[%CFEngine_MACRO(parameters)%]` @@ -518,11 +514,11 @@ links. - follow the [Policy style guide](guide/writing-and-serving-policy/policy-style.markdown) in examples and code snippets -- use the appropriate lexer for syntax highlighting via Pygments +- use the appropriate lexer for syntax highlighting via Chroma Most important are the `cf3` lexer, as well as `bash`, `console`, - `diff`, `shell-session` and `sql`. But Jekyll supports - [many more lexers](https://pygments.org/docs/lexers/) + `diff`, `shell-session` and `sql`. But Hugo supports + [many more lexers](https://gohugo.io/content-management/syntax-highlighting/#languages) - avoid custom color schemes and hand-coded HTML - document the example after the example code @@ -668,9 +664,9 @@ Special variables are documented within the page of their context. ## Publishing -Jekyll is used to generate the HTML pages. The toolchain is available at +Hugo is used to generate the HTML pages. The toolchain is available at https://github.com/cfengine/documentation/tree/master/generator. After you compile pages, -Jekyll will place all files into the \_site folder, without subdirectories. +Hugo will place all files into the \_site folder. Commits in this repository trigger the documentation generator to run, which then updates the contents of https://docs.cfengine.com/docs/ diff --git a/cheatsheet.markdown b/cheatsheet.markdown index 7eab1cae7..37dfdd8f0 100644 --- a/cheatsheet.markdown +++ b/cheatsheet.markdown @@ -1,7 +1,6 @@ --- layout: printable title: Markdown cheatsheet -published: true sorting: 1 alias: markdown-cheatsheet.html --- diff --git a/index.markdown b/content/_index.markdown similarity index 69% rename from index.markdown rename to content/_index.markdown index ea3b675b5..edb52d195 100644 --- a/index.markdown +++ b/content/_index.markdown @@ -1,7 +1,6 @@ --- layout: index title: Home -published: true sorting: 1 categories: ["index"] alias: index.html @@ -14,53 +13,53 @@ alias: index.html It includes the reference for the following versions of CFEngine:
- Go to the page + Go to the page diff --git a/api.markdown b/content/api/_index.markdown similarity index 97% rename from api.markdown rename to content/api/_index.markdown index 9c3bafa32..1115f9dd2 100644 --- a/api.markdown +++ b/content/api/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: API -published: true sorting: 50 --- diff --git a/api/enterprise-api-architecture-overview.png b/content/api/enterprise-api-architecture-overview.png similarity index 100% rename from api/enterprise-api-architecture-overview.png rename to content/api/enterprise-api-architecture-overview.png diff --git a/api/enterprise-api-examples.markdown b/content/api/enterprise-api-examples/_index.markdown similarity index 97% rename from api/enterprise-api-examples.markdown rename to content/api/enterprise-api-examples/_index.markdown index b985f046e..cef678e45 100644 --- a/api/enterprise-api-examples.markdown +++ b/content/api/enterprise-api-examples/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Enterprise API examples -published: true sorting: 6 --- diff --git a/api/enterprise-api-examples/browsing-host-information.markdown b/content/api/enterprise-api-examples/browsing-host-information.markdown similarity index 99% rename from api/enterprise-api-examples/browsing-host-information.markdown rename to content/api/enterprise-api-examples/browsing-host-information.markdown index dc6cedf43..92d07ddec 100644 --- a/api/enterprise-api-examples/browsing-host-information.markdown +++ b/content/api/enterprise-api-examples/browsing-host-information.markdown @@ -1,7 +1,6 @@ --- layout: default title: Browsing host information -published: true sorting: 50 --- diff --git a/api/enterprise-api-examples/changes-api-usage.markdown b/content/api/enterprise-api-examples/changes-api-usage.markdown similarity index 99% rename from api/enterprise-api-examples/changes-api-usage.markdown rename to content/api/enterprise-api-examples/changes-api-usage.markdown index 355408a11..299da06af 100644 --- a/api/enterprise-api-examples/changes-api-usage.markdown +++ b/content/api/enterprise-api-examples/changes-api-usage.markdown @@ -1,7 +1,6 @@ --- layout: default title: Tracking changes -published: true sorting: 50 --- diff --git a/api/enterprise-api-examples/checking-status.markdown b/content/api/enterprise-api-examples/checking-status.markdown similarity index 98% rename from api/enterprise-api-examples/checking-status.markdown rename to content/api/enterprise-api-examples/checking-status.markdown index 9b661da4b..3c9d54bbd 100644 --- a/api/enterprise-api-examples/checking-status.markdown +++ b/content/api/enterprise-api-examples/checking-status.markdown @@ -1,7 +1,6 @@ --- layout: default title: Checking status -published: true sorting: 20 --- diff --git a/api/enterprise-api-examples/managing-settings.markdown b/content/api/enterprise-api-examples/managing-settings.markdown similarity index 99% rename from api/enterprise-api-examples/managing-settings.markdown rename to content/api/enterprise-api-examples/managing-settings.markdown index ae55781a9..e1d657627 100644 --- a/api/enterprise-api-examples/managing-settings.markdown +++ b/content/api/enterprise-api-examples/managing-settings.markdown @@ -1,7 +1,6 @@ --- layout: default title: Managing settings -published: true sorting: 30 --- diff --git a/api/enterprise-api-examples/managing-users-and-roles.markdown b/content/api/enterprise-api-examples/managing-users-and-roles.markdown similarity index 99% rename from api/enterprise-api-examples/managing-users-and-roles.markdown rename to content/api/enterprise-api-examples/managing-users-and-roles.markdown index c97d56296..04c446df8 100644 --- a/api/enterprise-api-examples/managing-users-and-roles.markdown +++ b/content/api/enterprise-api-examples/managing-users-and-roles.markdown @@ -1,7 +1,6 @@ --- layout: default title: Managing users and roles -published: true sorting: 40 --- diff --git a/api/enterprise-api-examples/sql-queries.markdown b/content/api/enterprise-api-examples/sql-queries.markdown similarity index 99% rename from api/enterprise-api-examples/sql-queries.markdown rename to content/api/enterprise-api-examples/sql-queries.markdown index 5641ef2d6..f72d6e9ed 100644 --- a/api/enterprise-api-examples/sql-queries.markdown +++ b/content/api/enterprise-api-examples/sql-queries.markdown @@ -1,7 +1,6 @@ --- layout: default title: SQL query examples -published: true --- ### Synchronous Example: Listing hostname and IP for Ubuntu hosts diff --git a/api/enterprise-api-ref.markdown b/content/api/enterprise-api-ref/_index.markdown similarity index 99% rename from api/enterprise-api-ref.markdown rename to content/api/enterprise-api-ref/_index.markdown index 7b40be442..565bb4dae 100644 --- a/api/enterprise-api-ref.markdown +++ b/content/api/enterprise-api-ref/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Enterprise API reference -published: true sorting: 70 --- diff --git a/api/enterprise-api-ref/actions-api.markdown b/content/api/enterprise-api-ref/actions-api.markdown similarity index 98% rename from api/enterprise-api-ref/actions-api.markdown rename to content/api/enterprise-api-ref/actions-api.markdown index a793d962a..420e5c10b 100644 --- a/api/enterprise-api-ref/actions-api.markdown +++ b/content/api/enterprise-api-ref/actions-api.markdown @@ -1,7 +1,6 @@ --- layout: default title: Actions API -published: true --- Actions API enables you to perform specific actions such a requesting report collection. diff --git a/api/enterprise-api-ref/audit-logs-api.markdown b/content/api/enterprise-api-ref/audit-logs-api.markdown similarity index 99% rename from api/enterprise-api-ref/audit-logs-api.markdown rename to content/api/enterprise-api-ref/audit-logs-api.markdown index e8a0ca676..739d99b00 100644 --- a/api/enterprise-api-ref/audit-logs-api.markdown +++ b/content/api/enterprise-api-ref/audit-logs-api.markdown @@ -1,7 +1,6 @@ --- layout: default title: Audit log API -published: true --- Audit log API provides access to system audit logs that track user actions across the platform made to critical parts diff --git a/api/enterprise-api-ref/build-api.markdown b/content/api/enterprise-api-ref/build-api.markdown similarity index 99% rename from api/enterprise-api-ref/build-api.markdown rename to content/api/enterprise-api-ref/build-api.markdown index 7953fac7f..329a30b25 100644 --- a/api/enterprise-api-ref/build-api.markdown +++ b/content/api/enterprise-api-ref/build-api.markdown @@ -1,7 +1,6 @@ --- layout: default title: Build API -published: true --- The Build API enables you to easily manage policy projects and their respective CFEngine Build modules. diff --git a/api/enterprise-api-ref/changes.markdown b/content/api/enterprise-api-ref/changes.markdown similarity index 99% rename from api/enterprise-api-ref/changes.markdown rename to content/api/enterprise-api-ref/changes.markdown index cbae5c2c0..2278e26e8 100644 --- a/api/enterprise-api-ref/changes.markdown +++ b/content/api/enterprise-api-ref/changes.markdown @@ -1,7 +1,6 @@ --- layout: default title: Changes REST API -published: true --- **Changes API** allows to track changes performed by CFEngine agent in the infrastructure. diff --git a/api/enterprise-api-ref/cmdb-api.markdown b/content/api/enterprise-api-ref/cmdb-api.markdown similarity index 99% rename from api/enterprise-api-ref/cmdb-api.markdown rename to content/api/enterprise-api-ref/cmdb-api.markdown index 5c728d8d0..1be7842d5 100644 --- a/api/enterprise-api-ref/cmdb-api.markdown +++ b/content/api/enterprise-api-ref/cmdb-api.markdown @@ -1,7 +1,6 @@ --- layout: default title: CMDB API -published: true --- The configuration management database (CMDB) API enables you to manage classes and variables for specific hosts. diff --git a/api/enterprise-api-ref/export-import-api.markdown b/content/api/enterprise-api-ref/export-import-api.markdown similarity index 99% rename from api/enterprise-api-ref/export-import-api.markdown rename to content/api/enterprise-api-ref/export-import-api.markdown index fc88f61d2..24ce0e75c 100644 --- a/api/enterprise-api-ref/export-import-api.markdown +++ b/content/api/enterprise-api-ref/export-import-api.markdown @@ -1,7 +1,6 @@ --- layout: default title: Import & export API -published: true --- Import & export API provides users the ability to transfer Mission Portal data between hubs. diff --git a/api/enterprise-api-ref/export-import-compliance-report-api.markdown b/content/api/enterprise-api-ref/export-import-compliance-report-api.markdown similarity index 99% rename from api/enterprise-api-ref/export-import-compliance-report-api.markdown rename to content/api/enterprise-api-ref/export-import-compliance-report-api.markdown index ff48aae73..1f8bbcb9a 100644 --- a/api/enterprise-api-ref/export-import-compliance-report-api.markdown +++ b/content/api/enterprise-api-ref/export-import-compliance-report-api.markdown @@ -1,7 +1,6 @@ --- layout: default title: Import & export compliance report API -published: true --- This provides users the ability to transfer compliance reports between hubs or create reports from a JSON definition file. diff --git a/api/enterprise-api-ref/federated-reporting-api.markdown b/content/api/enterprise-api-ref/federated-reporting-api.markdown similarity index 99% rename from api/enterprise-api-ref/federated-reporting-api.markdown rename to content/api/enterprise-api-ref/federated-reporting-api.markdown index 1a36ab1fe..a8ae8ad56 100644 --- a/api/enterprise-api-ref/federated-reporting-api.markdown +++ b/content/api/enterprise-api-ref/federated-reporting-api.markdown @@ -1,7 +1,6 @@ --- layout: default title: Federated reporting configuration API -published: true --- This API is used for configuring hubs so that a single hub can be used to report on any host connected to participating feeder hubs. diff --git a/api/enterprise-api-ref/file-changes.markdown b/content/api/enterprise-api-ref/file-changes.markdown similarity index 99% rename from api/enterprise-api-ref/file-changes.markdown rename to content/api/enterprise-api-ref/file-changes.markdown index 799729b1f..d9e51f19d 100644 --- a/api/enterprise-api-ref/file-changes.markdown +++ b/content/api/enterprise-api-ref/file-changes.markdown @@ -1,7 +1,6 @@ --- layout: default title: File changes API -published: true --- diff --git a/api/enterprise-api-ref/first-time-setup.markdown b/content/api/enterprise-api-ref/first-time-setup.markdown similarity index 99% rename from api/enterprise-api-ref/first-time-setup.markdown rename to content/api/enterprise-api-ref/first-time-setup.markdown index 5362475e1..f4673d159 100644 --- a/api/enterprise-api-ref/first-time-setup.markdown +++ b/content/api/enterprise-api-ref/first-time-setup.markdown @@ -1,7 +1,6 @@ --- layout: default title: Fist time setup API -published: true --- The First time setup API enables creation of the initial administrator user. diff --git a/api/enterprise-api-ref/health-diagnostic.markdown b/content/api/enterprise-api-ref/health-diagnostic.markdown similarity index 99% rename from api/enterprise-api-ref/health-diagnostic.markdown rename to content/api/enterprise-api-ref/health-diagnostic.markdown index dd9766687..e4e3a0271 100644 --- a/api/enterprise-api-ref/health-diagnostic.markdown +++ b/content/api/enterprise-api-ref/health-diagnostic.markdown @@ -1,7 +1,6 @@ --- layout: default title: Health diagnostic API -published: true --- This API provides access to health diagnostic information. diff --git a/api/enterprise-api-ref/host.markdown b/content/api/enterprise-api-ref/host.markdown similarity index 99% rename from api/enterprise-api-ref/host.markdown rename to content/api/enterprise-api-ref/host.markdown index 8b693a95d..425cef8f7 100644 --- a/api/enterprise-api-ref/host.markdown +++ b/content/api/enterprise-api-ref/host.markdown @@ -1,7 +1,6 @@ --- layout: default title: Host REST API -published: true --- Host API allows to access host specific information. diff --git a/api/enterprise-api-ref/inventory.markdown b/content/api/enterprise-api-ref/inventory.markdown similarity index 99% rename from api/enterprise-api-ref/inventory.markdown rename to content/api/enterprise-api-ref/inventory.markdown index f28f90e5d..2008d1b1a 100644 --- a/api/enterprise-api-ref/inventory.markdown +++ b/content/api/enterprise-api-ref/inventory.markdown @@ -1,7 +1,6 @@ --- layout: default title: Inventory API -published: true --- Inventory API allows to access inventory reports and attributes dictionary. diff --git a/api/enterprise-api-ref/ldap-api.markdown b/content/api/enterprise-api-ref/ldap-api.markdown similarity index 99% rename from api/enterprise-api-ref/ldap-api.markdown rename to content/api/enterprise-api-ref/ldap-api.markdown index 2c3276ab3..da85e15c3 100644 --- a/api/enterprise-api-ref/ldap-api.markdown +++ b/content/api/enterprise-api-ref/ldap-api.markdown @@ -1,7 +1,6 @@ --- layout: default title: LDAP authentication API -published: true --- LDAP authentication API allows to check ldap user credentials and change LDAP settings. diff --git a/api/enterprise-api-ref/personal-groups.markdown b/content/api/enterprise-api-ref/personal-groups.markdown similarity index 99% rename from api/enterprise-api-ref/personal-groups.markdown rename to content/api/enterprise-api-ref/personal-groups.markdown index 236f70e12..992552143 100644 --- a/api/enterprise-api-ref/personal-groups.markdown +++ b/content/api/enterprise-api-ref/personal-groups.markdown @@ -1,7 +1,6 @@ --- layout: default title: Personal groups API -published: true --- The personal groups API enables creating host groups based on host filters (the same ones used in inventory reports). diff --git a/api/enterprise-api-ref/query.markdown b/content/api/enterprise-api-ref/query.markdown similarity index 99% rename from api/enterprise-api-ref/query.markdown rename to content/api/enterprise-api-ref/query.markdown index 8f39e35e4..2409a556a 100644 --- a/api/enterprise-api-ref/query.markdown +++ b/content/api/enterprise-api-ref/query.markdown @@ -1,7 +1,6 @@ --- layout: default title: Query REST API -published: true --- In case of a need for full flexibility, Query API allow users to execute SQL queries on CFEngine Database. diff --git a/api/enterprise-api-ref/reset-password.markdown b/content/api/enterprise-api-ref/reset-password.markdown similarity index 99% rename from api/enterprise-api-ref/reset-password.markdown rename to content/api/enterprise-api-ref/reset-password.markdown index 118cef46e..8742c876d 100644 --- a/api/enterprise-api-ref/reset-password.markdown +++ b/content/api/enterprise-api-ref/reset-password.markdown @@ -1,7 +1,6 @@ --- layout: default title: Reset password API -published: true --- ## Request reset password link and token diff --git a/api/enterprise-api-ref/shared-groups.markdown b/content/api/enterprise-api-ref/shared-groups.markdown similarity index 99% rename from api/enterprise-api-ref/shared-groups.markdown rename to content/api/enterprise-api-ref/shared-groups.markdown index e18702eef..e7a9062a3 100644 --- a/api/enterprise-api-ref/shared-groups.markdown +++ b/content/api/enterprise-api-ref/shared-groups.markdown @@ -1,7 +1,6 @@ --- layout: default title: Shared groups API -published: true --- The shared groups API enables creating host groups based on host filters (the same ones used in inventory) and assigning CMDB data to them. diff --git a/api/enterprise-api-ref/sql-schema.markdown b/content/api/enterprise-api-ref/sql-schema/_index.markdown similarity index 95% rename from api/enterprise-api-ref/sql-schema.markdown rename to content/api/enterprise-api-ref/sql-schema/_index.markdown index 1d96578e4..70d13447b 100644 --- a/api/enterprise-api-ref/sql-schema.markdown +++ b/content/api/enterprise-api-ref/sql-schema/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: SQL schema -published: true --- CFEngine Enterprise uses multiple databases. diff --git a/api/enterprise-api-ref/sql-schema/cfdb.markdown b/content/api/enterprise-api-ref/sql-schema/cfdb.markdown similarity index 99% rename from api/enterprise-api-ref/sql-schema/cfdb.markdown rename to content/api/enterprise-api-ref/sql-schema/cfdb.markdown index f44820f69..d0a58332e 100644 --- a/api/enterprise-api-ref/sql-schema/cfdb.markdown +++ b/content/api/enterprise-api-ref/sql-schema/cfdb.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfdb -published: true --- CFEngine allows standardized SQL `SELECT` queries to be used with [REST API][Query REST API#Execute SQL query]. diff --git a/api/enterprise-api-ref/sql-schema/cfmp.markdown b/content/api/enterprise-api-ref/sql-schema/cfmp.markdown similarity index 99% rename from api/enterprise-api-ref/sql-schema/cfmp.markdown rename to content/api/enterprise-api-ref/sql-schema/cfmp.markdown index 5e053e8d9..67d5d289b 100644 --- a/api/enterprise-api-ref/sql-schema/cfmp.markdown +++ b/content/api/enterprise-api-ref/sql-schema/cfmp.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfmp -published: true --- This database contains Mission Portal related settings not processed by the API. diff --git a/api/enterprise-api-ref/sql-schema/cfsettings.markdown b/content/api/enterprise-api-ref/sql-schema/cfsettings.markdown similarity index 99% rename from api/enterprise-api-ref/sql-schema/cfsettings.markdown rename to content/api/enterprise-api-ref/sql-schema/cfsettings.markdown index 3cf5fdbea..094420682 100644 --- a/api/enterprise-api-ref/sql-schema/cfsettings.markdown +++ b/content/api/enterprise-api-ref/sql-schema/cfsettings.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfsettings -published: true --- Settings used by Mission Portal APIs, no reported data. diff --git a/api/enterprise-api-ref/ssh-keys-api.markdown b/content/api/enterprise-api-ref/ssh-keys-api.markdown similarity index 99% rename from api/enterprise-api-ref/ssh-keys-api.markdown rename to content/api/enterprise-api-ref/ssh-keys-api.markdown index 6b30fdad7..f9fd80cca 100644 --- a/api/enterprise-api-ref/ssh-keys-api.markdown +++ b/content/api/enterprise-api-ref/ssh-keys-api.markdown @@ -1,7 +1,6 @@ --- layout: default title: SSH keys API -published: true --- The SSH keys API enables you to generate a key pair that can be used for authorization. diff --git a/api/enterprise-api-ref/status-settings.markdown b/content/api/enterprise-api-ref/status-settings.markdown similarity index 99% rename from api/enterprise-api-ref/status-settings.markdown rename to content/api/enterprise-api-ref/status-settings.markdown index b87da97c8..ec6a279b6 100644 --- a/api/enterprise-api-ref/status-settings.markdown +++ b/content/api/enterprise-api-ref/status-settings.markdown @@ -1,7 +1,6 @@ --- layout: default title: Status and settings REST API -published: true --- REST API for managing settings, checking hub status. diff --git a/api/enterprise-api-ref/two-factor-authentication.markdown b/content/api/enterprise-api-ref/two-factor-authentication.markdown similarity index 99% rename from api/enterprise-api-ref/two-factor-authentication.markdown rename to content/api/enterprise-api-ref/two-factor-authentication.markdown index 4dbca439f..700f9da1a 100644 --- a/api/enterprise-api-ref/two-factor-authentication.markdown +++ b/content/api/enterprise-api-ref/two-factor-authentication.markdown @@ -1,7 +1,6 @@ --- layout: default title: Two-factor authentication API -published: true --- The Two-factor authentication API enables users to add an extra layer of security to their accounts by requiring a TOTP (time-based one-time password) in addition to their primary credentials. diff --git a/api/enterprise-api-ref/users-rbac.markdown b/content/api/enterprise-api-ref/users-rbac.markdown similarity index 99% rename from api/enterprise-api-ref/users-rbac.markdown rename to content/api/enterprise-api-ref/users-rbac.markdown index e8ada0265..022d6e62c 100644 --- a/api/enterprise-api-ref/users-rbac.markdown +++ b/content/api/enterprise-api-ref/users-rbac.markdown @@ -1,7 +1,6 @@ --- layout: default title: Users and access-control REST API -published: true --- This REST API allows to manage users allowed to use Mission Portal as also Role Based Access Control settings. diff --git a/api/enterprise-api-ref/vcs-settings.markdown b/content/api/enterprise-api-ref/vcs-settings.markdown similarity index 99% rename from api/enterprise-api-ref/vcs-settings.markdown rename to content/api/enterprise-api-ref/vcs-settings.markdown index 7b2f748d6..0344e0bbb 100644 --- a/api/enterprise-api-ref/vcs-settings.markdown +++ b/content/api/enterprise-api-ref/vcs-settings.markdown @@ -1,7 +1,6 @@ --- layout: default title: VCS settings API -published: true --- VCS API for managing version control repository settings. diff --git a/api/enterprise-api-ref/web-rbac.markdown b/content/api/enterprise-api-ref/web-rbac.markdown similarity index 99% rename from api/enterprise-api-ref/web-rbac.markdown rename to content/api/enterprise-api-ref/web-rbac.markdown index a1d1b62d9..bb39d99cd 100644 --- a/api/enterprise-api-ref/web-rbac.markdown +++ b/content/api/enterprise-api-ref/web-rbac.markdown @@ -1,7 +1,6 @@ --- layout: default title: Web RBAC API -published: true --- Web RBAC API for managing role based access control settings. diff --git a/content/enterprise-cfengine-guide/Dashboard.png b/content/enterprise-cfengine-guide/Dashboard.png new file mode 100644 index 000000000..f75432f06 Binary files /dev/null and b/content/enterprise-cfengine-guide/Dashboard.png differ diff --git a/enterprise-cfengine-guide.markdown b/content/enterprise-cfengine-guide/_index.markdown similarity index 100% rename from enterprise-cfengine-guide.markdown rename to content/enterprise-cfengine-guide/_index.markdown diff --git a/enterprise-cfengine-guide/install-get-started.markdown b/content/enterprise-cfengine-guide/install-get-started.markdown similarity index 100% rename from enterprise-cfengine-guide/install-get-started.markdown rename to content/enterprise-cfengine-guide/install-get-started.markdown diff --git a/examples.markdown b/content/examples/_index.markdown similarity index 99% rename from examples.markdown rename to content/examples/_index.markdown index 8044ea67f..dbfdc7515 100644 --- a/examples.markdown +++ b/content/examples/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Examples and tutorials -published: true sorting: 60 --- diff --git a/examples/example-snippets.markdown b/content/examples/example-snippets/_index.markdown similarity index 98% rename from examples/example-snippets.markdown rename to content/examples/example-snippets/_index.markdown index 2525d2b92..47ba78fa3 100644 --- a/examples/example-snippets.markdown +++ b/content/examples/example-snippets/_index.markdown @@ -2,7 +2,6 @@ layout: default title: Example snippets sorting: 1 -published: true --- * [General examples][General examples] diff --git a/examples/example-snippets/aborting_execution.cf b/content/examples/example-snippets/aborting_execution.cf similarity index 100% rename from examples/example-snippets/aborting_execution.cf rename to content/examples/example-snippets/aborting_execution.cf diff --git a/examples/example-snippets/acl_file_example.cf b/content/examples/example-snippets/acl_file_example.cf similarity index 100% rename from examples/example-snippets/acl_file_example.cf rename to content/examples/example-snippets/acl_file_example.cf diff --git a/examples/example-snippets/acl_generic_example.cf b/content/examples/example-snippets/acl_generic_example.cf similarity index 100% rename from examples/example-snippets/acl_generic_example.cf rename to content/examples/example-snippets/acl_generic_example.cf diff --git a/examples/example-snippets/acl_secret_example.cf b/content/examples/example-snippets/acl_secret_example.cf similarity index 100% rename from examples/example-snippets/acl_secret_example.cf rename to content/examples/example-snippets/acl_secret_example.cf diff --git a/examples/example-snippets/active_directory.markdown b/content/examples/example-snippets/active_directory.markdown similarity index 96% rename from examples/example-snippets/active_directory.markdown rename to content/examples/example-snippets/active_directory.markdown index b1f137aef..42abd392b 100644 --- a/examples/example-snippets/active_directory.markdown +++ b/content/examples/example-snippets/active_directory.markdown @@ -1,7 +1,6 @@ --- layout: default title: Interacting with directory services -published: true sorting: 7 --- diff --git a/examples/example-snippets/active_directory_example.cf b/content/examples/example-snippets/active_directory_example.cf similarity index 100% rename from examples/example-snippets/active_directory_example.cf rename to content/examples/example-snippets/active_directory_example.cf diff --git a/examples/example-snippets/active_directory_show_users_example.cf b/content/examples/example-snippets/active_directory_show_users_example.cf similarity index 100% rename from examples/example-snippets/active_directory_show_users_example.cf rename to content/examples/example-snippets/active_directory_show_users_example.cf diff --git a/examples/example-snippets/active_list_users_directory_example.cf b/content/examples/example-snippets/active_list_users_directory_example.cf similarity index 100% rename from examples/example-snippets/active_list_users_directory_example.cf rename to content/examples/example-snippets/active_list_users_directory_example.cf diff --git a/examples/example-snippets/add_lines_to_a_file.cf b/content/examples/example-snippets/add_lines_to_a_file.cf similarity index 100% rename from examples/example-snippets/add_lines_to_a_file.cf rename to content/examples/example-snippets/add_lines_to_a_file.cf diff --git a/examples/example-snippets/add_lines_to_a_file_1.cf b/content/examples/example-snippets/add_lines_to_a_file_1.cf similarity index 100% rename from examples/example-snippets/add_lines_to_a_file_1.cf rename to content/examples/example-snippets/add_lines_to_a_file_1.cf diff --git a/examples/example-snippets/add_software_packages_to_the_system.cf b/content/examples/example-snippets/add_software_packages_to_the_system.cf similarity index 100% rename from examples/example-snippets/add_software_packages_to_the_system.cf rename to content/examples/example-snippets/add_software_packages_to_the_system.cf diff --git a/examples/example-snippets/add_users.cf b/content/examples/example-snippets/add_users.cf similarity index 100% rename from examples/example-snippets/add_users.cf rename to content/examples/example-snippets/add_users.cf diff --git a/examples/example-snippets/add_users_1.cf b/content/examples/example-snippets/add_users_1.cf similarity index 100% rename from examples/example-snippets/add_users_1.cf rename to content/examples/example-snippets/add_users_1.cf diff --git a/examples/example-snippets/add_users_to_passwd_and_group.cf b/content/examples/example-snippets/add_users_to_passwd_and_group.cf similarity index 100% rename from examples/example-snippets/add_users_to_passwd_and_group.cf rename to content/examples/example-snippets/add_users_to_passwd_and_group.cf diff --git a/examples/example-snippets/add_variable_definitions_to_a_file.cf b/content/examples/example-snippets/add_variable_definitions_to_a_file.cf similarity index 100% rename from examples/example-snippets/add_variable_definitions_to_a_file.cf rename to content/examples/example-snippets/add_variable_definitions_to_a_file.cf diff --git a/examples/example-snippets/add_variable_definitions_to_a_file_1.cf b/content/examples/example-snippets/add_variable_definitions_to_a_file_1.cf similarity index 100% rename from examples/example-snippets/add_variable_definitions_to_a_file_1.cf rename to content/examples/example-snippets/add_variable_definitions_to_a_file_1.cf diff --git a/examples/example-snippets/all_hosts_the_same.cf b/content/examples/example-snippets/all_hosts_the_same.cf similarity index 100% rename from examples/example-snippets/all_hosts_the_same.cf rename to content/examples/example-snippets/all_hosts_the_same.cf diff --git a/examples/example-snippets/application_baseline.cf b/content/examples/example-snippets/application_baseline.cf similarity index 100% rename from examples/example-snippets/application_baseline.cf rename to content/examples/example-snippets/application_baseline.cf diff --git a/examples/example-snippets/array_example.cf b/content/examples/example-snippets/array_example.cf similarity index 100% rename from examples/example-snippets/array_example.cf rename to content/examples/example-snippets/array_example.cf diff --git a/examples/example-snippets/back_references_in_filenames.cf b/content/examples/example-snippets/back_references_in_filenames.cf similarity index 100% rename from examples/example-snippets/back_references_in_filenames.cf rename to content/examples/example-snippets/back_references_in_filenames.cf diff --git a/examples/example-snippets/basic-file-directory.markdown b/content/examples/example-snippets/basic-file-directory.markdown similarity index 99% rename from examples/example-snippets/basic-file-directory.markdown rename to content/examples/example-snippets/basic-file-directory.markdown index bcaea7b08..6e3d52c5d 100644 --- a/examples/example-snippets/basic-file-directory.markdown +++ b/content/examples/example-snippets/basic-file-directory.markdown @@ -1,7 +1,6 @@ --- layout: default title: File and directory examples -published: true sorting: 6 --- diff --git a/examples/example-snippets/basic_example.cf b/content/examples/example-snippets/basic_example.cf similarity index 100% rename from examples/example-snippets/basic_example.cf rename to content/examples/example-snippets/basic_example.cf diff --git a/examples/example-snippets/bsd_flags.cf b/content/examples/example-snippets/bsd_flags.cf similarity index 100% rename from examples/example-snippets/bsd_flags.cf rename to content/examples/example-snippets/bsd_flags.cf diff --git a/examples/example-snippets/cfengine-administration.markdown b/content/examples/example-snippets/cfengine-administration.markdown similarity index 97% rename from examples/example-snippets/cfengine-administration.markdown rename to content/examples/example-snippets/cfengine-administration.markdown index 665b6047f..d0aa7dcaf 100644 --- a/examples/example-snippets/cfengine-administration.markdown +++ b/content/examples/example-snippets/cfengine-administration.markdown @@ -1,7 +1,6 @@ --- layout: default title: Administration examples -published: true sorting: 2 --- diff --git a/examples/example-snippets/change_detection.cf b/content/examples/example-snippets/change_detection.cf similarity index 100% rename from examples/example-snippets/change_detection.cf rename to content/examples/example-snippets/change_detection.cf diff --git a/examples/example-snippets/change_directory_for_command.cf b/content/examples/example-snippets/change_directory_for_command.cf similarity index 100% rename from examples/example-snippets/change_directory_for_command.cf rename to content/examples/example-snippets/change_directory_for_command.cf diff --git a/examples/example-snippets/check_file_or_directory_permissions.cf b/content/examples/example-snippets/check_file_or_directory_permissions.cf similarity index 100% rename from examples/example-snippets/check_file_or_directory_permissions.cf rename to content/examples/example-snippets/check_file_or_directory_permissions.cf diff --git a/examples/example-snippets/check_filesystem_space.cf b/content/examples/example-snippets/check_filesystem_space.cf similarity index 100% rename from examples/example-snippets/check_filesystem_space.cf rename to content/examples/example-snippets/check_filesystem_space.cf diff --git a/examples/example-snippets/class_match_example.cf b/content/examples/example-snippets/class_match_example.cf similarity index 100% rename from examples/example-snippets/class_match_example.cf rename to content/examples/example-snippets/class_match_example.cf diff --git a/examples/example-snippets/client-server_example.cf b/content/examples/example-snippets/client-server_example.cf similarity index 100% rename from examples/example-snippets/client-server_example.cf rename to content/examples/example-snippets/client-server_example.cf diff --git a/examples/example-snippets/command_or_script_execution.cf b/content/examples/example-snippets/command_or_script_execution.cf similarity index 100% rename from examples/example-snippets/command_or_script_execution.cf rename to content/examples/example-snippets/command_or_script_execution.cf diff --git a/examples/example-snippets/commands-scripts-execution.markdown b/content/examples/example-snippets/commands-scripts-execution.markdown similarity index 98% rename from examples/example-snippets/commands-scripts-execution.markdown rename to content/examples/example-snippets/commands-scripts-execution.markdown index 66fe8d394..d0e3071e4 100644 --- a/examples/example-snippets/commands-scripts-execution.markdown +++ b/content/examples/example-snippets/commands-scripts-execution.markdown @@ -1,7 +1,6 @@ --- layout: default title: Commands, scripts, and execution examples -published: true sorting: 5 --- diff --git a/examples/example-snippets/commands_example.cf b/content/examples/example-snippets/commands_example.cf similarity index 100% rename from examples/example-snippets/commands_example.cf rename to content/examples/example-snippets/commands_example.cf diff --git a/examples/example-snippets/commenting_lines_in_a_file.cf b/content/examples/example-snippets/commenting_lines_in_a_file.cf similarity index 100% rename from examples/example-snippets/commenting_lines_in_a_file.cf rename to content/examples/example-snippets/commenting_lines_in_a_file.cf diff --git a/examples/example-snippets/copy_and_flatten_directory.cf b/content/examples/example-snippets/copy_and_flatten_directory.cf similarity index 100% rename from examples/example-snippets/copy_and_flatten_directory.cf rename to content/examples/example-snippets/copy_and_flatten_directory.cf diff --git a/examples/example-snippets/copy_directory_trees.cf b/content/examples/example-snippets/copy_directory_trees.cf similarity index 100% rename from examples/example-snippets/copy_directory_trees.cf rename to content/examples/example-snippets/copy_directory_trees.cf diff --git a/examples/example-snippets/copy_files.cf b/content/examples/example-snippets/copy_files.cf similarity index 100% rename from examples/example-snippets/copy_files.cf rename to content/examples/example-snippets/copy_files.cf diff --git a/examples/example-snippets/copy_single_files.cf b/content/examples/example-snippets/copy_single_files.cf similarity index 100% rename from examples/example-snippets/copy_single_files.cf rename to content/examples/example-snippets/copy_single_files.cf diff --git a/examples/example-snippets/copy_then_edit_a_file_convergently.cf b/content/examples/example-snippets/copy_then_edit_a_file_convergently.cf similarity index 100% rename from examples/example-snippets/copy_then_edit_a_file_convergently.cf rename to content/examples/example-snippets/copy_then_edit_a_file_convergently.cf diff --git a/examples/example-snippets/create_files_and_directories.cf b/content/examples/example-snippets/create_files_and_directories.cf similarity index 100% rename from examples/example-snippets/create_files_and_directories.cf rename to content/examples/example-snippets/create_files_and_directories.cf diff --git a/examples/example-snippets/custom_editing.cf b/content/examples/example-snippets/custom_editing.cf similarity index 100% rename from examples/example-snippets/custom_editing.cf rename to content/examples/example-snippets/custom_editing.cf diff --git a/examples/example-snippets/custom_editing_1.cf b/content/examples/example-snippets/custom_editing_1.cf similarity index 100% rename from examples/example-snippets/custom_editing_1.cf rename to content/examples/example-snippets/custom_editing_1.cf diff --git a/examples/example-snippets/database.markdown b/content/examples/example-snippets/database.markdown similarity index 92% rename from examples/example-snippets/database.markdown rename to content/examples/example-snippets/database.markdown index a138adfd8..495841bf9 100644 --- a/examples/example-snippets/database.markdown +++ b/content/examples/example-snippets/database.markdown @@ -1,7 +1,6 @@ --- layout: default title: Database examples -published: true sorting: 8 --- diff --git a/examples/example-snippets/database_creation.cf b/content/examples/example-snippets/database_creation.cf similarity index 100% rename from examples/example-snippets/database_creation.cf rename to content/examples/example-snippets/database_creation.cf diff --git a/examples/example-snippets/deleting_lines_exception.cf b/content/examples/example-snippets/deleting_lines_exception.cf similarity index 100% rename from examples/example-snippets/deleting_lines_exception.cf rename to content/examples/example-snippets/deleting_lines_exception.cf diff --git a/examples/example-snippets/deleting_lines_from_a_file.cf b/content/examples/example-snippets/deleting_lines_from_a_file.cf similarity index 100% rename from examples/example-snippets/deleting_lines_from_a_file.cf rename to content/examples/example-snippets/deleting_lines_from_a_file.cf diff --git a/examples/example-snippets/disabling_and_rotating_files.cf b/content/examples/example-snippets/disabling_and_rotating_files.cf similarity index 100% rename from examples/example-snippets/disabling_and_rotating_files.cf rename to content/examples/example-snippets/disabling_and_rotating_files.cf diff --git a/examples/example-snippets/distribute_root_passwords.cf b/content/examples/example-snippets/distribute_root_passwords.cf similarity index 100% rename from examples/example-snippets/distribute_root_passwords.cf rename to content/examples/example-snippets/distribute_root_passwords.cf diff --git a/examples/example-snippets/distribute_ssh_keys.cf b/content/examples/example-snippets/distribute_ssh_keys.cf similarity index 100% rename from examples/example-snippets/distribute_ssh_keys.cf rename to content/examples/example-snippets/distribute_ssh_keys.cf diff --git a/examples/example-snippets/editing_files.cf b/content/examples/example-snippets/editing_files.cf similarity index 100% rename from examples/example-snippets/editing_files.cf rename to content/examples/example-snippets/editing_files.cf diff --git a/examples/example-snippets/editing_password_or_group_files.cf b/content/examples/example-snippets/editing_password_or_group_files.cf similarity index 100% rename from examples/example-snippets/editing_password_or_group_files.cf rename to content/examples/example-snippets/editing_password_or_group_files.cf diff --git a/examples/example-snippets/editing_password_or_group_files_custom.cf b/content/examples/example-snippets/editing_password_or_group_files_custom.cf similarity index 100% rename from examples/example-snippets/editing_password_or_group_files_custom.cf rename to content/examples/example-snippets/editing_password_or_group_files_custom.cf diff --git a/examples/example-snippets/editing_tabular_files.cf b/content/examples/example-snippets/editing_tabular_files.cf similarity index 100% rename from examples/example-snippets/editing_tabular_files.cf rename to content/examples/example-snippets/editing_tabular_files.cf diff --git a/examples/example-snippets/ensure_not_running.cf b/content/examples/example-snippets/ensure_not_running.cf similarity index 100% rename from examples/example-snippets/ensure_not_running.cf rename to content/examples/example-snippets/ensure_not_running.cf diff --git a/examples/example-snippets/ensure_running.cf b/content/examples/example-snippets/ensure_running.cf similarity index 100% rename from examples/example-snippets/ensure_running.cf rename to content/examples/example-snippets/ensure_running.cf diff --git a/examples/example-snippets/ensure_running_1.cf b/content/examples/example-snippets/ensure_running_1.cf similarity index 100% rename from examples/example-snippets/ensure_running_1.cf rename to content/examples/example-snippets/ensure_running_1.cf diff --git a/examples/example-snippets/environment_variables.cf b/content/examples/example-snippets/environment_variables.cf similarity index 100% rename from examples/example-snippets/environment_variables.cf rename to content/examples/example-snippets/environment_variables.cf diff --git a/examples/example-snippets/environments_(virtual).cf b/content/examples/example-snippets/environments_(virtual).cf similarity index 100% rename from examples/example-snippets/environments_(virtual).cf rename to content/examples/example-snippets/environments_(virtual).cf diff --git a/examples/example-snippets/execresult_example.cf b/content/examples/example-snippets/execresult_example.cf similarity index 100% rename from examples/example-snippets/execresult_example.cf rename to content/examples/example-snippets/execresult_example.cf diff --git a/examples/example-snippets/file-template.markdown b/content/examples/example-snippets/file-template.markdown similarity index 98% rename from examples/example-snippets/file-template.markdown rename to content/examples/example-snippets/file-template.markdown index 35ea1ae4a..178aad3d7 100644 --- a/examples/example-snippets/file-template.markdown +++ b/content/examples/example-snippets/file-template.markdown @@ -1,7 +1,6 @@ --- layout: default title: File template examples -published: true sorting: 7 --- diff --git a/examples/example-snippets/file_permissions.markdown b/content/examples/example-snippets/file_permissions.markdown similarity index 94% rename from examples/example-snippets/file_permissions.markdown rename to content/examples/example-snippets/file_permissions.markdown index be0a012f6..2fa52b40f 100644 --- a/examples/example-snippets/file_permissions.markdown +++ b/content/examples/example-snippets/file_permissions.markdown @@ -1,7 +1,6 @@ --- layout: default title: File permissions -published: true sorting: 15 --- diff --git a/examples/example-snippets/find_mac_address.cf b/content/examples/example-snippets/find_mac_address.cf similarity index 100% rename from examples/example-snippets/find_mac_address.cf rename to content/examples/example-snippets/find_mac_address.cf diff --git a/examples/example-snippets/garbage_collection.cf b/content/examples/example-snippets/garbage_collection.cf similarity index 100% rename from examples/example-snippets/garbage_collection.cf rename to content/examples/example-snippets/garbage_collection.cf diff --git a/examples/example-snippets/general.markdown b/content/examples/example-snippets/general.markdown similarity index 98% rename from examples/example-snippets/general.markdown rename to content/examples/example-snippets/general.markdown index a0f9c8ef2..bd4cee0b1 100644 --- a/examples/example-snippets/general.markdown +++ b/content/examples/example-snippets/general.markdown @@ -1,7 +1,6 @@ --- layout: default title: General examples -published: true sorting: 1 --- diff --git a/examples/example-snippets/get_a_list_of_users.cf b/content/examples/example-snippets/get_a_list_of_users.cf similarity index 100% rename from examples/example-snippets/get_a_list_of_users.cf rename to content/examples/example-snippets/get_a_list_of_users.cf diff --git a/examples/example-snippets/global_classes.cf b/content/examples/example-snippets/global_classes.cf similarity index 100% rename from examples/example-snippets/global_classes.cf rename to content/examples/example-snippets/global_classes.cf diff --git a/examples/example-snippets/hashing_for_change_detection_(tripwire).cf b/content/examples/example-snippets/hashing_for_change_detection_(tripwire).cf similarity index 100% rename from examples/example-snippets/hashing_for_change_detection_(tripwire).cf rename to content/examples/example-snippets/hashing_for_change_detection_(tripwire).cf diff --git a/examples/example-snippets/hello_world.cf b/content/examples/example-snippets/hello_world.cf similarity index 100% rename from examples/example-snippets/hello_world.cf rename to content/examples/example-snippets/hello_world.cf diff --git a/examples/example-snippets/inserting_lines_in_a_file.cf b/content/examples/example-snippets/inserting_lines_in_a_file.cf similarity index 100% rename from examples/example-snippets/inserting_lines_in_a_file.cf rename to content/examples/example-snippets/inserting_lines_in_a_file.cf diff --git a/examples/example-snippets/integrating_the_example_into_your_main_policy.cf b/content/examples/example-snippets/integrating_the_example_into_your_main_policy.cf similarity index 100% rename from examples/example-snippets/integrating_the_example_into_your_main_policy.cf rename to content/examples/example-snippets/integrating_the_example_into_your_main_policy.cf diff --git a/examples/example-snippets/kill_process.cf b/content/examples/example-snippets/kill_process.cf similarity index 100% rename from examples/example-snippets/kill_process.cf rename to content/examples/example-snippets/kill_process.cf diff --git a/examples/example-snippets/laptop_support_configuration.cf b/content/examples/example-snippets/laptop_support_configuration.cf similarity index 100% rename from examples/example-snippets/laptop_support_configuration.cf rename to content/examples/example-snippets/laptop_support_configuration.cf diff --git a/examples/example-snippets/ldap_interactions.cf b/content/examples/example-snippets/ldap_interactions.cf similarity index 100% rename from examples/example-snippets/ldap_interactions.cf rename to content/examples/example-snippets/ldap_interactions.cf diff --git a/examples/example-snippets/linking_files.cf b/content/examples/example-snippets/linking_files.cf similarity index 100% rename from examples/example-snippets/linking_files.cf rename to content/examples/example-snippets/linking_files.cf diff --git a/examples/example-snippets/listing_files-pattern_in_a_directory.cf b/content/examples/example-snippets/listing_files-pattern_in_a_directory.cf similarity index 100% rename from examples/example-snippets/listing_files-pattern_in_a_directory.cf rename to content/examples/example-snippets/listing_files-pattern_in_a_directory.cf diff --git a/examples/example-snippets/locate_and_transform_files.cf b/content/examples/example-snippets/locate_and_transform_files.cf similarity index 100% rename from examples/example-snippets/locate_and_transform_files.cf rename to content/examples/example-snippets/locate_and_transform_files.cf diff --git a/examples/example-snippets/log_rotation.cf b/content/examples/example-snippets/log_rotation.cf similarity index 100% rename from examples/example-snippets/log_rotation.cf rename to content/examples/example-snippets/log_rotation.cf diff --git a/examples/example-snippets/logging.cf b/content/examples/example-snippets/logging.cf similarity index 100% rename from examples/example-snippets/logging.cf rename to content/examples/example-snippets/logging.cf diff --git a/examples/example-snippets/macro_template.cf b/content/examples/example-snippets/macro_template.cf similarity index 100% rename from examples/example-snippets/macro_template.cf rename to content/examples/example-snippets/macro_template.cf diff --git a/examples/example-snippets/macro_template_1.cf b/content/examples/example-snippets/macro_template_1.cf similarity index 100% rename from examples/example-snippets/macro_template_1.cf rename to content/examples/example-snippets/macro_template_1.cf diff --git a/examples/example-snippets/measurements.cf b/content/examples/example-snippets/measurements.cf similarity index 100% rename from examples/example-snippets/measurements.cf rename to content/examples/example-snippets/measurements.cf diff --git a/examples/example-snippets/method_validation.cf b/content/examples/example-snippets/method_validation.cf similarity index 100% rename from examples/example-snippets/method_validation.cf rename to content/examples/example-snippets/method_validation.cf diff --git a/examples/example-snippets/methods.cf b/content/examples/example-snippets/methods.cf similarity index 100% rename from examples/example-snippets/methods.cf rename to content/examples/example-snippets/methods.cf diff --git a/examples/example-snippets/mount_a_filesystem.cf b/content/examples/example-snippets/mount_a_filesystem.cf similarity index 100% rename from examples/example-snippets/mount_a_filesystem.cf rename to content/examples/example-snippets/mount_a_filesystem.cf diff --git a/examples/example-snippets/mount_nfs_filesystem.cf b/content/examples/example-snippets/mount_nfs_filesystem.cf similarity index 100% rename from examples/example-snippets/mount_nfs_filesystem.cf rename to content/examples/example-snippets/mount_nfs_filesystem.cf diff --git a/examples/example-snippets/network.markdown b/content/examples/example-snippets/network.markdown similarity index 98% rename from examples/example-snippets/network.markdown rename to content/examples/example-snippets/network.markdown index d9106d578..74fc22795 100644 --- a/examples/example-snippets/network.markdown +++ b/content/examples/example-snippets/network.markdown @@ -1,7 +1,6 @@ --- layout: default title: Network examples -published: true sorting: 9 --- diff --git a/examples/example-snippets/ordering_promises.cf b/content/examples/example-snippets/ordering_promises.cf similarity index 100% rename from examples/example-snippets/ordering_promises.cf rename to content/examples/example-snippets/ordering_promises.cf diff --git a/examples/example-snippets/packages_examples_solaris.cf b/content/examples/example-snippets/packages_examples_solaris.cf similarity index 100% rename from examples/example-snippets/packages_examples_solaris.cf rename to content/examples/example-snippets/packages_examples_solaris.cf diff --git a/examples/example-snippets/postfix_mail_configuration.cf b/content/examples/example-snippets/postfix_mail_configuration.cf similarity index 100% rename from examples/example-snippets/postfix_mail_configuration.cf rename to content/examples/example-snippets/postfix_mail_configuration.cf diff --git a/examples/example-snippets/process_management.cf b/content/examples/example-snippets/process_management.cf similarity index 100% rename from examples/example-snippets/process_management.cf rename to content/examples/example-snippets/process_management.cf diff --git a/examples/example-snippets/promise-patterns.markdown b/content/examples/example-snippets/promise-patterns/_index.markdown similarity index 98% rename from examples/example-snippets/promise-patterns.markdown rename to content/examples/example-snippets/promise-patterns/_index.markdown index 8a8123373..311a083ef 100644 --- a/examples/example-snippets/promise-patterns.markdown +++ b/content/examples/example-snippets/promise-patterns/_index.markdown @@ -2,7 +2,6 @@ layout: default title: Common promise patterns sorting: 2 -published: true --- This section includes includes common promise patterns. Refer to them as you diff --git a/examples/example-snippets/promise-patterns/example_aborting_execution.markdown b/content/examples/example-snippets/promise-patterns/example_aborting_execution.markdown similarity index 98% rename from examples/example-snippets/promise-patterns/example_aborting_execution.markdown rename to content/examples/example-snippets/promise-patterns/example_aborting_execution.markdown index ec693fe73..e0c50683e 100644 --- a/examples/example-snippets/promise-patterns/example_aborting_execution.markdown +++ b/content/examples/example-snippets/promise-patterns/example_aborting_execution.markdown @@ -1,7 +1,6 @@ --- layout: default title: Aborting execution -published: true reviewed: 2013-05-30 reviewed-by: atsaloli --- diff --git a/examples/example-snippets/promise-patterns/example_change_detection.markdown b/content/examples/example-snippets/promise-patterns/example_change_detection.markdown similarity index 99% rename from examples/example-snippets/promise-patterns/example_change_detection.markdown rename to content/examples/example-snippets/promise-patterns/example_change_detection.markdown index 72855fbaf..10d0b6fa3 100644 --- a/examples/example-snippets/promise-patterns/example_change_detection.markdown +++ b/content/examples/example-snippets/promise-patterns/example_change_detection.markdown @@ -1,7 +1,6 @@ --- layout: default title: Change detection -published: true reviewed: 2013-06-08 reviewed-by: atsaloli --- diff --git a/examples/example-snippets/promise-patterns/example_copy_single_files.markdown b/content/examples/example-snippets/promise-patterns/example_copy_single_files.markdown similarity index 96% rename from examples/example-snippets/promise-patterns/example_copy_single_files.markdown rename to content/examples/example-snippets/promise-patterns/example_copy_single_files.markdown index e613df537..2003dc1cc 100644 --- a/examples/example-snippets/promise-patterns/example_copy_single_files.markdown +++ b/content/examples/example-snippets/promise-patterns/example_copy_single_files.markdown @@ -1,7 +1,6 @@ --- layout: default title: Copy single files -published: true reviewed: 2013-06-08 reviewed-by: atsaloli --- diff --git a/examples/example-snippets/promise-patterns/example_create_filedir.markdown b/content/examples/example-snippets/promise-patterns/example_create_filedir.markdown similarity index 97% rename from examples/example-snippets/promise-patterns/example_create_filedir.markdown rename to content/examples/example-snippets/promise-patterns/example_create_filedir.markdown index 250e83a79..b340f247c 100644 --- a/examples/example-snippets/promise-patterns/example_create_filedir.markdown +++ b/content/examples/example-snippets/promise-patterns/example_create_filedir.markdown @@ -1,7 +1,6 @@ --- layout: default title: Create files and directories -published: true --- The following is a standalone policy that will create the file diff --git a/examples/example-snippets/promise-patterns/example_diskfree.markdown b/content/examples/example-snippets/promise-patterns/example_diskfree.markdown similarity index 96% rename from examples/example-snippets/promise-patterns/example_diskfree.markdown rename to content/examples/example-snippets/promise-patterns/example_diskfree.markdown index 5e3548e6b..44053bda3 100644 --- a/examples/example-snippets/promise-patterns/example_diskfree.markdown +++ b/content/examples/example-snippets/promise-patterns/example_diskfree.markdown @@ -1,7 +1,6 @@ --- layout: default title: Check filesystem space -published: true reviewed: 2013-06-08 reviewed-by: atsaloli --- diff --git a/examples/example-snippets/promise-patterns/example_edit_motd.markdown b/content/examples/example-snippets/promise-patterns/example_edit_motd.markdown similarity index 97% rename from examples/example-snippets/promise-patterns/example_edit_motd.markdown rename to content/examples/example-snippets/promise-patterns/example_edit_motd.markdown index 1ad4f0bc2..5b779d5ac 100644 --- a/examples/example-snippets/promise-patterns/example_edit_motd.markdown +++ b/content/examples/example-snippets/promise-patterns/example_edit_motd.markdown @@ -1,7 +1,6 @@ --- layout: default title: Customize message of the day -published: true reviewed: 2015-12-18 reviewed-by: enrico & nick --- @@ -24,9 +23,9 @@ render a `/etc/motd` using a mustache template and add useful information as: The bundle is defined like this: -{%raw%} + [%CFEngine_include_example(mustache_template_motd.cf)%] -{%endraw%} + **Example run:** diff --git a/examples/example-snippets/promise-patterns/example_edit_name_resolution.markdown b/content/examples/example-snippets/promise-patterns/example_edit_name_resolution.markdown similarity index 99% rename from examples/example-snippets/promise-patterns/example_edit_name_resolution.markdown rename to content/examples/example-snippets/promise-patterns/example_edit_name_resolution.markdown index e5492f70f..b134afe7a 100644 --- a/examples/example-snippets/promise-patterns/example_edit_name_resolution.markdown +++ b/content/examples/example-snippets/promise-patterns/example_edit_name_resolution.markdown @@ -1,7 +1,6 @@ --- layout: default title: Set up name resolution with DNS -published: true reviewed: 2013-06-08 reviewed-by: atsaloli --- diff --git a/examples/example-snippets/promise-patterns/example_enable_service.markdown b/content/examples/example-snippets/promise-patterns/example_enable_service.markdown similarity index 99% rename from examples/example-snippets/promise-patterns/example_enable_service.markdown rename to content/examples/example-snippets/promise-patterns/example_enable_service.markdown index 4c97dc950..d34d277b3 100644 --- a/examples/example-snippets/promise-patterns/example_enable_service.markdown +++ b/content/examples/example-snippets/promise-patterns/example_enable_service.markdown @@ -1,7 +1,6 @@ --- layout: default title: Ensure a service is enabled and running -published: true reviewed: 2016-06-28 reviewed-by: nickanderson --- diff --git a/examples/example-snippets/promise-patterns/example_find_mac_addr.markdown b/content/examples/example-snippets/promise-patterns/example_find_mac_addr.markdown similarity index 99% rename from examples/example-snippets/promise-patterns/example_find_mac_addr.markdown rename to content/examples/example-snippets/promise-patterns/example_find_mac_addr.markdown index e1c6f2c6e..77c334359 100644 --- a/examples/example-snippets/promise-patterns/example_find_mac_addr.markdown +++ b/content/examples/example-snippets/promise-patterns/example_find_mac_addr.markdown @@ -1,7 +1,6 @@ --- layout: default title: Find the MAC address -published: true reviewed: 2013-06-08 reviewed-by: atsaloli --- diff --git a/examples/example-snippets/promise-patterns/example_install_package.markdown b/content/examples/example-snippets/promise-patterns/example_install_package.markdown similarity index 99% rename from examples/example-snippets/promise-patterns/example_install_package.markdown rename to content/examples/example-snippets/promise-patterns/example_install_package.markdown index 5678dc326..69e34abaf 100644 --- a/examples/example-snippets/promise-patterns/example_install_package.markdown +++ b/content/examples/example-snippets/promise-patterns/example_install_package.markdown @@ -1,7 +1,6 @@ --- layout: default title: Install packages -published: true reviewed: 2013-06-08 reviewed-by: atsaloli --- diff --git a/examples/example-snippets/promise-patterns/example_mount_nfs.markdown b/content/examples/example-snippets/promise-patterns/example_mount_nfs.markdown similarity index 99% rename from examples/example-snippets/promise-patterns/example_mount_nfs.markdown rename to content/examples/example-snippets/promise-patterns/example_mount_nfs.markdown index 3f9655948..beb80b4e1 100644 --- a/examples/example-snippets/promise-patterns/example_mount_nfs.markdown +++ b/content/examples/example-snippets/promise-patterns/example_mount_nfs.markdown @@ -1,7 +1,6 @@ --- layout: default title: Mount NFS filesystem -published: true reviewed: 2013-06-08 reviewed-by: atsaloli --- diff --git a/examples/example-snippets/promise-patterns/example_ntp.markdown b/content/examples/example-snippets/promise-patterns/example_ntp.markdown similarity index 99% rename from examples/example-snippets/promise-patterns/example_ntp.markdown rename to content/examples/example-snippets/promise-patterns/example_ntp.markdown index 484b8df8e..fa3fccefe 100644 --- a/examples/example-snippets/promise-patterns/example_ntp.markdown +++ b/content/examples/example-snippets/promise-patterns/example_ntp.markdown @@ -1,7 +1,6 @@ --- layout: default title: Set up time management through NTP -published: true reviewed: 2013-06-09 reviewed-by: atsaloli --- diff --git a/examples/example-snippets/promise-patterns/example_process_kill.markdown b/content/examples/example-snippets/promise-patterns/example_process_kill.markdown similarity index 99% rename from examples/example-snippets/promise-patterns/example_process_kill.markdown rename to content/examples/example-snippets/promise-patterns/example_process_kill.markdown index 072cf1ff1..55b171db9 100644 --- a/examples/example-snippets/promise-patterns/example_process_kill.markdown +++ b/content/examples/example-snippets/promise-patterns/example_process_kill.markdown @@ -1,7 +1,6 @@ --- layout: default title: Ensure a process is not running -published: true reviewed: 2013-06-08 reviewed-by: atsaloli --- diff --git a/examples/example-snippets/promise-patterns/example_process_restart.markdown b/content/examples/example-snippets/promise-patterns/example_process_restart.markdown similarity index 99% rename from examples/example-snippets/promise-patterns/example_process_restart.markdown rename to content/examples/example-snippets/promise-patterns/example_process_restart.markdown index 011781983..4081fa2ec 100644 --- a/examples/example-snippets/promise-patterns/example_process_restart.markdown +++ b/content/examples/example-snippets/promise-patterns/example_process_restart.markdown @@ -1,7 +1,6 @@ --- layout: default title: Restart a process -published: true reviewed: 2013-06-08 reviewed-by: atsaloli --- diff --git a/examples/example-snippets/promise-patterns/example_ssh_keys.markdown b/content/examples/example-snippets/promise-patterns/example_ssh_keys.markdown similarity index 99% rename from examples/example-snippets/promise-patterns/example_ssh_keys.markdown rename to content/examples/example-snippets/promise-patterns/example_ssh_keys.markdown index e0082ef9e..f9a3024ec 100644 --- a/examples/example-snippets/promise-patterns/example_ssh_keys.markdown +++ b/content/examples/example-snippets/promise-patterns/example_ssh_keys.markdown @@ -1,7 +1,6 @@ --- layout: default title: Distribute ssh keys -published: true reviewed: 2015-12-15 reviewed-by: nickanderson, enrico --- diff --git a/examples/example-snippets/promise-patterns/example_sudoers.markdown b/content/examples/example-snippets/promise-patterns/example_sudoers.markdown similarity index 99% rename from examples/example-snippets/promise-patterns/example_sudoers.markdown rename to content/examples/example-snippets/promise-patterns/example_sudoers.markdown index b50f40026..4439aebd6 100644 --- a/examples/example-snippets/promise-patterns/example_sudoers.markdown +++ b/content/examples/example-snippets/promise-patterns/example_sudoers.markdown @@ -1,7 +1,6 @@ --- layout: default title: Set up sudo -published: true reviewed: 2013-06-08 reviewed-by: atsaloli --- diff --git a/examples/example-snippets/promise-patterns/example_updating_from_central_hub.markdown b/content/examples/example-snippets/promise-patterns/example_updating_from_central_hub.markdown similarity index 99% rename from examples/example-snippets/promise-patterns/example_updating_from_central_hub.markdown rename to content/examples/example-snippets/promise-patterns/example_updating_from_central_hub.markdown index ff1897048..227638afb 100644 --- a/examples/example-snippets/promise-patterns/example_updating_from_central_hub.markdown +++ b/content/examples/example-snippets/promise-patterns/example_updating_from_central_hub.markdown @@ -1,7 +1,6 @@ --- layout: default title: Updating from a central policy server -published: true reviewed: 2013-06-09 reviewed-by: atsaloli --- diff --git a/examples/example-snippets/prune_processes.cf b/content/examples/example-snippets/prune_processes.cf similarity index 100% rename from examples/example-snippets/prune_processes.cf rename to content/examples/example-snippets/prune_processes.cf diff --git a/examples/example-snippets/read_from_a_tcp_socket.cf b/content/examples/example-snippets/read_from_a_tcp_socket.cf similarity index 100% rename from examples/example-snippets/read_from_a_tcp_socket.cf rename to content/examples/example-snippets/read_from_a_tcp_socket.cf diff --git a/examples/example-snippets/resolver_management.cf b/content/examples/example-snippets/resolver_management.cf similarity index 100% rename from examples/example-snippets/resolver_management.cf rename to content/examples/example-snippets/resolver_management.cf diff --git a/examples/example-snippets/restart_process.cf b/content/examples/example-snippets/restart_process.cf similarity index 100% rename from examples/example-snippets/restart_process.cf rename to content/examples/example-snippets/restart_process.cf diff --git a/examples/example-snippets/restart_process_1.cf b/content/examples/example-snippets/restart_process_1.cf similarity index 100% rename from examples/example-snippets/restart_process_1.cf rename to content/examples/example-snippets/restart_process_1.cf diff --git a/examples/example-snippets/search_and_replace_text.cf b/content/examples/example-snippets/search_and_replace_text.cf similarity index 100% rename from examples/example-snippets/search_and_replace_text.cf rename to content/examples/example-snippets/search_and_replace_text.cf diff --git a/examples/example-snippets/selecting_a_region_in_a_file.cf b/content/examples/example-snippets/selecting_a_region_in_a_file.cf similarity index 100% rename from examples/example-snippets/selecting_a_region_in_a_file.cf rename to content/examples/example-snippets/selecting_a_region_in_a_file.cf diff --git a/examples/example-snippets/service_management_(windows).cf b/content/examples/example-snippets/service_management_(windows).cf similarity index 100% rename from examples/example-snippets/service_management_(windows).cf rename to content/examples/example-snippets/service_management_(windows).cf diff --git a/examples/example-snippets/set_up_a_pxe_boot_server.cf b/content/examples/example-snippets/set_up_a_pxe_boot_server.cf similarity index 100% rename from examples/example-snippets/set_up_a_pxe_boot_server.cf rename to content/examples/example-snippets/set_up_a_pxe_boot_server.cf diff --git a/examples/example-snippets/set_up_a_web_server.cf b/content/examples/example-snippets/set_up_a_web_server.cf similarity index 100% rename from examples/example-snippets/set_up_a_web_server.cf rename to content/examples/example-snippets/set_up_a_web_server.cf diff --git a/examples/example-snippets/set_up_hpc_clusters.cf b/content/examples/example-snippets/set_up_hpc_clusters.cf similarity index 100% rename from examples/example-snippets/set_up_hpc_clusters.cf rename to content/examples/example-snippets/set_up_hpc_clusters.cf diff --git a/examples/example-snippets/set_up_name_resolution.cf b/content/examples/example-snippets/set_up_name_resolution.cf similarity index 100% rename from examples/example-snippets/set_up_name_resolution.cf rename to content/examples/example-snippets/set_up_name_resolution.cf diff --git a/examples/example-snippets/set_up_name_resolution_1.cf b/content/examples/example-snippets/set_up_name_resolution_1.cf similarity index 100% rename from examples/example-snippets/set_up_name_resolution_1.cf rename to content/examples/example-snippets/set_up_name_resolution_1.cf diff --git a/examples/example-snippets/set_up_sudo.cf b/content/examples/example-snippets/set_up_sudo.cf similarity index 100% rename from examples/example-snippets/set_up_sudo.cf rename to content/examples/example-snippets/set_up_sudo.cf diff --git a/examples/example-snippets/simple_template.cf b/content/examples/example-snippets/simple_template.cf similarity index 100% rename from examples/example-snippets/simple_template.cf rename to content/examples/example-snippets/simple_template.cf diff --git a/examples/example-snippets/simple_versioned_template.cf b/content/examples/example-snippets/simple_versioned_template.cf similarity index 100% rename from examples/example-snippets/simple_versioned_template.cf rename to content/examples/example-snippets/simple_versioned_template.cf diff --git a/examples/example-snippets/software-adminstration.markdown b/content/examples/example-snippets/software-adminstration.markdown similarity index 99% rename from examples/example-snippets/software-adminstration.markdown rename to content/examples/example-snippets/software-adminstration.markdown index c9df8768b..ca524ccea 100644 --- a/examples/example-snippets/software-adminstration.markdown +++ b/content/examples/example-snippets/software-adminstration.markdown @@ -1,7 +1,6 @@ --- layout: default title: Software administration examples -published: true sorting: 4 --- diff --git a/examples/example-snippets/software_and_patch_installation.cf b/content/examples/example-snippets/software_and_patch_installation.cf similarity index 100% rename from examples/example-snippets/software_and_patch_installation.cf rename to content/examples/example-snippets/software_and_patch_installation.cf diff --git a/examples/example-snippets/software_and_patch_installation_1.cf b/content/examples/example-snippets/software_and_patch_installation_1.cf similarity index 100% rename from examples/example-snippets/software_and_patch_installation_1.cf rename to content/examples/example-snippets/software_and_patch_installation_1.cf diff --git a/examples/example-snippets/software_and_patch_installation_1_2.cf b/content/examples/example-snippets/software_and_patch_installation_1_2.cf similarity index 100% rename from examples/example-snippets/software_and_patch_installation_1_2.cf rename to content/examples/example-snippets/software_and_patch_installation_1_2.cf diff --git a/examples/example-snippets/software_and_patch_installation_1_2_3.cf b/content/examples/example-snippets/software_and_patch_installation_1_2_3.cf similarity index 100% rename from examples/example-snippets/software_and_patch_installation_1_2_3.cf rename to content/examples/example-snippets/software_and_patch_installation_1_2_3.cf diff --git a/examples/example-snippets/software_distribution.cf b/content/examples/example-snippets/software_distribution.cf similarity index 100% rename from examples/example-snippets/software_distribution.cf rename to content/examples/example-snippets/software_distribution.cf diff --git a/examples/example-snippets/system-administration.markdown b/content/examples/example-snippets/system-administration.markdown similarity index 99% rename from examples/example-snippets/system-administration.markdown rename to content/examples/example-snippets/system-administration.markdown index c222597cd..aebb6151b 100644 --- a/examples/example-snippets/system-administration.markdown +++ b/content/examples/example-snippets/system-administration.markdown @@ -1,7 +1,6 @@ --- layout: default title: System administration examples -published: true sorting: 12 --- diff --git a/examples/example-snippets/system-file.markdown b/content/examples/example-snippets/system-file.markdown similarity index 99% rename from examples/example-snippets/system-file.markdown rename to content/examples/example-snippets/system-file.markdown index bde87b96c..1eef8a27f 100644 --- a/examples/example-snippets/system-file.markdown +++ b/content/examples/example-snippets/system-file.markdown @@ -1,7 +1,6 @@ --- layout: default title: System file examples -published: true sorting: 13 --- diff --git a/examples/example-snippets/system-information.markdown b/content/examples/example-snippets/system-information.markdown similarity index 98% rename from examples/example-snippets/system-information.markdown rename to content/examples/example-snippets/system-information.markdown index f65da74f0..5314487bd 100644 --- a/examples/example-snippets/system-information.markdown +++ b/content/examples/example-snippets/system-information.markdown @@ -1,7 +1,6 @@ --- layout: default title: System information examples -published: true sorting: 11 --- diff --git a/examples/example-snippets/system-security.markdown b/content/examples/example-snippets/system-security.markdown similarity index 96% rename from examples/example-snippets/system-security.markdown rename to content/examples/example-snippets/system-security.markdown index bc79e00ba..3ce1af496 100644 --- a/examples/example-snippets/system-security.markdown +++ b/content/examples/example-snippets/system-security.markdown @@ -1,7 +1,6 @@ --- layout: default title: System security examples -published: true sorting: 10 --- diff --git a/examples/example-snippets/templating.cf b/content/examples/example-snippets/templating.cf similarity index 100% rename from examples/example-snippets/templating.cf rename to content/examples/example-snippets/templating.cf diff --git a/examples/example-snippets/templating_1.cf b/content/examples/example-snippets/templating_1.cf similarity index 100% rename from examples/example-snippets/templating_1.cf rename to content/examples/example-snippets/templating_1.cf diff --git a/examples/example-snippets/tidying_garbage_files.cf b/content/examples/example-snippets/tidying_garbage_files.cf similarity index 100% rename from examples/example-snippets/tidying_garbage_files.cf rename to content/examples/example-snippets/tidying_garbage_files.cf diff --git a/examples/example-snippets/timing-counting-measuring.markdown b/content/examples/example-snippets/timing-counting-measuring.markdown similarity index 91% rename from examples/example-snippets/timing-counting-measuring.markdown rename to content/examples/example-snippets/timing-counting-measuring.markdown index 96cd95856..840780f4d 100644 --- a/examples/example-snippets/timing-counting-measuring.markdown +++ b/content/examples/example-snippets/timing-counting-measuring.markdown @@ -1,7 +1,6 @@ --- layout: default title: Measuring examples -published: true sorting: 3 --- diff --git a/examples/example-snippets/trigger_classes.cf b/content/examples/example-snippets/trigger_classes.cf similarity index 100% rename from examples/example-snippets/trigger_classes.cf rename to content/examples/example-snippets/trigger_classes.cf diff --git a/examples/example-snippets/unit_registry.cf.cf b/content/examples/example-snippets/unit_registry.cf.cf similarity index 100% rename from examples/example-snippets/unit_registry.cf.cf rename to content/examples/example-snippets/unit_registry.cf.cf diff --git a/examples/example-snippets/unit_registry_cache.cf.cf b/content/examples/example-snippets/unit_registry_cache.cf.cf similarity index 100% rename from examples/example-snippets/unit_registry_cache.cf.cf rename to content/examples/example-snippets/unit_registry_cache.cf.cf diff --git a/examples/example-snippets/unmount_nfs_filesystem.cf b/content/examples/example-snippets/unmount_nfs_filesystem.cf similarity index 100% rename from examples/example-snippets/unmount_nfs_filesystem.cf rename to content/examples/example-snippets/unmount_nfs_filesystem.cf diff --git a/examples/example-snippets/updating_from_a_central_hub.cf b/content/examples/example-snippets/updating_from_a_central_hub.cf similarity index 100% rename from examples/example-snippets/updating_from_a_central_hub.cf rename to content/examples/example-snippets/updating_from_a_central_hub.cf diff --git a/examples/example-snippets/user-management.markdown b/content/examples/example-snippets/user-management.markdown similarity index 99% rename from examples/example-snippets/user-management.markdown rename to content/examples/example-snippets/user-management.markdown index 0e7e5efef..4fc2ffd9c 100644 --- a/examples/example-snippets/user-management.markdown +++ b/content/examples/example-snippets/user-management.markdown @@ -1,7 +1,6 @@ --- layout: default title: User management examples -published: true sorting: 15 --- diff --git a/examples/example-snippets/variation_in_hosts.cf b/content/examples/example-snippets/variation_in_hosts.cf similarity index 100% rename from examples/example-snippets/variation_in_hosts.cf rename to content/examples/example-snippets/variation_in_hosts.cf diff --git a/examples/example-snippets/warn_if_matching_line_in_file.cf b/content/examples/example-snippets/warn_if_matching_line_in_file.cf similarity index 100% rename from examples/example-snippets/warn_if_matching_line_in_file.cf rename to content/examples/example-snippets/warn_if_matching_line_in_file.cf diff --git a/examples/example-snippets/web_server_modules.cf b/content/examples/example-snippets/web_server_modules.cf similarity index 100% rename from examples/example-snippets/web_server_modules.cf rename to content/examples/example-snippets/web_server_modules.cf diff --git a/examples/example-snippets/windows-registry.markdown b/content/examples/example-snippets/windows-registry.markdown similarity index 97% rename from examples/example-snippets/windows-registry.markdown rename to content/examples/example-snippets/windows-registry.markdown index 4ae666f7b..a1309c1b6 100644 --- a/examples/example-snippets/windows-registry.markdown +++ b/content/examples/example-snippets/windows-registry.markdown @@ -1,7 +1,6 @@ --- layout: default title: Windows registry examples -published: true sorting: 14 --- diff --git a/examples/example-snippets/windows_registry.cf b/content/examples/example-snippets/windows_registry.cf similarity index 100% rename from examples/example-snippets/windows_registry.cf rename to content/examples/example-snippets/windows_registry.cf diff --git a/examples/tutorials/Activated-sketch.png b/content/examples/tutorials/Activated-sketch.png similarity index 100% rename from examples/tutorials/Activated-sketch.png rename to content/examples/tutorials/Activated-sketch.png diff --git a/examples/tutorials/Report-builder-results.png b/content/examples/tutorials/Report-builder-results.png similarity index 100% rename from examples/tutorials/Report-builder-results.png rename to content/examples/tutorials/Report-builder-results.png diff --git a/examples/tutorials/Report-builder.png b/content/examples/tutorials/Report-builder.png similarity index 100% rename from examples/tutorials/Report-builder.png rename to content/examples/tutorials/Report-builder.png diff --git a/examples/tutorials/Report.png b/content/examples/tutorials/Report.png similarity index 100% rename from examples/tutorials/Report.png rename to content/examples/tutorials/Report.png diff --git a/examples/tutorials/Sketch.png b/content/examples/tutorials/Sketch.png similarity index 100% rename from examples/tutorials/Sketch.png rename to content/examples/tutorials/Sketch.png diff --git a/examples/tutorials.markdown b/content/examples/tutorials/_index.markdown similarity index 89% rename from examples/tutorials.markdown rename to content/examples/tutorials/_index.markdown index 4f46923fa..fa1932ede 100644 --- a/examples/tutorials.markdown +++ b/content/examples/tutorials/_index.markdown @@ -2,7 +2,6 @@ layout: default title: Tutorials sorting: 5 -published: true --- Familiarize yourself with CFEngine by following these step by step diff --git a/examples/tutorials/add-new-tracker.png b/content/examples/tutorials/add-new-tracker.png similarity index 100% rename from examples/tutorials/add-new-tracker.png rename to content/examples/tutorials/add-new-tracker.png diff --git a/examples/tutorials/create_dashboard_alert1.png b/content/examples/tutorials/create_dashboard_alert1.png similarity index 100% rename from examples/tutorials/create_dashboard_alert1.png rename to content/examples/tutorials/create_dashboard_alert1.png diff --git a/examples/tutorials/create_dashboard_alert2.png b/content/examples/tutorials/create_dashboard_alert2.png similarity index 100% rename from examples/tutorials/create_dashboard_alert2.png rename to content/examples/tutorials/create_dashboard_alert2.png diff --git a/examples/tutorials/create_dashboard_alert3.png b/content/examples/tutorials/create_dashboard_alert3.png similarity index 100% rename from examples/tutorials/create_dashboard_alert3.png rename to content/examples/tutorials/create_dashboard_alert3.png diff --git a/examples/tutorials/create_dashboard_alert4.png b/content/examples/tutorials/create_dashboard_alert4.png similarity index 100% rename from examples/tutorials/create_dashboard_alert4.png rename to content/examples/tutorials/create_dashboard_alert4.png diff --git a/examples/tutorials/create_dashboard_alert5.png b/content/examples/tutorials/create_dashboard_alert5.png similarity index 100% rename from examples/tutorials/create_dashboard_alert5.png rename to content/examples/tutorials/create_dashboard_alert5.png diff --git a/examples/tutorials/custom_inventory.markdown b/content/examples/tutorials/custom_inventory.markdown similarity index 99% rename from examples/tutorials/custom_inventory.markdown rename to content/examples/tutorials/custom_inventory.markdown index 1985c0e27..598469fca 100644 --- a/examples/tutorials/custom_inventory.markdown +++ b/content/examples/tutorials/custom_inventory.markdown @@ -2,7 +2,6 @@ layout: default title: Custom inventory sorting: 15 -published: true --- This tutorial will show you how to add custom inventory attributes that can be diff --git a/examples/tutorials/dashboard-alerts.markdown b/content/examples/tutorials/dashboard-alerts.markdown similarity index 99% rename from examples/tutorials/dashboard-alerts.markdown rename to content/examples/tutorials/dashboard-alerts.markdown index 6e8cc0d6b..1fc42a23f 100644 --- a/examples/tutorials/dashboard-alerts.markdown +++ b/content/examples/tutorials/dashboard-alerts.markdown @@ -2,7 +2,6 @@ layout: default title: Dashboard alerts sorting: 15 -published: true --- At 5 minutes intervals, the CFEngine hub gathers information from all of its connected agents about the current state of the system, including the outcome of its runs. All of this information is available to you. In this tutorial we will show how to use the Dashboard to create compliance overview at a glance diff --git a/examples/tutorials/distribute-files-from-a-central-location.markdown b/content/examples/tutorials/distribute-files-from-a-central-location.markdown similarity index 99% rename from examples/tutorials/distribute-files-from-a-central-location.markdown rename to content/examples/tutorials/distribute-files-from-a-central-location.markdown index 688516ec6..c1bc633f8 100644 --- a/examples/tutorials/distribute-files-from-a-central-location.markdown +++ b/content/examples/tutorials/distribute-files-from-a-central-location.markdown @@ -2,7 +2,6 @@ layout: default title: Distributing files from a central location sorting: 10 -published: true --- CFEngine can manage many machines simply by distributing policies to all its hosts. diff --git a/examples/tutorials/file_compare_test.cf b/content/examples/tutorials/file_compare_test.cf similarity index 100% rename from examples/tutorials/file_compare_test.cf rename to content/examples/tutorials/file_compare_test.cf diff --git a/examples/tutorials/file_comparison.markdown b/content/examples/tutorials/file_comparison.markdown similarity index 99% rename from examples/tutorials/file_comparison.markdown rename to content/examples/tutorials/file_comparison.markdown index a863999fb..91f65613a 100644 --- a/examples/tutorials/file_comparison.markdown +++ b/content/examples/tutorials/file_comparison.markdown @@ -1,7 +1,6 @@ --- layout: default title: File comparison -published: true sorting: 100 --- diff --git a/examples/tutorials/files-tutorial.markdown b/content/examples/tutorials/files-tutorial.markdown similarity index 99% rename from examples/tutorials/files-tutorial.markdown rename to content/examples/tutorials/files-tutorial.markdown index 05526fc63..88d39bba1 100644 --- a/examples/tutorials/files-tutorial.markdown +++ b/content/examples/tutorials/files-tutorial.markdown @@ -2,7 +2,6 @@ layout: default title: File editing sorting: 10 -published: true --- ## Prerequisites diff --git a/examples/tutorials/high-availability.markdown b/content/examples/tutorials/high-availability/_index.markdown similarity index 99% rename from examples/tutorials/high-availability.markdown rename to content/examples/tutorials/high-availability/_index.markdown index ad0753432..531b44e08 100644 --- a/examples/tutorials/high-availability.markdown +++ b/content/examples/tutorials/high-availability/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: High availability -published: true --- ## Overview diff --git a/examples/tutorials/high-availability/ha_3.6.png b/content/examples/tutorials/high-availability/ha_3.6.png similarity index 100% rename from examples/tutorials/high-availability/ha_3.6.png rename to content/examples/tutorials/high-availability/ha_3.6.png diff --git a/examples/tutorials/high-availability/ha_degraded_indicator.png b/content/examples/tutorials/high-availability/ha_degraded_indicator.png similarity index 100% rename from examples/tutorials/high-availability/ha_degraded_indicator.png rename to content/examples/tutorials/high-availability/ha_degraded_indicator.png diff --git a/examples/tutorials/high-availability/ha_health_OK.png b/content/examples/tutorials/high-availability/ha_health_OK.png similarity index 100% rename from examples/tutorials/high-availability/ha_health_OK.png rename to content/examples/tutorials/high-availability/ha_health_OK.png diff --git a/examples/tutorials/high-availability/ha_inventory.png b/content/examples/tutorials/high-availability/ha_inventory.png similarity index 100% rename from examples/tutorials/high-availability/ha_inventory.png rename to content/examples/tutorials/high-availability/ha_inventory.png diff --git a/examples/tutorials/high-availability/ha_network_setup.png b/content/examples/tutorials/high-availability/ha_network_setup.png similarity index 100% rename from examples/tutorials/high-availability/ha_network_setup.png rename to content/examples/tutorials/high-availability/ha_network_setup.png diff --git a/examples/tutorials/high-availability/installation-guide.markdown b/content/examples/tutorials/high-availability/installation-guide.markdown similarity index 99% rename from examples/tutorials/high-availability/installation-guide.markdown rename to content/examples/tutorials/high-availability/installation-guide.markdown index 4acd387c3..9d52ef556 100644 --- a/examples/tutorials/high-availability/installation-guide.markdown +++ b/content/examples/tutorials/high-availability/installation-guide.markdown @@ -1,6 +1,5 @@ --- layout: default -published: true title: Installation guide --- diff --git a/examples/tutorials/hosts-add-new-tracker.png b/content/examples/tutorials/hosts-add-new-tracker.png similarity index 100% rename from examples/tutorials/hosts-add-new-tracker.png rename to content/examples/tutorials/hosts-add-new-tracker.png diff --git a/examples/tutorials/installing-cfengine-enterprise-agent.markdown b/content/examples/tutorials/installing-cfengine-enterprise-agent.markdown similarity index 99% rename from examples/tutorials/installing-cfengine-enterprise-agent.markdown rename to content/examples/tutorials/installing-cfengine-enterprise-agent.markdown index 5ff0f2b15..5e2299b16 100644 --- a/examples/tutorials/installing-cfengine-enterprise-agent.markdown +++ b/content/examples/tutorials/installing-cfengine-enterprise-agent.markdown @@ -1,7 +1,6 @@ --- layout: default title: Installing CFEngine Enterprise agent -published: true sorting: 3 --- diff --git a/examples/tutorials/integrating-alerts-with-pager-duty.markdown b/content/examples/tutorials/integrating-alerts-with-pager-duty.markdown similarity index 99% rename from examples/tutorials/integrating-alerts-with-pager-duty.markdown rename to content/examples/tutorials/integrating-alerts-with-pager-duty.markdown index 607a455cb..600f0b6e5 100644 --- a/examples/tutorials/integrating-alerts-with-pager-duty.markdown +++ b/content/examples/tutorials/integrating-alerts-with-pager-duty.markdown @@ -2,7 +2,6 @@ layout: default title: Integrating alerts with PagerDuty sorting: 15 -published: true --- In this How To tutorial we will show you can integrate with [PagerDuty](http://www.pagerduty.com/) using the CFEngine notification dashboard. diff --git a/examples/tutorials/integrating-alerts-with-pagerduty_CFEngine-Service-Setup-800x512.png b/content/examples/tutorials/integrating-alerts-with-pagerduty_CFEngine-Service-Setup-800x512.png similarity index 100% rename from examples/tutorials/integrating-alerts-with-pagerduty_CFEngine-Service-Setup-800x512.png rename to content/examples/tutorials/integrating-alerts-with-pagerduty_CFEngine-Service-Setup-800x512.png diff --git a/examples/tutorials/integrating-alerts-with-pagerduty_Services_-_PagerDuty.png b/content/examples/tutorials/integrating-alerts-with-pagerduty_Services_-_PagerDuty.png similarity index 100% rename from examples/tutorials/integrating-alerts-with-pagerduty_Services_-_PagerDuty.png rename to content/examples/tutorials/integrating-alerts-with-pagerduty_Services_-_PagerDuty.png diff --git a/examples/tutorials/integrating-alerts-with-pagerduty_bundlesequence-800x357.png b/content/examples/tutorials/integrating-alerts-with-pagerduty_bundlesequence-800x357.png similarity index 100% rename from examples/tutorials/integrating-alerts-with-pagerduty_bundlesequence-800x357.png rename to content/examples/tutorials/integrating-alerts-with-pagerduty_bundlesequence-800x357.png diff --git a/examples/tutorials/integrating-alerts-with-pagerduty_inputs-800x179.png b/content/examples/tutorials/integrating-alerts-with-pagerduty_inputs-800x179.png similarity index 100% rename from examples/tutorials/integrating-alerts-with-pagerduty_inputs-800x179.png rename to content/examples/tutorials/integrating-alerts-with-pagerduty_inputs-800x179.png diff --git a/examples/tutorials/integrating-alerts-with-pagerduty_new_alert1.png b/content/examples/tutorials/integrating-alerts-with-pagerduty_new_alert1.png similarity index 100% rename from examples/tutorials/integrating-alerts-with-pagerduty_new_alert1.png rename to content/examples/tutorials/integrating-alerts-with-pagerduty_new_alert1.png diff --git a/examples/tutorials/integrating-alerts-with-pagerduty_new_alert_bundle_repair.png b/content/examples/tutorials/integrating-alerts-with-pagerduty_new_alert_bundle_repair.png similarity index 100% rename from examples/tutorials/integrating-alerts-with-pagerduty_new_alert_bundle_repair.png rename to content/examples/tutorials/integrating-alerts-with-pagerduty_new_alert_bundle_repair.png diff --git a/examples/tutorials/integrating-alerts-with-pagerduty_new_alert_details.png b/content/examples/tutorials/integrating-alerts-with-pagerduty_new_alert_details.png similarity index 100% rename from examples/tutorials/integrating-alerts-with-pagerduty_new_alert_details.png rename to content/examples/tutorials/integrating-alerts-with-pagerduty_new_alert_details.png diff --git a/examples/tutorials/integrating-alerts-with-pagerduty_notification.png b/content/examples/tutorials/integrating-alerts-with-pagerduty_notification.png similarity index 100% rename from examples/tutorials/integrating-alerts-with-pagerduty_notification.png rename to content/examples/tutorials/integrating-alerts-with-pagerduty_notification.png diff --git a/examples/tutorials/integrating-alerts-with-pagerduty_pagerduty_new_alert.png b/content/examples/tutorials/integrating-alerts-with-pagerduty_pagerduty_new_alert.png similarity index 100% rename from examples/tutorials/integrating-alerts-with-pagerduty_pagerduty_new_alert.png rename to content/examples/tutorials/integrating-alerts-with-pagerduty_pagerduty_new_alert.png diff --git a/examples/tutorials/integrating-alerts-with-pagerduty_type_policy.png b/content/examples/tutorials/integrating-alerts-with-pagerduty_type_policy.png similarity index 100% rename from examples/tutorials/integrating-alerts-with-pagerduty_type_policy.png rename to content/examples/tutorials/integrating-alerts-with-pagerduty_type_policy.png diff --git a/examples/tutorials/integrating-alerts-with-ticketing-systems.markdown b/content/examples/tutorials/integrating-alerts-with-ticketing-systems.markdown similarity index 99% rename from examples/tutorials/integrating-alerts-with-ticketing-systems.markdown rename to content/examples/tutorials/integrating-alerts-with-ticketing-systems.markdown index 9acd1311d..5b0eff5c3 100644 --- a/examples/tutorials/integrating-alerts-with-ticketing-systems.markdown +++ b/content/examples/tutorials/integrating-alerts-with-ticketing-systems.markdown @@ -2,7 +2,6 @@ layout: default title: Integrating alerts with ticketing systems sorting: 15 -published: true --- Custom actions can be used to integrate with external 3rd party systems. This tutorial shows how to use a custom action script to open a ticket in Jira when a condition is observed. diff --git a/examples/tutorials/integrating-alerts-with-ticketing-systems_alert_parameters_test.zip b/content/examples/tutorials/integrating-alerts-with-ticketing-systems_alert_parameters_test.zip similarity index 100% rename from examples/tutorials/integrating-alerts-with-ticketing-systems_alert_parameters_test.zip rename to content/examples/tutorials/integrating-alerts-with-ticketing-systems_alert_parameters_test.zip diff --git a/examples/tutorials/integrating-alerts-with-ticketing-systems_cfengine_custom_action_jira.py.zip b/content/examples/tutorials/integrating-alerts-with-ticketing-systems_cfengine_custom_action_jira.py.zip similarity index 100% rename from examples/tutorials/integrating-alerts-with-ticketing-systems_cfengine_custom_action_jira.py.zip rename to content/examples/tutorials/integrating-alerts-with-ticketing-systems_cfengine_custom_action_jira.py.zip diff --git a/examples/tutorials/integrating-alerts-with-ticketing-systems_custom-action-alert-association-jira.png b/content/examples/tutorials/integrating-alerts-with-ticketing-systems_custom-action-alert-association-jira.png similarity index 100% rename from examples/tutorials/integrating-alerts-with-ticketing-systems_custom-action-alert-association-jira.png rename to content/examples/tutorials/integrating-alerts-with-ticketing-systems_custom-action-alert-association-jira.png diff --git a/examples/tutorials/integrating-alerts-with-ticketing-systems_custom-action-script-upload-jira.png b/content/examples/tutorials/integrating-alerts-with-ticketing-systems_custom-action-script-upload-jira.png similarity index 100% rename from examples/tutorials/integrating-alerts-with-ticketing-systems_custom-action-script-upload-jira.png rename to content/examples/tutorials/integrating-alerts-with-ticketing-systems_custom-action-script-upload-jira.png diff --git a/examples/tutorials/integrating-alerts-with-ticketing-systems_policy-compliance-add-alert.png b/content/examples/tutorials/integrating-alerts-with-ticketing-systems_policy-compliance-add-alert.png similarity index 100% rename from examples/tutorials/integrating-alerts-with-ticketing-systems_policy-compliance-add-alert.png rename to content/examples/tutorials/integrating-alerts-with-ticketing-systems_policy-compliance-add-alert.png diff --git a/examples/tutorials/integrating-alerts-with-ticketing-systems_web-service-condition.png b/content/examples/tutorials/integrating-alerts-with-ticketing-systems_web-service-condition.png similarity index 100% rename from examples/tutorials/integrating-alerts-with-ticketing-systems_web-service-condition.png rename to content/examples/tutorials/integrating-alerts-with-ticketing-systems_web-service-condition.png diff --git a/examples/tutorials/integrating-with-sumo-logic.markdown b/content/examples/tutorials/integrating-with-sumo-logic.markdown similarity index 99% rename from examples/tutorials/integrating-with-sumo-logic.markdown rename to content/examples/tutorials/integrating-with-sumo-logic.markdown index 30b2b13cc..63d7b3aa7 100644 --- a/examples/tutorials/integrating-with-sumo-logic.markdown +++ b/content/examples/tutorials/integrating-with-sumo-logic.markdown @@ -2,7 +2,6 @@ layout: default title: Integrating with Sumo Logic sorting: 15 -published: true --- In this How To we will show a simple integrate with [Sumo Logic](http://www.sumologic.com). Whenever there is a CFEngine policy update, that event will be exported to Sumo Logic. These events can become valuable traces when using Sumo Logic to analyze and detect unintendent system behavior. diff --git a/examples/tutorials/integrating-with-sumo-logic_sumo.png b/content/examples/tutorials/integrating-with-sumo-logic_sumo.png similarity index 100% rename from examples/tutorials/integrating-with-sumo-logic_sumo.png rename to content/examples/tutorials/integrating-with-sumo-logic_sumo.png diff --git a/examples/tutorials/json-yaml-support-in-cfengine.markdown b/content/examples/tutorials/json-yaml-support-in-cfengine.markdown similarity index 99% rename from examples/tutorials/json-yaml-support-in-cfengine.markdown rename to content/examples/tutorials/json-yaml-support-in-cfengine.markdown index 007dde91b..a68de18f0 100644 --- a/examples/tutorials/json-yaml-support-in-cfengine.markdown +++ b/content/examples/tutorials/json-yaml-support-in-cfengine.markdown @@ -1,7 +1,6 @@ --- layout: default title: JSON and YAML support in CFEngine -published: true sorting: 2 --- diff --git a/examples/tutorials/manage-local-users.markdown b/content/examples/tutorials/manage-local-users.markdown similarity index 99% rename from examples/tutorials/manage-local-users.markdown rename to content/examples/tutorials/manage-local-users.markdown index a9fc340d3..5dca3f5bf 100644 --- a/examples/tutorials/manage-local-users.markdown +++ b/content/examples/tutorials/manage-local-users.markdown @@ -1,7 +1,6 @@ --- layout: default title: Managing local users -published: true sorting: 3 --- diff --git a/examples/tutorials/manage-ntp.markdown b/content/examples/tutorials/manage-ntp.markdown similarity index 99% rename from examples/tutorials/manage-ntp.markdown rename to content/examples/tutorials/manage-ntp.markdown index d6d040e8a..0a708aeee 100644 --- a/examples/tutorials/manage-ntp.markdown +++ b/content/examples/tutorials/manage-ntp.markdown @@ -1,7 +1,6 @@ --- layout: default title: Managing network time protocol -published: true sorting: 3 --- @@ -292,7 +291,7 @@ Now we will manage the configuration file using the built-in mustache templating By default, the NTP service leverages configuration properties specified in /etc/ntp.conf. In this tutorial, we introduce the concept of the files promise type. With this promise type, you can create, delete, and edit files using CFEngine policies. The example policy below illustrates the use of the files promise. -{%raw%} + ```cf3 bundle agent ntp { @@ -360,7 +359,7 @@ keys /etc/ntp/keys } ``` -{%endraw%} + What does this policy do? @@ -368,7 +367,7 @@ Let's review the different sections of the code, starting with the variable decl #### vars -{%raw%} + ```cf3 vars: linux:: @@ -392,7 +391,7 @@ includefile /etc/ntp/crypto/pw keys /etc/ntp/keys "; ``` -{%endraw%} + A few new variables are defined. The variables `ntp_package_name`, `config_file`, `driftfile`, `servers`, and `config_template_string` are defined under the `linux` context (so only linux hosts will define them). `config_file` is the path to the ntp configuration file, `driftfile` and `servers` are both variables that will be used when rendering the configuration file and `config_template_string` is the template that will be used to render the configuration file. While both `driftfile` and `servers` are set the same for all linux hosts, those variables could easily be set to different values under different contexts. @@ -522,7 +521,7 @@ Next we will augment file/template management with data sourced from a JSON data CFEngine offers out-of-the-box support for reading and writing JSON data structures. In this tutorial, we will default the NTP configuration properties in policy, but provide a path for the properties to be overridden from Augments. -{% raw %} + ```cf3 {file="ntp.cf"} bundle agent ntp { @@ -606,7 +605,7 @@ keys /etc/ntp/keys } ``` -{% endraw %} + What does this policy do? diff --git a/examples/tutorials/manage-packages.markdown b/content/examples/tutorials/manage-packages.markdown similarity index 99% rename from examples/tutorials/manage-packages.markdown rename to content/examples/tutorials/manage-packages.markdown index e1581e4a3..3701c4b12 100644 --- a/examples/tutorials/manage-packages.markdown +++ b/content/examples/tutorials/manage-packages.markdown @@ -1,7 +1,6 @@ --- layout: default title: Package management -published: true sorting: 3 --- diff --git a/examples/tutorials/manage-processes-and-services.markdown b/content/examples/tutorials/manage-processes-and-services.markdown similarity index 99% rename from examples/tutorials/manage-processes-and-services.markdown rename to content/examples/tutorials/manage-processes-and-services.markdown index 324187246..31f95f341 100644 --- a/examples/tutorials/manage-processes-and-services.markdown +++ b/content/examples/tutorials/manage-processes-and-services.markdown @@ -1,7 +1,6 @@ --- layout: default title: Managing processes and services -published: true sorting: 3 --- diff --git a/examples/tutorials/masterfiles_policy_framework_upgrade.markdown b/content/examples/tutorials/masterfiles_policy_framework_upgrade.markdown similarity index 99% rename from examples/tutorials/masterfiles_policy_framework_upgrade.markdown rename to content/examples/tutorials/masterfiles_policy_framework_upgrade.markdown index c5bd02451..5dab88318 100644 --- a/examples/tutorials/masterfiles_policy_framework_upgrade.markdown +++ b/content/examples/tutorials/masterfiles_policy_framework_upgrade.markdown @@ -1,7 +1,6 @@ --- layout: default title: Masterfiles Policy Framework upgrade -published: true sorting: 14 --- diff --git a/examples/tutorials/render-files-with-mustache-templates.markdown b/content/examples/tutorials/render-files-with-mustache-templates.markdown similarity index 89% rename from examples/tutorials/render-files-with-mustache-templates.markdown rename to content/examples/tutorials/render-files-with-mustache-templates.markdown index 85ac96127..c41944464 100644 --- a/examples/tutorials/render-files-with-mustache-templates.markdown +++ b/content/examples/tutorials/render-files-with-mustache-templates.markdown @@ -2,7 +2,6 @@ layout: default title: Rendering files with Mustache templates sorting: 15 -published: true --- @@ -27,13 +26,13 @@ Allowed users
   malin=guest myapp.conf.template – the template:.
-{% raw %}Port {{port}}{% endraw %}
-{% raw %}Protocol {{protocol}}{% endraw %}
-{% raw %}Filepath {{filepath}}{% endraw %}
-{% raw %}Encryption {{encryption-level}}{% endraw %}
-{% raw %}Loglevel {{loglevel}}{% endraw %}
-{% raw %}Allowed users {{#users}}{% endraw %}
-{% raw %} {{user}}={{level}}{{/users}}{% endraw %} +Port {{port}}
+Protocol {{protocol}}
+Filepath {{filepath}}
+Encryption {{encryption-level}}
+Loglevel {{loglevel}}
+Allowed users {{#users}}
+ {{user}}={{level}}{{/users}} @@ -44,7 +43,7 @@ Create a file called `/tmp/myapp.conf.template` with the following content: ``` [file=myapp.conf.template] -{% raw %} + Port {{port}} Protocol {{protocol}} Filepath {{filepath}} @@ -52,7 +51,6 @@ Encryption {{encryption-level}} Loglevel {{loglevel}} Allowed users {{#users}} {{user}}={{level}}{{/users}} -{% endraw %} ``` 2. Create CFEngine policy diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities.markdown b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities.markdown similarity index 99% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities.markdown rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities.markdown index 3e2f49545..5c3b65445 100644 --- a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities.markdown +++ b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities.markdown @@ -2,7 +2,6 @@ layout: default title: Reporting and remediation of security vulnerabilities sorting: 10 -published: true --- ## Prerequisites diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_001.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_001.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_001.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_001.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_002.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_002.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_002.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_002.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_003.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_003.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_003.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_003.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_004.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_004.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_004.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_004.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_005.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_005.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_005.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_005.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_006.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_006.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_006.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_006.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_007.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_007.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_007.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_007.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_008.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_008.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_008.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_008.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_009.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_009.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_009.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_009.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_010.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_010.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_010.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_010.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_011.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_011.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_011.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_011.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_012.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_012.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_012.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_012.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_013.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_013.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_013.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_013.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_014.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_014.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_014.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_014.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_015.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_015.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_015.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_015.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_016.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_016.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_016.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_016.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_017.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_017.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_017.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_017.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_018.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_018.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_018.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_018.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_019.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_019.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_019.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_019.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_020.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_020.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_020.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_020.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_021.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_021.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_021.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_021.jpg diff --git a/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_022.jpg b/content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_022.jpg similarity index 100% rename from examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_022.jpg rename to content/examples/tutorials/report_inventory_remediate_sec_vulnerabilities_2014-09-29-Selection_022.jpg diff --git a/examples/tutorials/reporting.markdown b/content/examples/tutorials/reporting/_index.markdown similarity index 99% rename from examples/tutorials/reporting.markdown rename to content/examples/tutorials/reporting/_index.markdown index ebaa8f6aa..bb1c59a41 100644 --- a/examples/tutorials/reporting.markdown +++ b/content/examples/tutorials/reporting/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Reporting -published: true sorting: 80 --- diff --git a/examples/tutorials/reporting/command-line-reports.markdown b/content/examples/tutorials/reporting/command-line-reports.markdown similarity index 99% rename from examples/tutorials/reporting/command-line-reports.markdown rename to content/examples/tutorials/reporting/command-line-reports.markdown index d960be38d..888d0d2a1 100644 --- a/examples/tutorials/reporting/command-line-reports.markdown +++ b/content/examples/tutorials/reporting/command-line-reports.markdown @@ -1,7 +1,6 @@ --- layout: default title: Command-Line reports -published: true sorting: 60 --- diff --git a/examples/tutorials/reporting/monitoring-reporting.markdown b/content/examples/tutorials/reporting/monitoring-reporting.markdown similarity index 99% rename from examples/tutorials/reporting/monitoring-reporting.markdown rename to content/examples/tutorials/reporting/monitoring-reporting.markdown index ae4f01c39..c421185fc 100644 --- a/examples/tutorials/reporting/monitoring-reporting.markdown +++ b/content/examples/tutorials/reporting/monitoring-reporting.markdown @@ -1,7 +1,6 @@ --- layout: default title: Monitoring and reporting -published: true sorting: 10 --- diff --git a/examples/tutorials/tags.markdown b/content/examples/tutorials/tags.markdown similarity index 99% rename from examples/tutorials/tags.markdown rename to content/examples/tutorials/tags.markdown index f8301367f..3ec63aab0 100644 --- a/examples/tutorials/tags.markdown +++ b/content/examples/tutorials/tags.markdown @@ -1,7 +1,6 @@ --- layout: default title: Tags for variables, classes, and bundles -published: true sorting: 14 --- diff --git a/examples/tutorials/tutorials_custom_inventory_attribute.png b/content/examples/tutorials/tutorials_custom_inventory_attribute.png similarity index 100% rename from examples/tutorials/tutorials_custom_inventory_attribute.png rename to content/examples/tutorials/tutorials_custom_inventory_attribute.png diff --git a/examples/tutorials/tutorials_custom_inventory_report.png b/content/examples/tutorials/tutorials_custom_inventory_report.png similarity index 100% rename from examples/tutorials/tutorials_custom_inventory_report.png rename to content/examples/tutorials/tutorials_custom_inventory_report.png diff --git a/examples/tutorials/write-cfengine-policy.markdown b/content/examples/tutorials/write-cfengine-policy.markdown similarity index 99% rename from examples/tutorials/write-cfengine-policy.markdown rename to content/examples/tutorials/write-cfengine-policy.markdown index 0c988da28..6539c8fce 100644 --- a/examples/tutorials/write-cfengine-policy.markdown +++ b/content/examples/tutorials/write-cfengine-policy.markdown @@ -1,7 +1,6 @@ --- layout: default title: Writing CFEngine policy -published: true sorting: 3 --- diff --git a/examples/tutorials/writing-and-serving-policy.markdown b/content/examples/tutorials/writing-and-serving-policy/_index.markdown similarity index 99% rename from examples/tutorials/writing-and-serving-policy.markdown rename to content/examples/tutorials/writing-and-serving-policy/_index.markdown index 6f9e3acc7..26c683e5f 100644 --- a/examples/tutorials/writing-and-serving-policy.markdown +++ b/content/examples/tutorials/writing-and-serving-policy/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Writing and serving policy -published: true sorting: 100 --- diff --git a/examples/tutorials/writing-and-serving-policy/authoring-policy-tools-and-workflow.markdown b/content/examples/tutorials/writing-and-serving-policy/authoring-policy-tools-and-workflow.markdown similarity index 99% rename from examples/tutorials/writing-and-serving-policy/authoring-policy-tools-and-workflow.markdown rename to content/examples/tutorials/writing-and-serving-policy/authoring-policy-tools-and-workflow.markdown index 3d05a1e1c..7f03bea19 100644 --- a/examples/tutorials/writing-and-serving-policy/authoring-policy-tools-and-workflow.markdown +++ b/content/examples/tutorials/writing-and-serving-policy/authoring-policy-tools-and-workflow.markdown @@ -1,7 +1,6 @@ --- layout: default title: Authoring policy tools & workflow -published: true sorting: 5 --- diff --git a/examples/tutorials/writing-and-serving-policy/bundles-best-practices.markdown b/content/examples/tutorials/writing-and-serving-policy/bundles-best-practices.markdown similarity index 99% rename from examples/tutorials/writing-and-serving-policy/bundles-best-practices.markdown rename to content/examples/tutorials/writing-and-serving-policy/bundles-best-practices.markdown index eecdd302d..faef1fdb8 100644 --- a/examples/tutorials/writing-and-serving-policy/bundles-best-practices.markdown +++ b/content/examples/tutorials/writing-and-serving-policy/bundles-best-practices.markdown @@ -1,7 +1,6 @@ --- layout: default title: Bundles best practices -published: true sorting: 20 --- diff --git a/examples/tutorials/writing-and-serving-policy/controlling-frequency.markdown b/content/examples/tutorials/writing-and-serving-policy/controlling-frequency.markdown similarity index 99% rename from examples/tutorials/writing-and-serving-policy/controlling-frequency.markdown rename to content/examples/tutorials/writing-and-serving-policy/controlling-frequency.markdown index 123a05c87..94fa21398 100644 --- a/examples/tutorials/writing-and-serving-policy/controlling-frequency.markdown +++ b/content/examples/tutorials/writing-and-serving-policy/controlling-frequency.markdown @@ -1,7 +1,6 @@ --- layout: default title: Controlling frequency -published: true sorting: 90 --- diff --git a/examples/tutorials/writing-and-serving-policy/editors.markdown b/content/examples/tutorials/writing-and-serving-policy/editors.markdown similarity index 99% rename from examples/tutorials/writing-and-serving-policy/editors.markdown rename to content/examples/tutorials/writing-and-serving-policy/editors.markdown index 97f1187a6..8655458b3 100644 --- a/examples/tutorials/writing-and-serving-policy/editors.markdown +++ b/content/examples/tutorials/writing-and-serving-policy/editors.markdown @@ -1,7 +1,6 @@ --- layout: default title: Editors -published: true sorting: 10 --- diff --git a/examples/tutorials/writing-and-serving-policy/external_data.markdown b/content/examples/tutorials/writing-and-serving-policy/external_data.markdown similarity index 98% rename from examples/tutorials/writing-and-serving-policy/external_data.markdown rename to content/examples/tutorials/writing-and-serving-policy/external_data.markdown index bdec2c370..06889b291 100644 --- a/examples/tutorials/writing-and-serving-policy/external_data.markdown +++ b/content/examples/tutorials/writing-and-serving-policy/external_data.markdown @@ -1,7 +1,6 @@ --- layout: default title: External data -published: true sorting: 50 --- diff --git a/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-atom.png b/content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-atom.png similarity index 100% rename from examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-atom.png rename to content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-atom.png diff --git a/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-0.png b/content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-0.png similarity index 100% rename from examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-0.png rename to content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-0.png diff --git a/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-1.png b/content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-1.png similarity index 100% rename from examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-1.png rename to content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-1.png diff --git a/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-2.png b/content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-2.png similarity index 100% rename from examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-2.png rename to content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-2.png diff --git a/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-3.png b/content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-3.png similarity index 100% rename from examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-3.png rename to content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-eclipse-3.png diff --git a/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-emacs.png b/content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-emacs.png similarity index 100% rename from examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-emacs.png rename to content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-emacs.png diff --git a/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-kate.jpg b/content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-kate.jpg similarity index 100% rename from examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-kate.jpg rename to content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-kate.jpg diff --git a/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-spacemacs.png b/content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-spacemacs.png similarity index 100% rename from examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-spacemacs.png rename to content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-spacemacs.png diff --git a/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-sublime-text.jpg b/content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-sublime-text.jpg similarity index 100% rename from examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-sublime-text.jpg rename to content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-sublime-text.jpg diff --git a/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-vim.png b/content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-vim.png similarity index 100% rename from examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-vim.png rename to content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-vim.png diff --git a/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-visual-studio-code.png b/content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-visual-studio-code.png similarity index 100% rename from examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-visual-studio-code.png rename to content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-visual-studio-code.png diff --git a/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-zed.png b/content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-zed.png similarity index 100% rename from examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-zed.png rename to content/examples/tutorials/writing-and-serving-policy/guide-writing-and-serving-policy-editors-zed.png diff --git a/guide/policy-decision-flow.png b/content/examples/tutorials/writing-and-serving-policy/policy-decision-flow.png similarity index 100% rename from guide/policy-decision-flow.png rename to content/examples/tutorials/writing-and-serving-policy/policy-decision-flow.png diff --git a/examples/tutorials/writing-and-serving-policy/policy-layers-abstraction.markdown b/content/examples/tutorials/writing-and-serving-policy/policy-layers-abstraction.markdown similarity index 99% rename from examples/tutorials/writing-and-serving-policy/policy-layers-abstraction.markdown rename to content/examples/tutorials/writing-and-serving-policy/policy-layers-abstraction.markdown index 277ea8cfb..6832e9608 100644 --- a/examples/tutorials/writing-and-serving-policy/policy-layers-abstraction.markdown +++ b/content/examples/tutorials/writing-and-serving-policy/policy-layers-abstraction.markdown @@ -1,7 +1,6 @@ --- layout: default title: Layers of abstraction in policy -published: true sorting: 2 --- diff --git a/examples/tutorials/writing-and-serving-policy/policy-style.markdown b/content/examples/tutorials/writing-and-serving-policy/policy-style.markdown similarity index 99% rename from examples/tutorials/writing-and-serving-policy/policy-style.markdown rename to content/examples/tutorials/writing-and-serving-policy/policy-style.markdown index f9e4d25ec..f00139e1b 100644 --- a/examples/tutorials/writing-and-serving-policy/policy-style.markdown +++ b/content/examples/tutorials/writing-and-serving-policy/policy-style.markdown @@ -1,7 +1,6 @@ --- layout: default title: Policy style guide -published: true sorting: 10 --- diff --git a/examples/tutorials/writing-and-serving-policy/promises-available-in-cfengine.markdown b/content/examples/tutorials/writing-and-serving-policy/promises-available-in-cfengine.markdown similarity index 99% rename from examples/tutorials/writing-and-serving-policy/promises-available-in-cfengine.markdown rename to content/examples/tutorials/writing-and-serving-policy/promises-available-in-cfengine.markdown index 08adbdee3..02ea82b97 100644 --- a/examples/tutorials/writing-and-serving-policy/promises-available-in-cfengine.markdown +++ b/content/examples/tutorials/writing-and-serving-policy/promises-available-in-cfengine.markdown @@ -2,7 +2,6 @@ layout: default title: Promises available in CFEngine sorting: 4 -published: true --- ### meta - information about promise bundles diff --git a/examples/tutorials/writing-and-serving-policy/testing-policies.markdown b/content/examples/tutorials/writing-and-serving-policy/testing-policies.markdown similarity index 98% rename from examples/tutorials/writing-and-serving-policy/testing-policies.markdown rename to content/examples/tutorials/writing-and-serving-policy/testing-policies.markdown index 705d68537..1458db355 100644 --- a/examples/tutorials/writing-and-serving-policy/testing-policies.markdown +++ b/content/examples/tutorials/writing-and-serving-policy/testing-policies.markdown @@ -1,7 +1,6 @@ --- layout: default title: Testing policies -published: true sorting: 50 --- diff --git a/getting-started.markdown b/content/getting-started/_index.markdown similarity index 98% rename from getting-started.markdown rename to content/getting-started/_index.markdown index bccbd8aae..88451584f 100644 --- a/getting-started.markdown +++ b/content/getting-started/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Getting started -published: true sorting: 20 --- diff --git a/getting-started/action-buttons.png b/content/getting-started/action-buttons.png similarity index 100% rename from getting-started/action-buttons.png rename to content/getting-started/action-buttons.png diff --git a/getting-started/compliance-report.png b/content/getting-started/compliance-report.png similarity index 100% rename from getting-started/compliance-report.png rename to content/getting-started/compliance-report.png diff --git a/getting-started/developing-modules.markdown b/content/getting-started/developing-modules.markdown similarity index 99% rename from getting-started/developing-modules.markdown rename to content/getting-started/developing-modules.markdown index a8231cc02..cdc0311fc 100644 --- a/getting-started/developing-modules.markdown +++ b/content/getting-started/developing-modules.markdown @@ -1,7 +1,6 @@ --- layout: default title: Developing modules -published: true sorting: 50 --- diff --git a/getting-started/digital-ocean.png b/content/getting-started/digital-ocean.png similarity index 100% rename from getting-started/digital-ocean.png rename to content/getting-started/digital-ocean.png diff --git a/getting-started/host-info.png b/content/getting-started/host-info.png similarity index 100% rename from getting-started/host-info.png rename to content/getting-started/host-info.png diff --git a/getting-started/host-specific-data-with-suggestion.png b/content/getting-started/host-specific-data-with-suggestion.png similarity index 100% rename from getting-started/host-specific-data-with-suggestion.png rename to content/getting-started/host-specific-data-with-suggestion.png diff --git a/getting-started/hugo-commit.png b/content/getting-started/hugo-commit.png similarity index 100% rename from getting-started/hugo-commit.png rename to content/getting-started/hugo-commit.png diff --git a/web-ui/enterprise-reporting/Reports-Inventory-1.png b/content/getting-started/installation/Reports-Inventory-1.png similarity index 100% rename from web-ui/enterprise-reporting/Reports-Inventory-1.png rename to content/getting-started/installation/Reports-Inventory-1.png diff --git a/getting-started/installation.markdown b/content/getting-started/installation/_index.markdown similarity index 99% rename from getting-started/installation.markdown rename to content/getting-started/installation/_index.markdown index e4f09b769..a5f77c356 100644 --- a/getting-started/installation.markdown +++ b/content/getting-started/installation/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Installation -published: true sorting: 10 --- diff --git a/content/getting-started/installation/digital-ocean.png b/content/getting-started/installation/digital-ocean.png new file mode 100644 index 000000000..517b950bc Binary files /dev/null and b/content/getting-started/installation/digital-ocean.png differ diff --git a/getting-started/installation/img/Installing-CFE-on-AWS-10.png b/content/getting-started/installation/general-installation/Installing-CFE-on-AWS-10.png similarity index 100% rename from getting-started/installation/img/Installing-CFE-on-AWS-10.png rename to content/getting-started/installation/general-installation/Installing-CFE-on-AWS-10.png diff --git a/getting-started/installation/img/Installing-CFE-on-AWS-11.png b/content/getting-started/installation/general-installation/Installing-CFE-on-AWS-11.png similarity index 100% rename from getting-started/installation/img/Installing-CFE-on-AWS-11.png rename to content/getting-started/installation/general-installation/Installing-CFE-on-AWS-11.png diff --git a/getting-started/installation/img/Installing-CFE-on-AWS-8.png b/content/getting-started/installation/general-installation/Installing-CFE-on-AWS-8.png similarity index 100% rename from getting-started/installation/img/Installing-CFE-on-AWS-8.png rename to content/getting-started/installation/general-installation/Installing-CFE-on-AWS-8.png diff --git a/getting-started/installation/img/Installing-CFE-on-AWS-9.png b/content/getting-started/installation/general-installation/Installing-CFE-on-AWS-9.png similarity index 100% rename from getting-started/installation/img/Installing-CFE-on-AWS-9.png rename to content/getting-started/installation/general-installation/Installing-CFE-on-AWS-9.png diff --git a/getting-started/installation/general-installation.markdown b/content/getting-started/installation/general-installation/_index.markdown similarity index 98% rename from getting-started/installation/general-installation.markdown rename to content/getting-started/installation/general-installation/_index.markdown index 95374abed..fb4d609ca 100644 --- a/getting-started/installation/general-installation.markdown +++ b/content/getting-started/installation/general-installation/_index.markdown @@ -1,11 +1,10 @@ --- layout: default title: General installation -published: true sorting: 20 --- -[%CFEngine_include_markdown(include-install-bootstrap-configure-summary.markdown)%] +[%CFEngine_include_markdown(install-bootstrap-configure-summary.include.markdown)%] ## Before installation diff --git a/getting-started/installation/general-installation/common_next_steps.markdown b/content/getting-started/installation/general-installation/common_next_steps.include.markdown similarity index 100% rename from getting-started/installation/general-installation/common_next_steps.markdown rename to content/getting-started/installation/general-installation/common_next_steps.include.markdown diff --git a/getting-started/installation/general-installation/installation-community-containerized.markdown b/content/getting-started/installation/general-installation/installation-community-containerized.markdown similarity index 99% rename from getting-started/installation/general-installation/installation-community-containerized.markdown rename to content/getting-started/installation/general-installation/installation-community-containerized.markdown index bde775fee..c0e9df6e5 100644 --- a/getting-started/installation/general-installation/installation-community-containerized.markdown +++ b/content/getting-started/installation/general-installation/installation-community-containerized.markdown @@ -1,7 +1,6 @@ --- layout: default title: Installing Community Using Containers -published: true sorting: 80 --- diff --git a/getting-started/installation/general-installation/installation-community.markdown b/content/getting-started/installation/general-installation/installation-community.markdown similarity index 99% rename from getting-started/installation/general-installation/installation-community.markdown rename to content/getting-started/installation/general-installation/installation-community.markdown index 71ac7f708..850d66a26 100644 --- a/getting-started/installation/general-installation/installation-community.markdown +++ b/content/getting-started/installation/general-installation/installation-community.markdown @@ -1,7 +1,6 @@ --- layout: default title: Installing Community -published: true sorting: 50 --- diff --git a/getting-started/installation/general-installation/installation-coreos.markdown b/content/getting-started/installation/general-installation/installation-coreos.markdown similarity index 98% rename from getting-started/installation/general-installation/installation-coreos.markdown rename to content/getting-started/installation/general-installation/installation-coreos.markdown index 1b7e575c5..ebbfee648 100644 --- a/getting-started/installation/general-installation/installation-coreos.markdown +++ b/content/getting-started/installation/general-installation/installation-coreos.markdown @@ -1,7 +1,6 @@ --- layout: default title: Installing Enterprise on CoreOS -published: true sorting: 40 --- diff --git a/getting-started/installation/general-installation/installation-enterprise-free-aws-rhel.markdown b/content/getting-started/installation/general-installation/installation-enterprise-free-aws-rhel.markdown similarity index 99% rename from getting-started/installation/general-installation/installation-enterprise-free-aws-rhel.markdown rename to content/getting-started/installation/general-installation/installation-enterprise-free-aws-rhel.markdown index c72199321..7e57de0de 100644 --- a/getting-started/installation/general-installation/installation-enterprise-free-aws-rhel.markdown +++ b/content/getting-started/installation/general-installation/installation-enterprise-free-aws-rhel.markdown @@ -1,7 +1,6 @@ --- layout: default title: Using Amazon Web Services -published: true sorting: 10 --- diff --git a/getting-started/installation/general-installation/installation-enterprise-free.markdown b/content/getting-started/installation/general-installation/installation-enterprise-free.markdown similarity index 99% rename from getting-started/installation/general-installation/installation-enterprise-free.markdown rename to content/getting-started/installation/general-installation/installation-enterprise-free.markdown index 209408dba..188da2165 100644 --- a/getting-started/installation/general-installation/installation-enterprise-free.markdown +++ b/content/getting-started/installation/general-installation/installation-enterprise-free.markdown @@ -1,7 +1,6 @@ --- layout: default title: Installing Enterprise 25 Free -published: true sorting: 20 --- diff --git a/getting-started/installation/general-installation/installation-enterprise-generic-tarball.markdown b/content/getting-started/installation/general-installation/installation-enterprise-generic-tarball.markdown similarity index 98% rename from getting-started/installation/general-installation/installation-enterprise-generic-tarball.markdown rename to content/getting-started/installation/general-installation/installation-enterprise-generic-tarball.markdown index f17b3b13a..f1c739dbe 100644 --- a/getting-started/installation/general-installation/installation-enterprise-generic-tarball.markdown +++ b/content/getting-started/installation/general-installation/installation-enterprise-generic-tarball.markdown @@ -1,7 +1,6 @@ --- layout: default title: Installing from binary tarball -published: true sorting: 50 --- diff --git a/getting-started/installation/general-installation/installation-enterprise-vagrant.markdown b/content/getting-started/installation/general-installation/installation-enterprise-vagrant.markdown similarity index 99% rename from getting-started/installation/general-installation/installation-enterprise-vagrant.markdown rename to content/getting-started/installation/general-installation/installation-enterprise-vagrant.markdown index 5b7e8ac89..b0e33f515 100644 --- a/getting-started/installation/general-installation/installation-enterprise-vagrant.markdown +++ b/content/getting-started/installation/general-installation/installation-enterprise-vagrant.markdown @@ -1,7 +1,6 @@ --- layout: default title: Using Vagrant -published: true sorting: 30 --- @@ -224,4 +223,4 @@ Vagrant and VirtualBox are useful general purpose programs, so you might want to keep them around. If not, follow the standard procedures for your OS to remove these applications. -[%CFEngine_include_markdown(common_next_steps.markdown)%] +[%CFEngine_include_markdown(common_next_steps.include.markdown)%] diff --git a/getting-started/installation/general-installation/installation-enterprise.markdown b/content/getting-started/installation/general-installation/installation-enterprise.markdown similarity index 99% rename from getting-started/installation/general-installation/installation-enterprise.markdown rename to content/getting-started/installation/general-installation/installation-enterprise.markdown index a123d1091..192376766 100644 --- a/getting-started/installation/general-installation/installation-enterprise.markdown +++ b/content/getting-started/installation/general-installation/installation-enterprise.markdown @@ -1,7 +1,6 @@ --- layout: default title: Installing Enterprise for production -published: true sorting: 40 --- diff --git a/getting-started/installation/img/Installing-CFE-on-AWS-1.png b/content/getting-started/installation/img/Installing-CFE-on-AWS-1.png similarity index 100% rename from getting-started/installation/img/Installing-CFE-on-AWS-1.png rename to content/getting-started/installation/img/Installing-CFE-on-AWS-1.png diff --git a/content/getting-started/installation/img/Installing-CFE-on-AWS-10.png b/content/getting-started/installation/img/Installing-CFE-on-AWS-10.png new file mode 100644 index 000000000..479495abb Binary files /dev/null and b/content/getting-started/installation/img/Installing-CFE-on-AWS-10.png differ diff --git a/content/getting-started/installation/img/Installing-CFE-on-AWS-11.png b/content/getting-started/installation/img/Installing-CFE-on-AWS-11.png new file mode 100644 index 000000000..6af93f7fa Binary files /dev/null and b/content/getting-started/installation/img/Installing-CFE-on-AWS-11.png differ diff --git a/getting-started/installation/img/Installing-CFE-on-AWS-2.png b/content/getting-started/installation/img/Installing-CFE-on-AWS-2.png similarity index 100% rename from getting-started/installation/img/Installing-CFE-on-AWS-2.png rename to content/getting-started/installation/img/Installing-CFE-on-AWS-2.png diff --git a/getting-started/installation/img/Installing-CFE-on-AWS-3.png b/content/getting-started/installation/img/Installing-CFE-on-AWS-3.png similarity index 100% rename from getting-started/installation/img/Installing-CFE-on-AWS-3.png rename to content/getting-started/installation/img/Installing-CFE-on-AWS-3.png diff --git a/getting-started/installation/img/Installing-CFE-on-AWS-4.png b/content/getting-started/installation/img/Installing-CFE-on-AWS-4.png similarity index 100% rename from getting-started/installation/img/Installing-CFE-on-AWS-4.png rename to content/getting-started/installation/img/Installing-CFE-on-AWS-4.png diff --git a/getting-started/installation/img/Installing-CFE-on-AWS-5.png b/content/getting-started/installation/img/Installing-CFE-on-AWS-5.png similarity index 100% rename from getting-started/installation/img/Installing-CFE-on-AWS-5.png rename to content/getting-started/installation/img/Installing-CFE-on-AWS-5.png diff --git a/getting-started/installation/img/Installing-CFE-on-AWS-6.png b/content/getting-started/installation/img/Installing-CFE-on-AWS-6.png similarity index 100% rename from getting-started/installation/img/Installing-CFE-on-AWS-6.png rename to content/getting-started/installation/img/Installing-CFE-on-AWS-6.png diff --git a/getting-started/installation/img/Installing-CFE-on-AWS-7.png b/content/getting-started/installation/img/Installing-CFE-on-AWS-7.png similarity index 100% rename from getting-started/installation/img/Installing-CFE-on-AWS-7.png rename to content/getting-started/installation/img/Installing-CFE-on-AWS-7.png diff --git a/content/getting-started/installation/img/Installing-CFE-on-AWS-8.png b/content/getting-started/installation/img/Installing-CFE-on-AWS-8.png new file mode 100644 index 000000000..dae23af18 Binary files /dev/null and b/content/getting-started/installation/img/Installing-CFE-on-AWS-8.png differ diff --git a/content/getting-started/installation/img/Installing-CFE-on-AWS-9.png b/content/getting-started/installation/img/Installing-CFE-on-AWS-9.png new file mode 100644 index 000000000..9c5013591 Binary files /dev/null and b/content/getting-started/installation/img/Installing-CFE-on-AWS-9.png differ diff --git a/getting-started/installation/installation-overview.markdown b/content/getting-started/installation/installation-overview.markdown similarity index 90% rename from getting-started/installation/installation-overview.markdown rename to content/getting-started/installation/installation-overview.markdown index b28dd261e..7572ac8c4 100644 --- a/getting-started/installation/installation-overview.markdown +++ b/content/getting-started/installation/installation-overview.markdown @@ -2,12 +2,11 @@ layout: default title: Installation overview sorting: 30 -published: true --- ## Installation -[%CFEngine_include_markdown(include-install-bootstrap-configure-summary.markdown)%] +[%CFEngine_include_markdown(install-bootstrap-configure-summary.include.markdown)%] See [General installation][General installation] for a more detailed guide for how to install CFEngine, and links to installation guides for various versions of CFEngine and different configurations. diff --git a/getting-started/installation/local-virtual-machine.markdown b/content/getting-started/installation/local-virtual-machine.markdown similarity index 99% rename from getting-started/installation/local-virtual-machine.markdown rename to content/getting-started/installation/local-virtual-machine.markdown index 64f44fcc8..c614c4295 100644 --- a/getting-started/installation/local-virtual-machine.markdown +++ b/content/getting-started/installation/local-virtual-machine.markdown @@ -1,7 +1,6 @@ --- layout: default title: Local virtual machine -published: true sorting: 15 --- diff --git a/getting-started/machines.png b/content/getting-started/installation/machines.png similarity index 100% rename from getting-started/machines.png rename to content/getting-started/installation/machines.png diff --git a/getting-started/mp-login.png b/content/getting-started/installation/mp-login.png similarity index 100% rename from getting-started/mp-login.png rename to content/getting-started/installation/mp-login.png diff --git a/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-1.png b/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-1.png new file mode 100644 index 000000000..379cf8bc8 Binary files /dev/null and b/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-1.png differ diff --git a/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-2.png b/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-2.png new file mode 100644 index 000000000..c854c9492 Binary files /dev/null and b/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-2.png differ diff --git a/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-3.png b/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-3.png new file mode 100644 index 000000000..a854e696b Binary files /dev/null and b/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-3.png differ diff --git a/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-4.png b/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-4.png new file mode 100644 index 000000000..8b49b4c49 Binary files /dev/null and b/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-4.png differ diff --git a/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-5.png b/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-5.png new file mode 100644 index 000000000..8bb46aa45 Binary files /dev/null and b/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-5.png differ diff --git a/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-6.png b/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-6.png new file mode 100644 index 000000000..3ea2763e7 Binary files /dev/null and b/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-6.png differ diff --git a/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-7.png b/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-7.png new file mode 100644 index 000000000..4ca1ad344 Binary files /dev/null and b/content/getting-started/installation/pre-installation-checklist/Installing-CFE-on-AWS-7.png differ diff --git a/getting-started/installation/pre-installation-checklist.markdown b/content/getting-started/installation/pre-installation-checklist/_index.markdown similarity index 97% rename from getting-started/installation/pre-installation-checklist.markdown rename to content/getting-started/installation/pre-installation-checklist/_index.markdown index d07a0f3f0..0df50b90c 100644 --- a/getting-started/installation/pre-installation-checklist.markdown +++ b/content/getting-started/installation/pre-installation-checklist/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Pre-installation checklist -published: true sorting: 10 --- diff --git a/getting-started/installation/pre-installation-checklist/putty-key-generator-window.png b/content/getting-started/installation/pre-installation-checklist/putty-key-generator-window.png similarity index 100% rename from getting-started/installation/pre-installation-checklist/putty-key-generator-window.png rename to content/getting-started/installation/pre-installation-checklist/putty-key-generator-window.png diff --git a/getting-started/installation/pre-installation-checklist/putty-quick-start-guide.markdown b/content/getting-started/installation/pre-installation-checklist/putty-quick-start-guide.markdown similarity index 99% rename from getting-started/installation/pre-installation-checklist/putty-quick-start-guide.markdown rename to content/getting-started/installation/pre-installation-checklist/putty-quick-start-guide.markdown index 24e2a70ca..773778739 100644 --- a/getting-started/installation/pre-installation-checklist/putty-quick-start-guide.markdown +++ b/content/getting-started/installation/pre-installation-checklist/putty-quick-start-guide.markdown @@ -1,7 +1,6 @@ --- title: Quick-Start guide to using PuTTY layout: default -published: true sorting: 2 --- diff --git a/getting-started/installation/pre-installation-checklist/puttygen-interface.png b/content/getting-started/installation/pre-installation-checklist/puttygen-interface.png similarity index 100% rename from getting-started/installation/pre-installation-checklist/puttygen-interface.png rename to content/getting-started/installation/pre-installation-checklist/puttygen-interface.png diff --git a/getting-started/installation/pre-installation-checklist/puttygen-load-private-key-window.png b/content/getting-started/installation/pre-installation-checklist/puttygen-load-private-key-window.png similarity index 100% rename from getting-started/installation/pre-installation-checklist/puttygen-load-private-key-window.png rename to content/getting-started/installation/pre-installation-checklist/puttygen-load-private-key-window.png diff --git a/getting-started/installation/pre-installation-checklist/verify-signatures.markdown b/content/getting-started/installation/pre-installation-checklist/verify-signatures.markdown similarity index 99% rename from getting-started/installation/pre-installation-checklist/verify-signatures.markdown rename to content/getting-started/installation/pre-installation-checklist/verify-signatures.markdown index 89a552a42..fcc1b1140 100644 --- a/getting-started/installation/pre-installation-checklist/verify-signatures.markdown +++ b/content/getting-started/installation/pre-installation-checklist/verify-signatures.markdown @@ -1,7 +1,6 @@ --- layout: default title: Verifying package signatures -published: true sorting: 40 --- diff --git a/getting-started/installation/pre-installation-checklist/vi-quick-start-guide.markdown b/content/getting-started/installation/pre-installation-checklist/vi-quick-start-guide.markdown similarity index 99% rename from getting-started/installation/pre-installation-checklist/vi-quick-start-guide.markdown rename to content/getting-started/installation/pre-installation-checklist/vi-quick-start-guide.markdown index fefccee6b..9e4a32ba0 100644 --- a/getting-started/installation/pre-installation-checklist/vi-quick-start-guide.markdown +++ b/content/getting-started/installation/pre-installation-checklist/vi-quick-start-guide.markdown @@ -1,7 +1,6 @@ --- layout: default title: Quick-Start guide to using vi -published: true sorting: 1 --- diff --git a/getting-started/installation/secure-bootstrap.markdown b/content/getting-started/installation/secure-bootstrap.markdown similarity index 99% rename from getting-started/installation/secure-bootstrap.markdown rename to content/getting-started/installation/secure-bootstrap.markdown index 086af1ac5..573b7b324 100644 --- a/getting-started/installation/secure-bootstrap.markdown +++ b/content/getting-started/installation/secure-bootstrap.markdown @@ -1,7 +1,6 @@ --- layout: default title: Secure bootstrap -published: true sorting: 20 --- diff --git a/getting-started/installation/upgrading.markdown b/content/getting-started/installation/upgrading.markdown similarity index 99% rename from getting-started/installation/upgrading.markdown rename to content/getting-started/installation/upgrading.markdown index bd7dfe57e..99c87240d 100644 --- a/getting-started/installation/upgrading.markdown +++ b/content/getting-started/installation/upgrading.markdown @@ -1,7 +1,6 @@ --- layout: default title: Upgrading -published: true sorting: 30 --- diff --git a/getting-started/installation/version-control.markdown b/content/getting-started/installation/version-control.markdown similarity index 99% rename from getting-started/installation/version-control.markdown rename to content/getting-started/installation/version-control.markdown index 30bd315d2..cd7a5157c 100644 --- a/getting-started/installation/version-control.markdown +++ b/content/getting-started/installation/version-control.markdown @@ -1,7 +1,6 @@ --- layout: default title: Version control -published: true sorting: 60 --- diff --git a/getting-started/inventory-reports.gif b/content/getting-started/inventory-reports.gif similarity index 100% rename from getting-started/inventory-reports.gif rename to content/getting-started/inventory-reports.gif diff --git a/getting-started/inventory-section.png b/content/getting-started/inventory-section.png similarity index 100% rename from getting-started/inventory-section.png rename to content/getting-started/inventory-section.png diff --git a/getting-started/inventory-sudoers.gif b/content/getting-started/inventory-sudoers.gif similarity index 100% rename from getting-started/inventory-sudoers.gif rename to content/getting-started/inventory-sudoers.gif diff --git a/content/getting-started/machines.png b/content/getting-started/machines.png new file mode 100644 index 000000000..e2482f9c2 Binary files /dev/null and b/content/getting-started/machines.png differ diff --git a/getting-started/modules-from-cfengine-build.markdown b/content/getting-started/modules-from-cfengine-build.markdown similarity index 99% rename from getting-started/modules-from-cfengine-build.markdown rename to content/getting-started/modules-from-cfengine-build.markdown index 81766b72d..f885db369 100644 --- a/getting-started/modules-from-cfengine-build.markdown +++ b/content/getting-started/modules-from-cfengine-build.markdown @@ -1,7 +1,6 @@ --- layout: default title: Modules from CFEngine Build -published: true sorting: 20 --- diff --git a/content/getting-started/mp-login.png b/content/getting-started/mp-login.png new file mode 100644 index 000000000..cf8953e20 Binary files /dev/null and b/content/getting-started/mp-login.png differ diff --git a/getting-started/os-is-vendor-supported.gif b/content/getting-started/os-is-vendor-supported.gif similarity index 100% rename from getting-started/os-is-vendor-supported.gif rename to content/getting-started/os-is-vendor-supported.gif diff --git a/getting-started/policy-analyzer.png b/content/getting-started/policy-analyzer.png similarity index 100% rename from getting-started/policy-analyzer.png rename to content/getting-started/policy-analyzer.png diff --git a/getting-started/reporting-and-web-ui.markdown b/content/getting-started/reporting-and-web-ui.markdown similarity index 99% rename from getting-started/reporting-and-web-ui.markdown rename to content/getting-started/reporting-and-web-ui.markdown index 678a6addd..72b5f8b12 100644 --- a/getting-started/reporting-and-web-ui.markdown +++ b/content/getting-started/reporting-and-web-ui.markdown @@ -1,7 +1,6 @@ --- layout: default title: Reporting and web UI -published: true sorting: 30 --- diff --git a/getting-started/workflow.png b/content/getting-started/workflow.png similarity index 100% rename from getting-started/workflow.png rename to content/getting-started/workflow.png diff --git a/getting-started/writing-policy.markdown b/content/getting-started/writing-policy.markdown similarity index 99% rename from getting-started/writing-policy.markdown rename to content/getting-started/writing-policy.markdown index 60dc5fa8f..7c9677c0e 100644 --- a/getting-started/writing-policy.markdown +++ b/content/getting-started/writing-policy.markdown @@ -1,7 +1,6 @@ --- layout: default title: Writing policy -published: true sorting: 40 --- diff --git a/guide/CFEngine-workflow-agents-and-users.png b/content/guide/CFEngine-workflow-agents-and-users.png similarity index 100% rename from guide/CFEngine-workflow-agents-and-users.png rename to content/guide/CFEngine-workflow-agents-and-users.png diff --git a/guide/DCsketchworkflow.png b/content/guide/DCsketchworkflow.png similarity index 100% rename from guide/DCsketchworkflow.png rename to content/guide/DCsketchworkflow.png diff --git a/guide.markdown b/content/guide/_index.markdown similarity index 96% rename from guide.markdown rename to content/guide/_index.markdown index 219729a72..58e729e92 100644 --- a/guide.markdown +++ b/content/guide/_index.markdown @@ -35,7 +35,7 @@ See also: ## Install it -[%CFEngine_include_markdown(include-install-bootstrap-configure-summary.markdown)%] +[%CFEngine_include_markdown(install-bootstrap-configure-summary.include.markdown)%] See [Installation][Installation] for a more detailed guide on how to get CFEngine up and running for various environments. diff --git a/guide/components-overview.graffle b/content/guide/components-overview.graffle similarity index 100% rename from guide/components-overview.graffle rename to content/guide/components-overview.graffle diff --git a/guide/components-overview.png b/content/guide/components-overview.png similarity index 100% rename from guide/components-overview.png rename to content/guide/components-overview.png diff --git a/guide/design-center/Activated-sketch-copy.png b/content/guide/design-center/Activated-sketch-copy.png similarity index 100% rename from guide/design-center/Activated-sketch-copy.png rename to content/guide/design-center/Activated-sketch-copy.png diff --git a/guide/design-center/add-new-tracker-copy.png b/content/guide/design-center/add-new-tracker-copy.png similarity index 100% rename from guide/design-center/add-new-tracker-copy.png rename to content/guide/design-center/add-new-tracker-copy.png diff --git a/guide/learn_CFEngine-process-in-1-2-3_blocks_with_arrows.png b/content/guide/learn_CFEngine-process-in-1-2-3_blocks_with_arrows.png similarity index 100% rename from guide/learn_CFEngine-process-in-1-2-3_blocks_with_arrows.png rename to content/guide/learn_CFEngine-process-in-1-2-3_blocks_with_arrows.png diff --git a/content/guide/policy-decision-flow.png b/content/guide/policy-decision-flow.png new file mode 100644 index 000000000..4655faa54 Binary files /dev/null and b/content/guide/policy-decision-flow.png differ diff --git a/include-install-bootstrap-configure-summary.markdown b/content/install-bootstrap-configure-summary.include.markdown similarity index 100% rename from include-install-bootstrap-configure-summary.markdown rename to content/install-bootstrap-configure-summary.include.markdown diff --git a/overview.markdown b/content/overview/_index.markdown similarity index 99% rename from overview.markdown rename to content/overview/_index.markdown index 182c51e97..13c2f6de6 100644 --- a/overview.markdown +++ b/content/overview/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Overview -published: true sorting: 10 --- diff --git a/resources/additional-topics/adopting-cfengine-mission-plan.png b/content/overview/adopting-cfengine-mission-plan.png similarity index 100% rename from resources/additional-topics/adopting-cfengine-mission-plan.png rename to content/overview/adopting-cfengine-mission-plan.png diff --git a/overview/client-server-communication.markdown b/content/overview/client-server-communication.markdown similarity index 99% rename from overview/client-server-communication.markdown rename to content/overview/client-server-communication.markdown index 9c92d4aa2..2bd1efc15 100644 --- a/overview/client-server-communication.markdown +++ b/content/overview/client-server-communication.markdown @@ -1,7 +1,6 @@ --- layout: default title: Client server communication -published: true sorting: 30 --- diff --git a/content/overview/components-overview.png b/content/overview/components-overview.png new file mode 100644 index 000000000..8a8ff850f Binary files /dev/null and b/content/overview/components-overview.png differ diff --git a/overview/directory-structure.markdown b/content/overview/directory-structure.markdown similarity index 99% rename from overview/directory-structure.markdown rename to content/overview/directory-structure.markdown index 27df85c8b..344b2f8e9 100644 --- a/overview/directory-structure.markdown +++ b/content/overview/directory-structure.markdown @@ -1,7 +1,6 @@ --- layout: default title: CFEngine directory structure -published: true sorting: 20 --- diff --git a/overview/glossary.markdown b/content/overview/glossary.markdown similarity index 99% rename from overview/glossary.markdown rename to content/overview/glossary.markdown index 8422ef0e5..630653ff4 100644 --- a/overview/glossary.markdown +++ b/content/overview/glossary.markdown @@ -2,7 +2,6 @@ layout: default title: Glossary sorting: 50 -published: true --- #### Agent diff --git a/overview/how-cfengine-works.markdown b/content/overview/how-cfengine-works.markdown similarity index 99% rename from overview/how-cfengine-works.markdown rename to content/overview/how-cfengine-works.markdown index 9b1dec31e..f7b731063 100644 --- a/overview/how-cfengine-works.markdown +++ b/content/overview/how-cfengine-works.markdown @@ -1,7 +1,6 @@ --- layout: default title: How CFEngine works -published: true sorting: 2 --- @@ -53,8 +52,8 @@ agent was able to repair the state into compliance * **Promise not Kept**: Actual state was not equal to Desired state and the agent was not able to restore into compliance -{% comment %}Promises you cannot keep are no better than lies! -https://www.youtube.com/watch?v=Zd9-wdGzedU {% endcomment %} + ## Graphical illustration of CFEngine process diff --git a/resources/faq/how-does-cfengine-work-agent-workflow.png b/content/overview/how-does-cfengine-work-agent-workflow.png similarity index 100% rename from resources/faq/how-does-cfengine-work-agent-workflow.png rename to content/overview/how-does-cfengine-work-agent-workflow.png diff --git a/resources/faq/how-does-cfengine-work-process.png b/content/overview/how-does-cfengine-work-process.png similarity index 100% rename from resources/faq/how-does-cfengine-work-process.png rename to content/overview/how-does-cfengine-work-process.png diff --git a/overview/what-is-cfengine-and-why.markdown b/content/overview/what-is-cfengine-and-why.markdown similarity index 99% rename from overview/what-is-cfengine-and-why.markdown rename to content/overview/what-is-cfengine-and-why.markdown index 276e08459..3fe41cd6f 100644 --- a/overview/what-is-cfengine-and-why.markdown +++ b/content/overview/what-is-cfengine-and-why.markdown @@ -1,7 +1,6 @@ --- layout: default title: What is CFEngine and why? -published: true sorting: 1 --- diff --git a/reference.markdown b/content/reference/_index.markdown similarity index 98% rename from reference.markdown rename to content/reference/_index.markdown index 53fddde73..61c746d4b 100644 --- a/reference.markdown +++ b/content/reference/_index.markdown @@ -2,7 +2,6 @@ layout: default title: Reference alias: CFEngine Reference -published: true sorting: 70 --- diff --git a/reference/all-types.markdown b/content/reference/all-types.markdown similarity index 95% rename from reference/all-types.markdown rename to content/reference/all-types.markdown index 5f4fc616f..a3168500e 100644 --- a/reference/all-types.markdown +++ b/content/reference/all-types.markdown @@ -1,7 +1,6 @@ --- layout: default title: All promise and body types -published: true sorting: 110 --- diff --git a/reference/common-attributes-include.markdown b/content/reference/common-attributes.include.markdown similarity index 100% rename from reference/common-attributes-include.markdown rename to content/reference/common-attributes.include.markdown diff --git a/reference/common-body-attributes-include.markdown b/content/reference/common-body-attributes.include.markdown similarity index 100% rename from reference/common-body-attributes-include.markdown rename to content/reference/common-body-attributes.include.markdown diff --git a/reference/components.markdown b/content/reference/components/_index.markdown similarity index 99% rename from reference/components.markdown rename to content/reference/components/_index.markdown index c30dd4780..b64183a6e 100644 --- a/reference/components.markdown +++ b/content/reference/components/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Components -published: true sorting: 10 --- diff --git a/reference/components/cf-agent.markdown b/content/reference/components/cf-agent.markdown similarity index 99% rename from reference/components/cf-agent.markdown rename to content/reference/components/cf-agent.markdown index 49c3d75ed..1b0300b59 100644 --- a/reference/components/cf-agent.markdown +++ b/content/reference/components/cf-agent.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf-agent -published: true sorting: 10 keywords: [agent] --- diff --git a/reference/components/cf-check.markdown b/content/reference/components/cf-check.markdown similarity index 93% rename from reference/components/cf-check.markdown rename to content/reference/components/cf-check.markdown index e65844841..6eadc88b3 100644 --- a/reference/components/cf-check.markdown +++ b/content/reference/components/cf-check.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf-check -published: true sorting: 80 keywords: [cf-hub] --- diff --git a/reference/components/cf-execd.markdown b/content/reference/components/cf-execd.markdown similarity index 99% rename from reference/components/cf-execd.markdown rename to content/reference/components/cf-execd.markdown index bf8287d09..c298dc71e 100644 --- a/reference/components/cf-execd.markdown +++ b/content/reference/components/cf-execd.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf-execd -published: true sorting: 30 keywords: [executor] --- diff --git a/reference/components/cf-hub.markdown b/content/reference/components/cf-hub.markdown similarity index 99% rename from reference/components/cf-hub.markdown rename to content/reference/components/cf-hub.markdown index 001f04d7a..ee4b01db2 100644 --- a/reference/components/cf-hub.markdown +++ b/content/reference/components/cf-hub.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf-hub -published: true sorting: 80 keywords: [hub] --- diff --git a/reference/components/cf-key.markdown b/content/reference/components/cf-key.markdown similarity index 95% rename from reference/components/cf-key.markdown rename to content/reference/components/cf-key.markdown index 50e48a089..930fb33a7 100644 --- a/reference/components/cf-key.markdown +++ b/content/reference/components/cf-key.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf-key -published: true sorting: 60 --- diff --git a/reference/components/cf-monitord.markdown b/content/reference/components/cf-monitord.markdown similarity index 99% rename from reference/components/cf-monitord.markdown rename to content/reference/components/cf-monitord.markdown index f781c0cb9..107de3030 100644 --- a/reference/components/cf-monitord.markdown +++ b/content/reference/components/cf-monitord.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf-monitord -published: true sorting: 50 keywords: [monitor] --- diff --git a/reference/components/cf-net.markdown b/content/reference/components/cf-net.markdown similarity index 99% rename from reference/components/cf-net.markdown rename to content/reference/components/cf-net.markdown index 82178e4be..de6ccd931 100644 --- a/reference/components/cf-net.markdown +++ b/content/reference/components/cf-net.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf-net -published: true sorting: 90 keywords: [protocol, cli] --- diff --git a/reference/components/cf-promises.markdown b/content/reference/components/cf-promises.markdown similarity index 98% rename from reference/components/cf-promises.markdown rename to content/reference/components/cf-promises.markdown index a7a79a078..97e5cb40f 100644 --- a/reference/components/cf-promises.markdown +++ b/content/reference/components/cf-promises.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf-promises -published: true sorting: 40 --- diff --git a/reference/components/cf-reactor.markdown b/content/reference/components/cf-reactor.markdown similarity index 98% rename from reference/components/cf-reactor.markdown rename to content/reference/components/cf-reactor.markdown index e3ef86c4e..9ad9064ca 100644 --- a/reference/components/cf-reactor.markdown +++ b/content/reference/components/cf-reactor.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf-reactor -published: true keywords: [reactor] --- diff --git a/reference/components/cf-runagent.markdown b/content/reference/components/cf-runagent.markdown similarity index 99% rename from reference/components/cf-runagent.markdown rename to content/reference/components/cf-runagent.markdown index 324199fef..6d044b508 100644 --- a/reference/components/cf-runagent.markdown +++ b/content/reference/components/cf-runagent.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf-runagent -published: true sorting: 70 keywords: [runagent] --- diff --git a/reference/components/cf-secret.markdown b/content/reference/components/cf-secret.markdown similarity index 99% rename from reference/components/cf-secret.markdown rename to content/reference/components/cf-secret.markdown index b7c814389..7d893b68e 100644 --- a/reference/components/cf-secret.markdown +++ b/content/reference/components/cf-secret.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf-secret -published: true sorting: 10 keywords: [cf-secret] --- diff --git a/reference/components/cf-serverd.markdown b/content/reference/components/cf-serverd.markdown similarity index 99% rename from reference/components/cf-serverd.markdown rename to content/reference/components/cf-serverd.markdown index 2d2e12ff6..f1b89b391 100644 --- a/reference/components/cf-serverd.markdown +++ b/content/reference/components/cf-serverd.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf-serverd -published: true sorting: 20 keywords: [server] --- diff --git a/reference/components/cf-support.markdown b/content/reference/components/cf-support.markdown similarity index 97% rename from reference/components/cf-support.markdown rename to content/reference/components/cf-support.markdown index 1204df5d0..ccf7882c7 100644 --- a/reference/components/cf-support.markdown +++ b/content/reference/components/cf-support.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf-support -published: true sorting: 10 keywords: [cf-support] --- diff --git a/reference/components/file_control_promises.markdown b/content/reference/components/file_control_promises.markdown similarity index 99% rename from reference/components/file_control_promises.markdown rename to content/reference/components/file_control_promises.markdown index e62066c44..8e8fac196 100644 --- a/reference/components/file_control_promises.markdown +++ b/content/reference/components/file_control_promises.markdown @@ -1,7 +1,6 @@ --- layout: default title: file control -published: true sorting: 100 --- diff --git a/reference/functions/TEMPLATE b/content/reference/functions/TEMPLATE similarity index 100% rename from reference/functions/TEMPLATE rename to content/reference/functions/TEMPLATE diff --git a/reference/functions.markdown b/content/reference/functions/_index.markdown similarity index 99% rename from reference/functions.markdown rename to content/reference/functions/_index.markdown index 8046dca12..cfdd306a1 100644 --- a/reference/functions.markdown +++ b/content/reference/functions/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Functions -published: true sorting: 30 --- @@ -93,12 +92,12 @@ functions multiple times, which can be a performance concern. Some _system_ functions are particularly expensive: -{% comment %} + * `execresult()` and `returnszero()` for shell execution * `regldap()`, `ldapvalue()`, and `ldaplist()` for LDAP queries diff --git a/reference/functions/accessedbefore.markdown b/content/reference/functions/accessedbefore.markdown similarity index 97% rename from reference/functions/accessedbefore.markdown rename to content/reference/functions/accessedbefore.markdown index 31ae665ed..1d44cc956 100644 --- a/reference/functions/accessedbefore.markdown +++ b/content/reference/functions/accessedbefore.markdown @@ -1,7 +1,6 @@ --- layout: default title: accessedbefore -published: true --- [%CFEngine_function_prototype(newer,older)%] diff --git a/reference/functions/accumulated.markdown b/content/reference/functions/accumulated.markdown similarity index 99% rename from reference/functions/accumulated.markdown rename to content/reference/functions/accumulated.markdown index 3df939a2b..417e7a6a9 100644 --- a/reference/functions/accumulated.markdown +++ b/content/reference/functions/accumulated.markdown @@ -1,7 +1,6 @@ --- layout: default title: accumulated -published: true --- [%CFEngine_function_prototype(years, months, days, hours, minutes, seconds)%] diff --git a/reference/functions/ago.markdown b/content/reference/functions/ago.markdown similarity index 98% rename from reference/functions/ago.markdown rename to content/reference/functions/ago.markdown index 080b08630..1e8a1260a 100644 --- a/reference/functions/ago.markdown +++ b/content/reference/functions/ago.markdown @@ -1,7 +1,6 @@ --- layout: default title: ago -published: true --- [%CFEngine_function_prototype(years, months, days, hours, minutes, seconds)%] diff --git a/reference/functions/and.markdown b/content/reference/functions/and.markdown similarity index 97% rename from reference/functions/and.markdown rename to content/reference/functions/and.markdown index affbdcc28..467d26ccc 100644 --- a/reference/functions/and.markdown +++ b/content/reference/functions/and.markdown @@ -1,7 +1,6 @@ --- layout: default title: and -published: true --- [%CFEngine_function_prototype(...)%] diff --git a/reference/functions/basename.markdown b/content/reference/functions/basename.markdown similarity index 96% rename from reference/functions/basename.markdown rename to content/reference/functions/basename.markdown index 6c03fd669..0cc03ed57 100644 --- a/reference/functions/basename.markdown +++ b/content/reference/functions/basename.markdown @@ -1,7 +1,6 @@ --- layout: default title: basename -published: true --- [%CFEngine_function_prototype(filename, optional_extension)%] diff --git a/reference/functions/bundlesmatching.markdown b/content/reference/functions/bundlesmatching.markdown similarity index 98% rename from reference/functions/bundlesmatching.markdown rename to content/reference/functions/bundlesmatching.markdown index 8f351048d..c0b649544 100644 --- a/reference/functions/bundlesmatching.markdown +++ b/content/reference/functions/bundlesmatching.markdown @@ -1,7 +1,6 @@ --- layout: default title: bundlesmatching -published: true --- [%CFEngine_function_prototype(name, tag1, tag2, ...)%] diff --git a/reference/functions/bundlestate.markdown b/content/reference/functions/bundlestate.markdown similarity index 98% rename from reference/functions/bundlestate.markdown rename to content/reference/functions/bundlestate.markdown index bdb2b442c..1653eed40 100644 --- a/reference/functions/bundlestate.markdown +++ b/content/reference/functions/bundlestate.markdown @@ -1,7 +1,6 @@ --- layout: default title: bundlestate -published: true --- [%CFEngine_function_prototype(bundlename)%] diff --git a/reference/functions/callstack_callers.markdown b/content/reference/functions/callstack_callers.markdown similarity index 99% rename from reference/functions/callstack_callers.markdown rename to content/reference/functions/callstack_callers.markdown index f7a4fdecc..aa5bc2624 100644 --- a/reference/functions/callstack_callers.markdown +++ b/content/reference/functions/callstack_callers.markdown @@ -1,7 +1,6 @@ --- layout: default title: callstack_callers -published: true --- [%CFEngine_function_prototype()%] diff --git a/reference/functions/callstack_promisers.markdown b/content/reference/functions/callstack_promisers.markdown similarity index 97% rename from reference/functions/callstack_promisers.markdown rename to content/reference/functions/callstack_promisers.markdown index 0c8d1d71b..c76b85819 100644 --- a/reference/functions/callstack_promisers.markdown +++ b/content/reference/functions/callstack_promisers.markdown @@ -1,7 +1,6 @@ --- layout: default title: callstack_promisers -published: true --- [%CFEngine_function_prototype()%] diff --git a/reference/functions/canonify.markdown b/content/reference/functions/canonify.markdown similarity index 96% rename from reference/functions/canonify.markdown rename to content/reference/functions/canonify.markdown index af19a74a0..8af1098c8 100644 --- a/reference/functions/canonify.markdown +++ b/content/reference/functions/canonify.markdown @@ -1,7 +1,6 @@ --- layout: default title: canonify -published: true --- [%CFEngine_function_prototype(text)%] diff --git a/reference/functions/canonifyuniquely.markdown b/content/reference/functions/canonifyuniquely.markdown similarity index 97% rename from reference/functions/canonifyuniquely.markdown rename to content/reference/functions/canonifyuniquely.markdown index 626de637f..52e5f35c3 100644 --- a/reference/functions/canonifyuniquely.markdown +++ b/content/reference/functions/canonifyuniquely.markdown @@ -1,7 +1,6 @@ --- layout: default title: canonifyuniquely -published: true --- [%CFEngine_function_prototype(text)%] diff --git a/reference/functions/cf_version_after.markdown b/content/reference/functions/cf_version_after.markdown similarity index 97% rename from reference/functions/cf_version_after.markdown rename to content/reference/functions/cf_version_after.markdown index 562efa15c..d8532c4bf 100644 --- a/reference/functions/cf_version_after.markdown +++ b/content/reference/functions/cf_version_after.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf_version_after -published: true --- [%CFEngine_function_prototype(string)%] diff --git a/reference/functions/cf_version_at.markdown b/content/reference/functions/cf_version_at.markdown similarity index 97% rename from reference/functions/cf_version_at.markdown rename to content/reference/functions/cf_version_at.markdown index 07a8bf9bf..2d1647661 100644 --- a/reference/functions/cf_version_at.markdown +++ b/content/reference/functions/cf_version_at.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf_version_at -published: true --- [%CFEngine_function_prototype(string)%] diff --git a/reference/functions/cf_version_before.markdown b/content/reference/functions/cf_version_before.markdown similarity index 97% rename from reference/functions/cf_version_before.markdown rename to content/reference/functions/cf_version_before.markdown index 4886746d0..65e5c0e75 100644 --- a/reference/functions/cf_version_before.markdown +++ b/content/reference/functions/cf_version_before.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf_version_before -published: true --- [%CFEngine_function_prototype(string)%] diff --git a/reference/functions/cf_version_between.markdown b/content/reference/functions/cf_version_between.markdown similarity index 97% rename from reference/functions/cf_version_between.markdown rename to content/reference/functions/cf_version_between.markdown index 8b9b88b35..d052bb2f9 100644 --- a/reference/functions/cf_version_between.markdown +++ b/content/reference/functions/cf_version_between.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf_version_between -published: true --- [%CFEngine_function_prototype(string, string)%] diff --git a/reference/functions/cf_version_maximum.markdown b/content/reference/functions/cf_version_maximum.markdown similarity index 97% rename from reference/functions/cf_version_maximum.markdown rename to content/reference/functions/cf_version_maximum.markdown index 62f3b0677..bcf646f66 100644 --- a/reference/functions/cf_version_maximum.markdown +++ b/content/reference/functions/cf_version_maximum.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf_version_maximum -published: true --- [%CFEngine_function_prototype(string)%] diff --git a/reference/functions/cf_version_minimum.markdown b/content/reference/functions/cf_version_minimum.markdown similarity index 97% rename from reference/functions/cf_version_minimum.markdown rename to content/reference/functions/cf_version_minimum.markdown index 8d7d27ac9..243c93dc0 100644 --- a/reference/functions/cf_version_minimum.markdown +++ b/content/reference/functions/cf_version_minimum.markdown @@ -1,7 +1,6 @@ --- layout: default title: cf_version_minimum -published: true --- [%CFEngine_function_prototype(string)%] diff --git a/reference/functions/changedbefore.markdown b/content/reference/functions/changedbefore.markdown similarity index 97% rename from reference/functions/changedbefore.markdown rename to content/reference/functions/changedbefore.markdown index ccc7787e0..8215be263 100644 --- a/reference/functions/changedbefore.markdown +++ b/content/reference/functions/changedbefore.markdown @@ -1,7 +1,6 @@ --- layout: default title: changedbefore -published: true --- [%CFEngine_function_prototype(newer,older)%] diff --git a/reference/functions/classesmatching.markdown b/content/reference/functions/classesmatching.markdown similarity index 98% rename from reference/functions/classesmatching.markdown rename to content/reference/functions/classesmatching.markdown index acc24582e..c81b33fc7 100644 --- a/reference/functions/classesmatching.markdown +++ b/content/reference/functions/classesmatching.markdown @@ -1,7 +1,6 @@ --- layout: default title: classesmatching -published: true --- [%CFEngine_function_prototype(name, tag1, tag2, ...)%] diff --git a/reference/functions/classfiltercsv.markdown b/content/reference/functions/classfiltercsv.markdown similarity index 99% rename from reference/functions/classfiltercsv.markdown rename to content/reference/functions/classfiltercsv.markdown index c3f779f7f..08d713319 100644 --- a/reference/functions/classfiltercsv.markdown +++ b/content/reference/functions/classfiltercsv.markdown @@ -1,7 +1,6 @@ --- layout: default title: classfiltercsv -published: true --- [%CFEngine_function_prototype(filename, has_header, class_column, optional_sort_column)%] diff --git a/reference/functions/classify.markdown b/content/reference/functions/classify.markdown similarity index 96% rename from reference/functions/classify.markdown rename to content/reference/functions/classify.markdown index cf0e5a181..03b496ff2 100644 --- a/reference/functions/classify.markdown +++ b/content/reference/functions/classify.markdown @@ -1,7 +1,6 @@ --- layout: default title: classify -published: true --- [%CFEngine_function_prototype(text)%] diff --git a/reference/functions/classmatch.markdown b/content/reference/functions/classmatch.markdown similarity index 98% rename from reference/functions/classmatch.markdown rename to content/reference/functions/classmatch.markdown index c1b65d6f0..610306ed9 100644 --- a/reference/functions/classmatch.markdown +++ b/content/reference/functions/classmatch.markdown @@ -1,7 +1,6 @@ --- layout: default title: classmatch -published: true --- [%CFEngine_function_prototype(regex, tag1, tag2, ...)%] diff --git a/reference/functions/concat.markdown b/content/reference/functions/concat.markdown similarity index 95% rename from reference/functions/concat.markdown rename to content/reference/functions/concat.markdown index 00f750987..1d85fefa7 100644 --- a/reference/functions/concat.markdown +++ b/content/reference/functions/concat.markdown @@ -1,7 +1,6 @@ --- layout: default title: concat -published: true --- [%CFEngine_function_prototype(...)%] diff --git a/reference/functions/countclassesmatching.markdown b/content/reference/functions/countclassesmatching.markdown similarity index 98% rename from reference/functions/countclassesmatching.markdown rename to content/reference/functions/countclassesmatching.markdown index beb543f01..95160a48c 100644 --- a/reference/functions/countclassesmatching.markdown +++ b/content/reference/functions/countclassesmatching.markdown @@ -1,7 +1,6 @@ --- layout: default title: countclassesmatching -published: true --- [%CFEngine_function_prototype(regex, tag1, tag2, ...)%] diff --git a/reference/functions/countlinesmatching.markdown b/content/reference/functions/countlinesmatching.markdown similarity index 97% rename from reference/functions/countlinesmatching.markdown rename to content/reference/functions/countlinesmatching.markdown index e76fa7d63..e8e8bac3b 100644 --- a/reference/functions/countlinesmatching.markdown +++ b/content/reference/functions/countlinesmatching.markdown @@ -1,7 +1,6 @@ --- layout: default title: countlinesmatching -published: true --- [%CFEngine_function_prototype(regex, filename)%] diff --git a/reference/functions/data_expand.markdown b/content/reference/functions/data_expand.markdown similarity index 98% rename from reference/functions/data_expand.markdown rename to content/reference/functions/data_expand.markdown index ecda92762..eea0852d4 100644 --- a/reference/functions/data_expand.markdown +++ b/content/reference/functions/data_expand.markdown @@ -1,7 +1,6 @@ --- layout: default title: data_expand -published: true --- [%CFEngine_function_prototype(data_container)%] diff --git a/reference/functions/data_readstringarray.markdown b/content/reference/functions/data_readstringarray.markdown similarity index 98% rename from reference/functions/data_readstringarray.markdown rename to content/reference/functions/data_readstringarray.markdown index 9b4e6ab5d..058f3682f 100644 --- a/reference/functions/data_readstringarray.markdown +++ b/content/reference/functions/data_readstringarray.markdown @@ -1,7 +1,6 @@ --- layout: default title: data_readstringarray -published: true --- [%CFEngine_function_prototype(filename, comment, split, maxentries, maxbytes)%] diff --git a/reference/functions/data_readstringarrayidx.markdown b/content/reference/functions/data_readstringarrayidx.markdown similarity index 98% rename from reference/functions/data_readstringarrayidx.markdown rename to content/reference/functions/data_readstringarrayidx.markdown index 0bf11579c..fa0506a84 100644 --- a/reference/functions/data_readstringarrayidx.markdown +++ b/content/reference/functions/data_readstringarrayidx.markdown @@ -1,7 +1,6 @@ --- layout: default title: data_readstringarrayidx -published: true --- [%CFEngine_function_prototype(filename, comment, split, maxentries, maxbytes)%] diff --git a/reference/functions/data_regextract.markdown b/content/reference/functions/data_regextract.markdown similarity index 99% rename from reference/functions/data_regextract.markdown rename to content/reference/functions/data_regextract.markdown index d5b518f4f..3d0c58880 100644 --- a/reference/functions/data_regextract.markdown +++ b/content/reference/functions/data_regextract.markdown @@ -1,7 +1,6 @@ --- layout: default title: data_regextract -published: true --- [%CFEngine_function_prototype(regex, string)%] diff --git a/reference/functions/data_sysctlvalues.markdown b/content/reference/functions/data_sysctlvalues.markdown similarity index 96% rename from reference/functions/data_sysctlvalues.markdown rename to content/reference/functions/data_sysctlvalues.markdown index 736fa28f8..a834a0c21 100644 --- a/reference/functions/data_sysctlvalues.markdown +++ b/content/reference/functions/data_sysctlvalues.markdown @@ -1,7 +1,6 @@ --- layout: default title: data_sysctlvalues -published: true --- [%CFEngine_function_prototype()%] diff --git a/reference/functions/datastate.markdown b/content/reference/functions/datastate.markdown similarity index 99% rename from reference/functions/datastate.markdown rename to content/reference/functions/datastate.markdown index 38dde8711..29925ed80 100644 --- a/reference/functions/datastate.markdown +++ b/content/reference/functions/datastate.markdown @@ -1,7 +1,6 @@ --- layout: default title: datastate -published: true --- [%CFEngine_function_prototype()%] diff --git a/reference/functions/difference.markdown b/content/reference/functions/difference.markdown similarity index 97% rename from reference/functions/difference.markdown rename to content/reference/functions/difference.markdown index 6af4ab44d..a411fc663 100644 --- a/reference/functions/difference.markdown +++ b/content/reference/functions/difference.markdown @@ -1,7 +1,6 @@ --- layout: default title: difference -published: true --- [%CFEngine_function_prototype(list1, list2)%] diff --git a/reference/functions/dirname.markdown b/content/reference/functions/dirname.markdown similarity index 97% rename from reference/functions/dirname.markdown rename to content/reference/functions/dirname.markdown index 928263722..1566bdcff 100644 --- a/reference/functions/dirname.markdown +++ b/content/reference/functions/dirname.markdown @@ -1,7 +1,6 @@ --- layout: default title: dirname -published: true --- [%CFEngine_function_prototype(path)%] diff --git a/reference/functions/diskfree.markdown b/content/reference/functions/diskfree.markdown similarity index 96% rename from reference/functions/diskfree.markdown rename to content/reference/functions/diskfree.markdown index c14effa2d..4f262c6ee 100644 --- a/reference/functions/diskfree.markdown +++ b/content/reference/functions/diskfree.markdown @@ -1,7 +1,6 @@ --- layout: default title: diskfree -published: true --- [%CFEngine_function_prototype(path)%] diff --git a/reference/functions/escape.markdown b/content/reference/functions/escape.markdown similarity index 98% rename from reference/functions/escape.markdown rename to content/reference/functions/escape.markdown index e96e21cc8..934e196dc 100644 --- a/reference/functions/escape.markdown +++ b/content/reference/functions/escape.markdown @@ -1,7 +1,6 @@ --- layout: default title: escape -published: true --- [%CFEngine_function_prototype(text)%] diff --git a/reference/functions/eval.markdown b/content/reference/functions/eval.markdown similarity index 99% rename from reference/functions/eval.markdown rename to content/reference/functions/eval.markdown index 63f94fdb3..c0ef77886 100644 --- a/reference/functions/eval.markdown +++ b/content/reference/functions/eval.markdown @@ -1,7 +1,6 @@ --- layout: default title: eval -published: true --- [%CFEngine_function_prototype(expression, mode, options)%] diff --git a/reference/functions/every.markdown b/content/reference/functions/every.markdown similarity index 98% rename from reference/functions/every.markdown rename to content/reference/functions/every.markdown index 319866411..07f490141 100644 --- a/reference/functions/every.markdown +++ b/content/reference/functions/every.markdown @@ -1,7 +1,6 @@ --- layout: default title: every -published: true --- [%CFEngine_function_prototype(regex, list)%] diff --git a/reference/functions/execresult.markdown b/content/reference/functions/execresult.markdown similarity index 99% rename from reference/functions/execresult.markdown rename to content/reference/functions/execresult.markdown index 377bc85ee..8dc13d35c 100644 --- a/reference/functions/execresult.markdown +++ b/content/reference/functions/execresult.markdown @@ -1,7 +1,6 @@ --- layout: default title: execresult -published: true --- [%CFEngine_function_prototype(command, shell, output)%] diff --git a/reference/functions/execresult_as_data.markdown b/content/reference/functions/execresult_as_data.markdown similarity index 98% rename from reference/functions/execresult_as_data.markdown rename to content/reference/functions/execresult_as_data.markdown index 11cb09052..1e80da971 100644 --- a/reference/functions/execresult_as_data.markdown +++ b/content/reference/functions/execresult_as_data.markdown @@ -1,7 +1,6 @@ --- layout: default title: execresult_as_data -published: true --- [%CFEngine_function_prototype(command, shell, output)%] diff --git a/reference/functions/expandrange.markdown b/content/reference/functions/expandrange.markdown similarity index 98% rename from reference/functions/expandrange.markdown rename to content/reference/functions/expandrange.markdown index 3924eba67..dd9cf7347 100644 --- a/reference/functions/expandrange.markdown +++ b/content/reference/functions/expandrange.markdown @@ -1,7 +1,6 @@ --- layout: default title: expandrange -published: true --- [%CFEngine_function_prototype(string_template, stepsize)%] diff --git a/reference/functions/file_hash.markdown b/content/reference/functions/file_hash.markdown similarity index 98% rename from reference/functions/file_hash.markdown rename to content/reference/functions/file_hash.markdown index 6c2aea30b..dd5308611 100644 --- a/reference/functions/file_hash.markdown +++ b/content/reference/functions/file_hash.markdown @@ -1,7 +1,6 @@ --- layout: default title: file_hash -published: true --- [%CFEngine_function_prototype(file, algorithm)%] diff --git a/reference/functions/fileexists.markdown b/content/reference/functions/fileexists.markdown similarity index 98% rename from reference/functions/fileexists.markdown rename to content/reference/functions/fileexists.markdown index 02bd2881b..7e209e7ad 100644 --- a/reference/functions/fileexists.markdown +++ b/content/reference/functions/fileexists.markdown @@ -1,7 +1,6 @@ --- layout: default title: fileexists -published: true --- [%CFEngine_function_prototype(filename)%] diff --git a/reference/functions/filesexist.markdown b/content/reference/functions/filesexist.markdown similarity index 98% rename from reference/functions/filesexist.markdown rename to content/reference/functions/filesexist.markdown index 7e50f88e6..af4f2c0df 100644 --- a/reference/functions/filesexist.markdown +++ b/content/reference/functions/filesexist.markdown @@ -1,7 +1,6 @@ --- layout: default title: filesexist -published: true --- [%CFEngine_function_prototype(list)%] diff --git a/reference/functions/filesize.markdown b/content/reference/functions/filesize.markdown similarity index 97% rename from reference/functions/filesize.markdown rename to content/reference/functions/filesize.markdown index 12a3b99d6..665b6435a 100644 --- a/reference/functions/filesize.markdown +++ b/content/reference/functions/filesize.markdown @@ -1,7 +1,6 @@ --- layout: default title: filesize -published: true --- [%CFEngine_function_prototype(filename)%] diff --git a/reference/functions/filestat.markdown b/content/reference/functions/filestat.markdown similarity index 99% rename from reference/functions/filestat.markdown rename to content/reference/functions/filestat.markdown index 984bf33ce..f0cde4cb2 100644 --- a/reference/functions/filestat.markdown +++ b/content/reference/functions/filestat.markdown @@ -1,7 +1,6 @@ --- layout: default title: filestat -published: true --- [%CFEngine_function_prototype(filename, field)%] diff --git a/reference/functions/filter.markdown b/content/reference/functions/filter.markdown similarity index 98% rename from reference/functions/filter.markdown rename to content/reference/functions/filter.markdown index b9ce3719b..21595c051 100644 --- a/reference/functions/filter.markdown +++ b/content/reference/functions/filter.markdown @@ -1,7 +1,6 @@ --- layout: default title: filter -published: true --- [%CFEngine_function_prototype(filter, list, is_regex, invert, max_return)%] diff --git a/reference/functions/findfiles.markdown b/content/reference/functions/findfiles.markdown similarity index 98% rename from reference/functions/findfiles.markdown rename to content/reference/functions/findfiles.markdown index 60dd2512d..42936fba2 100644 --- a/reference/functions/findfiles.markdown +++ b/content/reference/functions/findfiles.markdown @@ -1,7 +1,6 @@ --- layout: default title: findfiles -published: true --- [%CFEngine_function_prototype(glob1, glob2, ...)%] diff --git a/reference/functions/findfiles_up.markdown b/content/reference/functions/findfiles_up.markdown similarity index 99% rename from reference/functions/findfiles_up.markdown rename to content/reference/functions/findfiles_up.markdown index 7d54ce632..0a2b604b8 100644 --- a/reference/functions/findfiles_up.markdown +++ b/content/reference/functions/findfiles_up.markdown @@ -1,7 +1,6 @@ --- layout: default title: findfiles_up -published: true --- [%CFEngine_function_prototype(path, glob, level)%] diff --git a/reference/functions/findlocalusers.markdown b/content/reference/functions/findlocalusers.markdown similarity index 98% rename from reference/functions/findlocalusers.markdown rename to content/reference/functions/findlocalusers.markdown index a0a55a1fc..0708fcd64 100644 --- a/reference/functions/findlocalusers.markdown +++ b/content/reference/functions/findlocalusers.markdown @@ -1,7 +1,6 @@ --- layout: default title: findlocalusers -published: true --- [%CFEngine_function_prototype(filter)%] diff --git a/reference/functions/findprocesses.markdown b/content/reference/functions/findprocesses.markdown similarity index 98% rename from reference/functions/findprocesses.markdown rename to content/reference/functions/findprocesses.markdown index 634e26b78..b641a7efc 100644 --- a/reference/functions/findprocesses.markdown +++ b/content/reference/functions/findprocesses.markdown @@ -1,7 +1,6 @@ --- layout: default title: findprocesses -published: true --- [%CFEngine_function_prototype(regex)%] diff --git a/reference/functions/format.markdown b/content/reference/functions/format.markdown similarity index 98% rename from reference/functions/format.markdown rename to content/reference/functions/format.markdown index 63f032550..8310b1f69 100644 --- a/reference/functions/format.markdown +++ b/content/reference/functions/format.markdown @@ -1,7 +1,6 @@ --- layout: default title: format -published: true --- [%CFEngine_function_prototype(string, ...)%] diff --git a/reference/functions/getbundlemetatags.markdown b/content/reference/functions/getbundlemetatags.markdown similarity index 98% rename from reference/functions/getbundlemetatags.markdown rename to content/reference/functions/getbundlemetatags.markdown index d509d1658..e79efa770 100644 --- a/reference/functions/getbundlemetatags.markdown +++ b/content/reference/functions/getbundlemetatags.markdown @@ -1,7 +1,6 @@ --- layout: default title: getbundlemetatags -published: true --- [%CFEngine_function_prototype(bundlename, optional_tag)%] diff --git a/reference/functions/getclassmetatags.markdown b/content/reference/functions/getclassmetatags.markdown similarity index 98% rename from reference/functions/getclassmetatags.markdown rename to content/reference/functions/getclassmetatags.markdown index fc54d3277..76fc50b14 100644 --- a/reference/functions/getclassmetatags.markdown +++ b/content/reference/functions/getclassmetatags.markdown @@ -1,7 +1,6 @@ --- layout: default title: getclassmetatags -published: true --- [%CFEngine_function_prototype(classname, optional_tag)%] diff --git a/reference/functions/getenv.markdown b/content/reference/functions/getenv.markdown similarity index 97% rename from reference/functions/getenv.markdown rename to content/reference/functions/getenv.markdown index ada04da5b..79686bb21 100644 --- a/reference/functions/getenv.markdown +++ b/content/reference/functions/getenv.markdown @@ -1,7 +1,6 @@ --- layout: default title: getenv -published: true --- [%CFEngine_function_prototype(variable, maxlength)%] diff --git a/reference/functions/getfields.markdown b/content/reference/functions/getfields.markdown similarity index 99% rename from reference/functions/getfields.markdown rename to content/reference/functions/getfields.markdown index b280219f6..f11902c1d 100644 --- a/reference/functions/getfields.markdown +++ b/content/reference/functions/getfields.markdown @@ -1,7 +1,6 @@ --- layout: default title: getfields -published: true --- [%CFEngine_function_prototype(regex, filename, split, array_lval)%] diff --git a/reference/functions/getgid.markdown b/content/reference/functions/getgid.markdown similarity index 97% rename from reference/functions/getgid.markdown rename to content/reference/functions/getgid.markdown index dc67a88e6..95e5fcfc8 100644 --- a/reference/functions/getgid.markdown +++ b/content/reference/functions/getgid.markdown @@ -1,7 +1,6 @@ --- layout: default title: getgid -published: true --- [%CFEngine_function_prototype(groupname)%] diff --git a/reference/functions/getindices.markdown b/content/reference/functions/getindices.markdown similarity index 98% rename from reference/functions/getindices.markdown rename to content/reference/functions/getindices.markdown index c42166c93..ecd92fbbc 100644 --- a/reference/functions/getindices.markdown +++ b/content/reference/functions/getindices.markdown @@ -1,7 +1,6 @@ --- layout: default title: getindices -published: true --- [%CFEngine_function_prototype(varref)%] diff --git a/reference/functions/getuid.markdown b/content/reference/functions/getuid.markdown similarity index 97% rename from reference/functions/getuid.markdown rename to content/reference/functions/getuid.markdown index e3197d102..2dcb482a8 100644 --- a/reference/functions/getuid.markdown +++ b/content/reference/functions/getuid.markdown @@ -1,7 +1,6 @@ --- layout: default title: getuid -published: true --- [%CFEngine_function_prototype(username)%] diff --git a/reference/functions/getuserinfo.markdown b/content/reference/functions/getuserinfo.markdown similarity index 99% rename from reference/functions/getuserinfo.markdown rename to content/reference/functions/getuserinfo.markdown index c362868cc..91dfeb750 100644 --- a/reference/functions/getuserinfo.markdown +++ b/content/reference/functions/getuserinfo.markdown @@ -1,7 +1,6 @@ --- layout: default title: getuserinfo -published: true --- [%CFEngine_function_prototype(optional_uidorname)%] diff --git a/reference/functions/getusers.markdown b/content/reference/functions/getusers.markdown similarity index 98% rename from reference/functions/getusers.markdown rename to content/reference/functions/getusers.markdown index efe4a631c..c794d7c24 100644 --- a/reference/functions/getusers.markdown +++ b/content/reference/functions/getusers.markdown @@ -1,7 +1,6 @@ --- layout: default title: getusers -published: true --- [%CFEngine_function_prototype(exclude_names, exclude_ids)%] diff --git a/reference/functions/getvalues.markdown b/content/reference/functions/getvalues.markdown similarity index 98% rename from reference/functions/getvalues.markdown rename to content/reference/functions/getvalues.markdown index c915fa1cc..a3a1dcf5e 100644 --- a/reference/functions/getvalues.markdown +++ b/content/reference/functions/getvalues.markdown @@ -1,7 +1,6 @@ --- layout: default title: getvalues -published: true --- [%CFEngine_function_prototype(varref)%] diff --git a/reference/functions/getvariablemetatags.markdown b/content/reference/functions/getvariablemetatags.markdown similarity index 98% rename from reference/functions/getvariablemetatags.markdown rename to content/reference/functions/getvariablemetatags.markdown index eea8a8bf4..f9f15f1b4 100644 --- a/reference/functions/getvariablemetatags.markdown +++ b/content/reference/functions/getvariablemetatags.markdown @@ -1,7 +1,6 @@ --- layout: default title: getvariablemetatags -published: true --- [%CFEngine_function_prototype(varname, optional_tag)%] diff --git a/reference/functions/grep.markdown b/content/reference/functions/grep.markdown similarity index 97% rename from reference/functions/grep.markdown rename to content/reference/functions/grep.markdown index c9fa68dda..868885cdf 100644 --- a/reference/functions/grep.markdown +++ b/content/reference/functions/grep.markdown @@ -1,7 +1,6 @@ --- layout: default title: grep -published: true --- [%CFEngine_function_prototype(regex, list)%] diff --git a/reference/functions/groupexists.markdown b/content/reference/functions/groupexists.markdown similarity index 96% rename from reference/functions/groupexists.markdown rename to content/reference/functions/groupexists.markdown index be90dd9bd..5274b81b3 100644 --- a/reference/functions/groupexists.markdown +++ b/content/reference/functions/groupexists.markdown @@ -1,7 +1,6 @@ --- layout: default title: groupexists -published: true --- [%CFEngine_function_prototype(group)%] diff --git a/reference/functions/hash.markdown b/content/reference/functions/hash.markdown similarity index 97% rename from reference/functions/hash.markdown rename to content/reference/functions/hash.markdown index 03726d336..f7574a029 100644 --- a/reference/functions/hash.markdown +++ b/content/reference/functions/hash.markdown @@ -1,7 +1,6 @@ --- layout: default title: hash -published: true --- [%CFEngine_function_prototype(input, algorithm)%] diff --git a/reference/functions/hash_to_int.markdown b/content/reference/functions/hash_to_int.markdown similarity index 98% rename from reference/functions/hash_to_int.markdown rename to content/reference/functions/hash_to_int.markdown index 38df46de8..469305063 100644 --- a/reference/functions/hash_to_int.markdown +++ b/content/reference/functions/hash_to_int.markdown @@ -1,7 +1,6 @@ --- layout: default title: hash_to_int -published: true --- [%CFEngine_function_prototype( lower, upper, string )%] diff --git a/reference/functions/hashmatch.markdown b/content/reference/functions/hashmatch.markdown similarity index 97% rename from reference/functions/hashmatch.markdown rename to content/reference/functions/hashmatch.markdown index 0c0a47ed7..48651499c 100644 --- a/reference/functions/hashmatch.markdown +++ b/content/reference/functions/hashmatch.markdown @@ -1,7 +1,6 @@ --- layout: default title: hashmatch -published: true --- [%CFEngine_function_prototype(filename, algorithm, hash)%] diff --git a/reference/functions/host2ip.markdown b/content/reference/functions/host2ip.markdown similarity index 98% rename from reference/functions/host2ip.markdown rename to content/reference/functions/host2ip.markdown index a4a6a2c1b..7983818ea 100644 --- a/reference/functions/host2ip.markdown +++ b/content/reference/functions/host2ip.markdown @@ -1,7 +1,6 @@ --- layout: default title: host2ip -published: true --- [%CFEngine_function_prototype(hostname)%] diff --git a/reference/functions/hostinnetgroup.markdown b/content/reference/functions/hostinnetgroup.markdown similarity index 94% rename from reference/functions/hostinnetgroup.markdown rename to content/reference/functions/hostinnetgroup.markdown index 7dbc11430..f3d026e73 100644 --- a/reference/functions/hostinnetgroup.markdown +++ b/content/reference/functions/hostinnetgroup.markdown @@ -1,7 +1,6 @@ --- layout: default title: hostinnetgroup -published: true --- [%CFEngine_function_prototype(netgroup)%] diff --git a/reference/functions/hostrange.markdown b/content/reference/functions/hostrange.markdown similarity index 98% rename from reference/functions/hostrange.markdown rename to content/reference/functions/hostrange.markdown index 0a3ddc36f..0b8b3f877 100644 --- a/reference/functions/hostrange.markdown +++ b/content/reference/functions/hostrange.markdown @@ -1,7 +1,6 @@ --- layout: default title: hostrange -published: true --- [%CFEngine_function_prototype(prefix, range)%] diff --git a/reference/functions/hostsseen.markdown b/content/reference/functions/hostsseen.markdown similarity index 98% rename from reference/functions/hostsseen.markdown rename to content/reference/functions/hostsseen.markdown index ce7975b30..308722cf9 100644 --- a/reference/functions/hostsseen.markdown +++ b/content/reference/functions/hostsseen.markdown @@ -1,7 +1,6 @@ --- layout: default title: hostsseen -published: true --- [%CFEngine_function_prototype(horizon, seen, field)%] diff --git a/reference/functions/hostswithclass.markdown b/content/reference/functions/hostswithclass.markdown similarity index 98% rename from reference/functions/hostswithclass.markdown rename to content/reference/functions/hostswithclass.markdown index aa6dfb315..4059c9d1b 100644 --- a/reference/functions/hostswithclass.markdown +++ b/content/reference/functions/hostswithclass.markdown @@ -1,7 +1,6 @@ --- layout: default title: hostswithclass -published: true --- **This function is only available in CFEngine Enterprise.** diff --git a/reference/functions/hostswithgroup.markdown b/content/reference/functions/hostswithgroup.markdown similarity index 98% rename from reference/functions/hostswithgroup.markdown rename to content/reference/functions/hostswithgroup.markdown index dbf9024f4..d8c5539ac 100644 --- a/reference/functions/hostswithgroup.markdown +++ b/content/reference/functions/hostswithgroup.markdown @@ -1,7 +1,6 @@ --- layout: default title: hostswithgroup -published: true --- **This function is only available in CFEngine Enterprise.** diff --git a/reference/functions/hubknowledge.markdown b/content/reference/functions/hubknowledge.markdown similarity index 98% rename from reference/functions/hubknowledge.markdown rename to content/reference/functions/hubknowledge.markdown index c0ed841f4..1d3858207 100644 --- a/reference/functions/hubknowledge.markdown +++ b/content/reference/functions/hubknowledge.markdown @@ -1,7 +1,6 @@ --- layout: default title: hubknowledge -published: true --- **This function is only available in CFEngine Enterprise.** diff --git a/reference/functions/ifelse.markdown b/content/reference/functions/ifelse.markdown similarity index 99% rename from reference/functions/ifelse.markdown rename to content/reference/functions/ifelse.markdown index 59885cced..dbd2fbba1 100644 --- a/reference/functions/ifelse.markdown +++ b/content/reference/functions/ifelse.markdown @@ -1,7 +1,6 @@ --- layout: default title: ifelse -published: true --- [%CFEngine_function_prototype(...)%] diff --git a/reference/functions/int.markdown b/content/reference/functions/int.markdown similarity index 95% rename from reference/functions/int.markdown rename to content/reference/functions/int.markdown index ed6425439..e2e86ee2a 100644 --- a/reference/functions/int.markdown +++ b/content/reference/functions/int.markdown @@ -1,7 +1,6 @@ --- layout: default title: int -published: true --- [%CFEngine_function_prototype(string)%] diff --git a/reference/functions/intersection.markdown b/content/reference/functions/intersection.markdown similarity index 97% rename from reference/functions/intersection.markdown rename to content/reference/functions/intersection.markdown index 6eb53db4d..2dc38bef7 100644 --- a/reference/functions/intersection.markdown +++ b/content/reference/functions/intersection.markdown @@ -1,7 +1,6 @@ --- layout: default title: intersection -published: true --- [%CFEngine_function_prototype(list1, list2)%] diff --git a/reference/functions/ip2host.markdown b/content/reference/functions/ip2host.markdown similarity index 98% rename from reference/functions/ip2host.markdown rename to content/reference/functions/ip2host.markdown index a0c28246d..410a5eca6 100644 --- a/reference/functions/ip2host.markdown +++ b/content/reference/functions/ip2host.markdown @@ -1,7 +1,6 @@ --- layout: default title: ip2host -published: true --- [%CFEngine_function_prototype(ip)%] diff --git a/reference/functions/iprange.markdown b/content/reference/functions/iprange.markdown similarity index 98% rename from reference/functions/iprange.markdown rename to content/reference/functions/iprange.markdown index 47b895fe9..82c78f1e3 100644 --- a/reference/functions/iprange.markdown +++ b/content/reference/functions/iprange.markdown @@ -1,7 +1,6 @@ --- layout: default title: iprange -published: true --- [%CFEngine_function_prototype(range, optional_interface)%] diff --git a/reference/functions/irange.markdown b/content/reference/functions/irange.markdown similarity index 99% rename from reference/functions/irange.markdown rename to content/reference/functions/irange.markdown index 6fb7f3291..311c0a65e 100644 --- a/reference/functions/irange.markdown +++ b/content/reference/functions/irange.markdown @@ -1,7 +1,6 @@ --- layout: default title: irange -published: true --- [%CFEngine_function_prototype(arg1, arg2)%] diff --git a/reference/functions/is_type.markdown b/content/reference/functions/is_type.markdown similarity index 98% rename from reference/functions/is_type.markdown rename to content/reference/functions/is_type.markdown index e382010b0..5ed3785d2 100644 --- a/reference/functions/is_type.markdown +++ b/content/reference/functions/is_type.markdown @@ -1,7 +1,6 @@ --- layout: default title: is_type -published: true --- [%CFEngine_function_prototype(var, type)%] diff --git a/reference/functions/isconnectable.markdown b/content/reference/functions/isconnectable.markdown similarity index 96% rename from reference/functions/isconnectable.markdown rename to content/reference/functions/isconnectable.markdown index fe993a7d9..7daa1d002 100644 --- a/reference/functions/isconnectable.markdown +++ b/content/reference/functions/isconnectable.markdown @@ -1,7 +1,6 @@ --- layout: default title: isconnectable -published: true --- [%CFEngine_function_prototype(hostname, port, timeout)%] diff --git a/reference/functions/isdir.markdown b/content/reference/functions/isdir.markdown similarity index 97% rename from reference/functions/isdir.markdown rename to content/reference/functions/isdir.markdown index 788927809..0a7f59baa 100644 --- a/reference/functions/isdir.markdown +++ b/content/reference/functions/isdir.markdown @@ -1,7 +1,6 @@ --- layout: default title: isdir -published: true --- [%CFEngine_function_prototype(filename)%] diff --git a/reference/functions/isexecutable.markdown b/content/reference/functions/isexecutable.markdown similarity index 96% rename from reference/functions/isexecutable.markdown rename to content/reference/functions/isexecutable.markdown index 8a26b53e6..e33bc57d2 100644 --- a/reference/functions/isexecutable.markdown +++ b/content/reference/functions/isexecutable.markdown @@ -1,7 +1,6 @@ --- layout: default title: isexecutable -published: true --- [%CFEngine_function_prototype(filename)%] diff --git a/reference/functions/isgreaterthan.markdown b/content/reference/functions/isgreaterthan.markdown similarity index 97% rename from reference/functions/isgreaterthan.markdown rename to content/reference/functions/isgreaterthan.markdown index eaac3845e..1048b2e8d 100644 --- a/reference/functions/isgreaterthan.markdown +++ b/content/reference/functions/isgreaterthan.markdown @@ -1,7 +1,6 @@ --- layout: default title: isgreaterthan -published: true --- [%CFEngine_function_prototype(value1, value2)%] diff --git a/reference/functions/isipinsubnet.markdown b/content/reference/functions/isipinsubnet.markdown similarity index 97% rename from reference/functions/isipinsubnet.markdown rename to content/reference/functions/isipinsubnet.markdown index 58995f456..b28e3284e 100644 --- a/reference/functions/isipinsubnet.markdown +++ b/content/reference/functions/isipinsubnet.markdown @@ -1,7 +1,6 @@ --- layout: default title: isipinsubnet -published: true --- [%CFEngine_function_prototype(range, ip_address1, ip_address2, ...)%] diff --git a/reference/functions/islessthan.markdown b/content/reference/functions/islessthan.markdown similarity index 97% rename from reference/functions/islessthan.markdown rename to content/reference/functions/islessthan.markdown index c7e074c1f..1516653cd 100644 --- a/reference/functions/islessthan.markdown +++ b/content/reference/functions/islessthan.markdown @@ -1,7 +1,6 @@ --- layout: default title: islessthan -published: true --- [%CFEngine_function_prototype(value1, value2)%] diff --git a/reference/functions/islink.markdown b/content/reference/functions/islink.markdown similarity index 98% rename from reference/functions/islink.markdown rename to content/reference/functions/islink.markdown index 7bdbdf8a7..1816392bc 100644 --- a/reference/functions/islink.markdown +++ b/content/reference/functions/islink.markdown @@ -1,7 +1,6 @@ --- layout: default title: islink -published: true --- [%CFEngine_function_prototype(filename)%] diff --git a/reference/functions/isnewerthan.markdown b/content/reference/functions/isnewerthan.markdown similarity index 98% rename from reference/functions/isnewerthan.markdown rename to content/reference/functions/isnewerthan.markdown index 198d6c3ce..aa6e8c572 100644 --- a/reference/functions/isnewerthan.markdown +++ b/content/reference/functions/isnewerthan.markdown @@ -1,7 +1,6 @@ --- layout: default title: isnewerthan -published: true --- [%CFEngine_function_prototype(newer, older)%] diff --git a/reference/functions/isnewerthantime.markdown b/content/reference/functions/isnewerthantime.markdown similarity index 98% rename from reference/functions/isnewerthantime.markdown rename to content/reference/functions/isnewerthantime.markdown index d3b289610..219c14720 100644 --- a/reference/functions/isnewerthantime.markdown +++ b/content/reference/functions/isnewerthantime.markdown @@ -1,7 +1,6 @@ --- layout: default title: isnewerthantime -published: true --- [%CFEngine_function_prototype(file, time)%] diff --git a/reference/functions/isplain.markdown b/content/reference/functions/isplain.markdown similarity index 96% rename from reference/functions/isplain.markdown rename to content/reference/functions/isplain.markdown index 6bbca0c6a..10aa84a47 100644 --- a/reference/functions/isplain.markdown +++ b/content/reference/functions/isplain.markdown @@ -1,7 +1,6 @@ --- layout: default title: isplain -published: true --- [%CFEngine_function_prototype(filename)%] diff --git a/reference/functions/isreadable.markdown b/content/reference/functions/isreadable.markdown similarity index 99% rename from reference/functions/isreadable.markdown rename to content/reference/functions/isreadable.markdown index cb0973e7d..214fb4e8e 100644 --- a/reference/functions/isreadable.markdown +++ b/content/reference/functions/isreadable.markdown @@ -1,7 +1,6 @@ --- layout: default title: isreadable -published: true --- [%CFEngine_function_prototype(path, timeout)%] diff --git a/reference/functions/isvariable.markdown b/content/reference/functions/isvariable.markdown similarity index 97% rename from reference/functions/isvariable.markdown rename to content/reference/functions/isvariable.markdown index dc41bf435..02af50866 100644 --- a/reference/functions/isvariable.markdown +++ b/content/reference/functions/isvariable.markdown @@ -1,7 +1,6 @@ --- layout: default title: isvariable -published: true --- [%CFEngine_function_prototype(var)%] diff --git a/reference/functions/join.markdown b/content/reference/functions/join.markdown similarity index 97% rename from reference/functions/join.markdown rename to content/reference/functions/join.markdown index a2e8db0bf..6af4f2ab6 100644 --- a/reference/functions/join.markdown +++ b/content/reference/functions/join.markdown @@ -1,7 +1,6 @@ --- layout: default title: join -published: true --- [%CFEngine_function_prototype(glue, list)%] diff --git a/reference/functions/lastnode.markdown b/content/reference/functions/lastnode.markdown similarity index 97% rename from reference/functions/lastnode.markdown rename to content/reference/functions/lastnode.markdown index c3d2d7b25..06fabf2c7 100644 --- a/reference/functions/lastnode.markdown +++ b/content/reference/functions/lastnode.markdown @@ -1,7 +1,6 @@ --- layout: default title: lastnode -published: true --- [%CFEngine_function_prototype(string, separator)%] diff --git a/reference/functions/laterthan.markdown b/content/reference/functions/laterthan.markdown similarity index 97% rename from reference/functions/laterthan.markdown rename to content/reference/functions/laterthan.markdown index 6585f0d8e..2b4f27ac7 100644 --- a/reference/functions/laterthan.markdown +++ b/content/reference/functions/laterthan.markdown @@ -1,7 +1,6 @@ --- layout: default title: laterthan -published: true --- [%CFEngine_function_prototype(year, month, day, hour, minute, second)%] diff --git a/reference/functions/ldaparray.markdown b/content/reference/functions/ldaparray.markdown similarity index 98% rename from reference/functions/ldaparray.markdown rename to content/reference/functions/ldaparray.markdown index f45786031..514677b2b 100644 --- a/reference/functions/ldaparray.markdown +++ b/content/reference/functions/ldaparray.markdown @@ -1,7 +1,6 @@ --- layout: default title: ldaparray -published: true --- **This function is only available in CFEngine Enterprise.** diff --git a/reference/functions/ldaplist.markdown b/content/reference/functions/ldaplist.markdown similarity index 98% rename from reference/functions/ldaplist.markdown rename to content/reference/functions/ldaplist.markdown index 7320e31e9..874855d53 100644 --- a/reference/functions/ldaplist.markdown +++ b/content/reference/functions/ldaplist.markdown @@ -1,7 +1,6 @@ --- layout: default title: ldaplist -published: true --- **This function is only available in CFEngine Enterprise.** diff --git a/reference/functions/ldapvalue.markdown b/content/reference/functions/ldapvalue.markdown similarity index 98% rename from reference/functions/ldapvalue.markdown rename to content/reference/functions/ldapvalue.markdown index 23333390f..899c3a45d 100644 --- a/reference/functions/ldapvalue.markdown +++ b/content/reference/functions/ldapvalue.markdown @@ -1,7 +1,6 @@ --- layout: default title: ldapvalue -published: true --- **This function is only available in CFEngine Enterprise.** diff --git a/reference/functions/length.markdown b/content/reference/functions/length.markdown similarity index 97% rename from reference/functions/length.markdown rename to content/reference/functions/length.markdown index ef11e368c..60bfb5f5c 100644 --- a/reference/functions/length.markdown +++ b/content/reference/functions/length.markdown @@ -1,7 +1,6 @@ --- layout: default title: length -published: true --- [%CFEngine_function_prototype(list)%] diff --git a/reference/functions/lsdir.markdown b/content/reference/functions/lsdir.markdown similarity index 97% rename from reference/functions/lsdir.markdown rename to content/reference/functions/lsdir.markdown index 56a36f7b0..f79f84e01 100644 --- a/reference/functions/lsdir.markdown +++ b/content/reference/functions/lsdir.markdown @@ -1,7 +1,6 @@ --- layout: default title: lsdir -published: true --- [%CFEngine_function_prototype(path, regex, include_base)%] diff --git a/reference/functions/makerule.markdown b/content/reference/functions/makerule.markdown similarity index 99% rename from reference/functions/makerule.markdown rename to content/reference/functions/makerule.markdown index d97c0479a..c72c6212c 100644 --- a/reference/functions/makerule.markdown +++ b/content/reference/functions/makerule.markdown @@ -1,7 +1,6 @@ --- layout: default title: makerule -published: true --- [%CFEngine_function_prototype(target, sources)%] diff --git a/reference/functions/maparray.markdown b/content/reference/functions/maparray.markdown similarity index 98% rename from reference/functions/maparray.markdown rename to content/reference/functions/maparray.markdown index c16af3d15..c3fd35993 100644 --- a/reference/functions/maparray.markdown +++ b/content/reference/functions/maparray.markdown @@ -1,7 +1,6 @@ --- layout: default title: maparray -published: true --- [%CFEngine_function_prototype(pattern, array_or_container)%] diff --git a/reference/functions/mapdata.markdown b/content/reference/functions/mapdata.markdown similarity index 99% rename from reference/functions/mapdata.markdown rename to content/reference/functions/mapdata.markdown index 1558d3c2f..4f713ca33 100644 --- a/reference/functions/mapdata.markdown +++ b/content/reference/functions/mapdata.markdown @@ -1,7 +1,6 @@ --- layout: default title: mapdata -published: true --- [%CFEngine_function_prototype(interpretation, pattern, array_or_container)%] diff --git a/reference/functions/maplist.markdown b/content/reference/functions/maplist.markdown similarity index 98% rename from reference/functions/maplist.markdown rename to content/reference/functions/maplist.markdown index 0bdb5da2c..dfe7fdf82 100644 --- a/reference/functions/maplist.markdown +++ b/content/reference/functions/maplist.markdown @@ -1,7 +1,6 @@ --- layout: default title: maplist -published: true --- [%CFEngine_function_prototype(pattern, list)%] diff --git a/reference/functions/max.markdown b/content/reference/functions/max.markdown similarity index 98% rename from reference/functions/max.markdown rename to content/reference/functions/max.markdown index 33fe3e1c7..7e0bca981 100644 --- a/reference/functions/max.markdown +++ b/content/reference/functions/max.markdown @@ -1,7 +1,6 @@ --- layout: default title: max -published: true --- [%CFEngine_function_prototype(list, sortmode)%] diff --git a/reference/functions/mean.markdown b/content/reference/functions/mean.markdown similarity index 97% rename from reference/functions/mean.markdown rename to content/reference/functions/mean.markdown index 4d13f72a7..d2dfe7bbf 100644 --- a/reference/functions/mean.markdown +++ b/content/reference/functions/mean.markdown @@ -1,7 +1,6 @@ --- layout: default title: mean -published: true --- [%CFEngine_function_prototype(list)%] diff --git a/reference/functions/mergedata.markdown b/content/reference/functions/mergedata.markdown similarity index 99% rename from reference/functions/mergedata.markdown rename to content/reference/functions/mergedata.markdown index 28686cc6a..ce95724fc 100644 --- a/reference/functions/mergedata.markdown +++ b/content/reference/functions/mergedata.markdown @@ -1,7 +1,6 @@ --- layout: default title: mergedata -published: true --- [%CFEngine_function_prototype(one, two, etc)%] diff --git a/reference/functions/min.markdown b/content/reference/functions/min.markdown similarity index 98% rename from reference/functions/min.markdown rename to content/reference/functions/min.markdown index 37b6ec74a..be8515304 100644 --- a/reference/functions/min.markdown +++ b/content/reference/functions/min.markdown @@ -1,7 +1,6 @@ --- layout: default title: min -published: true --- [%CFEngine_function_prototype(list, sortmode)%] diff --git a/reference/functions/network_connections.markdown b/content/reference/functions/network_connections.markdown similarity index 99% rename from reference/functions/network_connections.markdown rename to content/reference/functions/network_connections.markdown index a4f88d378..f8d51cb11 100644 --- a/reference/functions/network_connections.markdown +++ b/content/reference/functions/network_connections.markdown @@ -1,7 +1,6 @@ --- layout: default title: network_connections -published: true --- [%CFEngine_function_prototype()%] diff --git a/reference/functions/none.markdown b/content/reference/functions/none.markdown similarity index 97% rename from reference/functions/none.markdown rename to content/reference/functions/none.markdown index b5a6adbe0..99d8b4519 100644 --- a/reference/functions/none.markdown +++ b/content/reference/functions/none.markdown @@ -1,7 +1,6 @@ --- layout: default title: none -published: true --- [%CFEngine_function_prototype(regex, list)%] diff --git a/reference/functions/not.markdown b/content/reference/functions/not.markdown similarity index 97% rename from reference/functions/not.markdown rename to content/reference/functions/not.markdown index 7745c5a7b..a545da267 100644 --- a/reference/functions/not.markdown +++ b/content/reference/functions/not.markdown @@ -1,7 +1,6 @@ --- layout: default title: not -published: true --- [%CFEngine_function_prototype(expression)%] diff --git a/reference/functions/now.markdown b/content/reference/functions/now.markdown similarity index 99% rename from reference/functions/now.markdown rename to content/reference/functions/now.markdown index e1a9be210..c423f6d4e 100644 --- a/reference/functions/now.markdown +++ b/content/reference/functions/now.markdown @@ -1,7 +1,6 @@ --- layout: default title: now -published: true --- [%CFEngine_function_prototype()%] diff --git a/reference/functions/nth.markdown b/content/reference/functions/nth.markdown similarity index 98% rename from reference/functions/nth.markdown rename to content/reference/functions/nth.markdown index 90b9aedb8..fddcefec5 100644 --- a/reference/functions/nth.markdown +++ b/content/reference/functions/nth.markdown @@ -1,7 +1,6 @@ --- layout: default title: nth -published: true --- [%CFEngine_function_prototype(list_or_container, position_or_key)%] diff --git a/reference/functions/on.markdown b/content/reference/functions/on.markdown similarity index 97% rename from reference/functions/on.markdown rename to content/reference/functions/on.markdown index 7d0ffb8ba..e12a08b92 100644 --- a/reference/functions/on.markdown +++ b/content/reference/functions/on.markdown @@ -1,7 +1,6 @@ --- layout: default title: "on" -published: true --- [%CFEngine_function_prototype(year, month, day, hour, minute, second)%] diff --git a/reference/functions/or.markdown b/content/reference/functions/or.markdown similarity index 97% rename from reference/functions/or.markdown rename to content/reference/functions/or.markdown index 94fe6751f..6d4d08deb 100644 --- a/reference/functions/or.markdown +++ b/content/reference/functions/or.markdown @@ -1,7 +1,6 @@ --- layout: default title: or -published: true --- [%CFEngine_function_prototype(...)%] diff --git a/reference/functions/packagesmatching.markdown b/content/reference/functions/packagesmatching.markdown similarity index 99% rename from reference/functions/packagesmatching.markdown rename to content/reference/functions/packagesmatching.markdown index b19135654..21cd99532 100644 --- a/reference/functions/packagesmatching.markdown +++ b/content/reference/functions/packagesmatching.markdown @@ -1,7 +1,6 @@ --- layout: default title: packagesmatching -published: true --- [%CFEngine_function_prototype(package_regex, version_regex, arch_regex, method_regex)%] diff --git a/reference/functions/packageupdatesmatching.markdown b/content/reference/functions/packageupdatesmatching.markdown similarity index 99% rename from reference/functions/packageupdatesmatching.markdown rename to content/reference/functions/packageupdatesmatching.markdown index dcc612970..cf023cff5 100644 --- a/reference/functions/packageupdatesmatching.markdown +++ b/content/reference/functions/packageupdatesmatching.markdown @@ -1,7 +1,6 @@ --- layout: default title: packageupdatesmatching -published: true --- [%CFEngine_function_prototype(package_regex, version_regex, arch_regex, method_regex)%] diff --git a/reference/functions/parseintarray.markdown b/content/reference/functions/parseintarray.markdown similarity index 99% rename from reference/functions/parseintarray.markdown rename to content/reference/functions/parseintarray.markdown index 4d9a16665..a88f5dcdd 100644 --- a/reference/functions/parseintarray.markdown +++ b/content/reference/functions/parseintarray.markdown @@ -1,7 +1,6 @@ --- layout: default title: "parseintarray" -published: true --- **Prototype:** `parseintarray(array, input, comment, split, maxentries, maxbytes)`
diff --git a/reference/functions/parsejson.markdown b/content/reference/functions/parsejson.markdown similarity index 98% rename from reference/functions/parsejson.markdown rename to content/reference/functions/parsejson.markdown index 3c2491da9..6b06497e0 100644 --- a/reference/functions/parsejson.markdown +++ b/content/reference/functions/parsejson.markdown @@ -1,7 +1,6 @@ --- layout: default title: parsejson -published: true --- [%CFEngine_function_prototype(json_data)%] diff --git a/reference/functions/parserealarray.markdown b/content/reference/functions/parserealarray.markdown similarity index 99% rename from reference/functions/parserealarray.markdown rename to content/reference/functions/parserealarray.markdown index 28e19c547..5b9036b75 100644 --- a/reference/functions/parserealarray.markdown +++ b/content/reference/functions/parserealarray.markdown @@ -1,7 +1,6 @@ --- layout: default title: "parserealarray" -published: true --- **Prototype:** `parserealarray(array, input, comment, split, maxentries, maxbytes)`
diff --git a/reference/functions/parsestringarray.markdown b/content/reference/functions/parsestringarray.markdown similarity index 99% rename from reference/functions/parsestringarray.markdown rename to content/reference/functions/parsestringarray.markdown index 676557397..c3c29983b 100644 --- a/reference/functions/parsestringarray.markdown +++ b/content/reference/functions/parsestringarray.markdown @@ -1,7 +1,6 @@ --- layout: default title: "parsestringarray" -published: true --- **Prototype:** `parsestringarray(array, input, comment, split, maxentries, maxbytes)`
diff --git a/reference/functions/parsestringarrayidx.markdown b/content/reference/functions/parsestringarrayidx.markdown similarity index 98% rename from reference/functions/parsestringarrayidx.markdown rename to content/reference/functions/parsestringarrayidx.markdown index a0397648f..9e22f8140 100644 --- a/reference/functions/parsestringarrayidx.markdown +++ b/content/reference/functions/parsestringarrayidx.markdown @@ -1,7 +1,6 @@ --- layout: default title: parsestringarrayidx -published: true --- [%CFEngine_function_prototype(array, input, comment, split, maxentries, maxbytes)%] diff --git a/reference/functions/parseyaml.markdown b/content/reference/functions/parseyaml.markdown similarity index 98% rename from reference/functions/parseyaml.markdown rename to content/reference/functions/parseyaml.markdown index e220898e8..577e014df 100644 --- a/reference/functions/parseyaml.markdown +++ b/content/reference/functions/parseyaml.markdown @@ -1,7 +1,6 @@ --- layout: default title: parseyaml -published: true --- [%CFEngine_function_prototype(yaml_data)%] diff --git a/reference/functions/peerleader.markdown b/content/reference/functions/peerleader.markdown similarity index 98% rename from reference/functions/peerleader.markdown rename to content/reference/functions/peerleader.markdown index 537fa6521..a227a5184 100644 --- a/reference/functions/peerleader.markdown +++ b/content/reference/functions/peerleader.markdown @@ -1,7 +1,6 @@ --- layout: default title: peerleader -published: true --- [%CFEngine_function_prototype(filename, regex, groupsize)%] diff --git a/reference/functions/peerleaders.markdown b/content/reference/functions/peerleaders.markdown similarity index 98% rename from reference/functions/peerleaders.markdown rename to content/reference/functions/peerleaders.markdown index 53d25ae23..754701a4b 100644 --- a/reference/functions/peerleaders.markdown +++ b/content/reference/functions/peerleaders.markdown @@ -1,7 +1,6 @@ --- layout: default title: peerleaders -published: true --- [%CFEngine_function_prototype(filename, regex, groupsize)%] diff --git a/reference/functions/peers.markdown b/content/reference/functions/peers.markdown similarity index 98% rename from reference/functions/peers.markdown rename to content/reference/functions/peers.markdown index ad8e5228e..25ad20edf 100644 --- a/reference/functions/peers.markdown +++ b/content/reference/functions/peers.markdown @@ -1,7 +1,6 @@ --- layout: default title: peers -published: true --- [%CFEngine_function_prototype(filename, regex, groupsize)%] diff --git a/reference/functions/processexists.markdown b/content/reference/functions/processexists.markdown similarity index 98% rename from reference/functions/processexists.markdown rename to content/reference/functions/processexists.markdown index a2b9949e9..54e9c4995 100644 --- a/reference/functions/processexists.markdown +++ b/content/reference/functions/processexists.markdown @@ -1,7 +1,6 @@ --- layout: default title: processexists -published: true --- [%CFEngine_function_prototype(regex)%] diff --git a/reference/functions/product.markdown b/content/reference/functions/product.markdown similarity index 98% rename from reference/functions/product.markdown rename to content/reference/functions/product.markdown index 8d836e5cd..716b822ff 100644 --- a/reference/functions/product.markdown +++ b/content/reference/functions/product.markdown @@ -1,7 +1,6 @@ --- layout: default title: product -published: true --- [%CFEngine_function_prototype(list)%] diff --git a/reference/functions/randomint.markdown b/content/reference/functions/randomint.markdown similarity index 98% rename from reference/functions/randomint.markdown rename to content/reference/functions/randomint.markdown index b58ea2a5f..0029c7635 100644 --- a/reference/functions/randomint.markdown +++ b/content/reference/functions/randomint.markdown @@ -1,7 +1,6 @@ --- layout: default title: randomint -published: true --- [%CFEngine_function_prototype(lower, upper)%] diff --git a/reference/functions/read_module_protocol.markdown b/content/reference/functions/read_module_protocol.markdown similarity index 96% rename from reference/functions/read_module_protocol.markdown rename to content/reference/functions/read_module_protocol.markdown index a30e255ac..c0f9ea997 100644 --- a/reference/functions/read_module_protocol.markdown +++ b/content/reference/functions/read_module_protocol.markdown @@ -1,7 +1,6 @@ --- layout: default title: read_module_protocol -published: true --- [%CFEngine_function_prototype(file_path)%] diff --git a/reference/functions/readcsv.markdown b/content/reference/functions/readcsv.markdown similarity index 98% rename from reference/functions/readcsv.markdown rename to content/reference/functions/readcsv.markdown index 698da166a..97b9c0234 100644 --- a/reference/functions/readcsv.markdown +++ b/content/reference/functions/readcsv.markdown @@ -1,7 +1,6 @@ --- layout: default title: readcsv -published: true --- [%CFEngine_function_prototype(filename, optional_maxbytes)%] diff --git a/reference/functions/readdata.markdown b/content/reference/functions/readdata.markdown similarity index 98% rename from reference/functions/readdata.markdown rename to content/reference/functions/readdata.markdown index 02c69c6ec..6280f87c3 100644 --- a/reference/functions/readdata.markdown +++ b/content/reference/functions/readdata.markdown @@ -1,7 +1,6 @@ --- layout: default title: readdata -published: true --- [%CFEngine_function_prototype(filename, filetype)%] diff --git a/reference/functions/readenvfile.markdown b/content/reference/functions/readenvfile.markdown similarity index 98% rename from reference/functions/readenvfile.markdown rename to content/reference/functions/readenvfile.markdown index e3e85c45f..c2e4980bd 100644 --- a/reference/functions/readenvfile.markdown +++ b/content/reference/functions/readenvfile.markdown @@ -1,7 +1,6 @@ --- layout: default title: readenvfile -published: true --- [%CFEngine_function_prototype(filename, optional_maxbytes)%] diff --git a/reference/functions/readfile.markdown b/content/reference/functions/readfile.markdown similarity index 98% rename from reference/functions/readfile.markdown rename to content/reference/functions/readfile.markdown index a7147e9b0..f1bc71453 100644 --- a/reference/functions/readfile.markdown +++ b/content/reference/functions/readfile.markdown @@ -1,7 +1,6 @@ --- layout: default title: readfile -published: true --- [%CFEngine_function_prototype(filename, optional_maxbytes)%] diff --git a/reference/functions/readintarray.markdown b/content/reference/functions/readintarray.markdown similarity index 99% rename from reference/functions/readintarray.markdown rename to content/reference/functions/readintarray.markdown index 01f4b3c24..21398638a 100644 --- a/reference/functions/readintarray.markdown +++ b/content/reference/functions/readintarray.markdown @@ -1,7 +1,6 @@ --- layout: default title: "readintarray" -published: true --- **Prototype:** `readintarray(array, filename, comment, split, maxentries, maxbytes)`
diff --git a/reference/functions/readintlist.markdown b/content/reference/functions/readintlist.markdown similarity index 98% rename from reference/functions/readintlist.markdown rename to content/reference/functions/readintlist.markdown index 189502046..b4ccc1cf1 100644 --- a/reference/functions/readintlist.markdown +++ b/content/reference/functions/readintlist.markdown @@ -1,7 +1,6 @@ --- layout: default title: readintlist -published: true --- [%CFEngine_function_prototype(filename, comment, split, maxentries, maxbytes)%] diff --git a/reference/functions/readjson.markdown b/content/reference/functions/readjson.markdown similarity index 97% rename from reference/functions/readjson.markdown rename to content/reference/functions/readjson.markdown index ced2b6859..c34aab76a 100644 --- a/reference/functions/readjson.markdown +++ b/content/reference/functions/readjson.markdown @@ -1,7 +1,6 @@ --- layout: default title: readjson -published: true --- [%CFEngine_function_prototype(filename, optional_maxbytes)%] diff --git a/reference/functions/readrealarray.markdown b/content/reference/functions/readrealarray.markdown similarity index 99% rename from reference/functions/readrealarray.markdown rename to content/reference/functions/readrealarray.markdown index 6ee8d9e60..cde8539c4 100644 --- a/reference/functions/readrealarray.markdown +++ b/content/reference/functions/readrealarray.markdown @@ -1,7 +1,6 @@ --- layout: default title: "readrealarray" -published: true --- **Prototype:** `readrealarray(array, filename, comment, split, maxentries, maxbytes)`
diff --git a/reference/functions/readreallist.markdown b/content/reference/functions/readreallist.markdown similarity index 98% rename from reference/functions/readreallist.markdown rename to content/reference/functions/readreallist.markdown index 82679807d..42ab08a67 100644 --- a/reference/functions/readreallist.markdown +++ b/content/reference/functions/readreallist.markdown @@ -1,7 +1,6 @@ --- layout: default title: readreallist -published: true --- **Prototype:** `readreallist(filename, comment, split, maxentries, maxbytes)`
diff --git a/reference/functions/readstringarray.markdown b/content/reference/functions/readstringarray.markdown similarity index 99% rename from reference/functions/readstringarray.markdown rename to content/reference/functions/readstringarray.markdown index 478ecdd4d..a78409229 100644 --- a/reference/functions/readstringarray.markdown +++ b/content/reference/functions/readstringarray.markdown @@ -1,7 +1,6 @@ --- layout: default title: "readstringarray" -published: true --- **Prototype:** `readstringarray(array, filename, comment, split, maxentries, maxbytes)` diff --git a/reference/functions/readstringarrayidx.markdown b/content/reference/functions/readstringarrayidx.markdown similarity index 99% rename from reference/functions/readstringarrayidx.markdown rename to content/reference/functions/readstringarrayidx.markdown index 077faed4e..48e829823 100644 --- a/reference/functions/readstringarrayidx.markdown +++ b/content/reference/functions/readstringarrayidx.markdown @@ -1,7 +1,6 @@ --- layout: default title: readstringarrayidx -published: true --- [%CFEngine_function_prototype(array, filename, comment, split, maxentries, maxbytes)%] diff --git a/reference/functions/readstringlist.markdown b/content/reference/functions/readstringlist.markdown similarity index 98% rename from reference/functions/readstringlist.markdown rename to content/reference/functions/readstringlist.markdown index 2ed7ab872..e5a4f01cd 100644 --- a/reference/functions/readstringlist.markdown +++ b/content/reference/functions/readstringlist.markdown @@ -1,7 +1,6 @@ --- layout: default title: readstringlist -published: true --- **Prototype:** `readstringlist(filename, comment, split, maxentries, maxbytes)` diff --git a/reference/functions/readtcp.markdown b/content/reference/functions/readtcp.markdown similarity index 98% rename from reference/functions/readtcp.markdown rename to content/reference/functions/readtcp.markdown index 532da1835..29c40cd79 100644 --- a/reference/functions/readtcp.markdown +++ b/content/reference/functions/readtcp.markdown @@ -1,7 +1,6 @@ --- layout: default title: readtcp -published: true --- [%CFEngine_function_prototype(hostnameip, port, sendstring, maxbytes)%] diff --git a/reference/functions/readyaml.markdown b/content/reference/functions/readyaml.markdown similarity index 97% rename from reference/functions/readyaml.markdown rename to content/reference/functions/readyaml.markdown index 7b1091568..58d4bb6b9 100644 --- a/reference/functions/readyaml.markdown +++ b/content/reference/functions/readyaml.markdown @@ -1,7 +1,6 @@ --- layout: default title: readyaml -published: true --- [%CFEngine_function_prototype(filename, optional_maxbytes)%] diff --git a/reference/functions/regarray.markdown b/content/reference/functions/regarray.markdown similarity index 96% rename from reference/functions/regarray.markdown rename to content/reference/functions/regarray.markdown index 845c452df..15cb36b46 100644 --- a/reference/functions/regarray.markdown +++ b/content/reference/functions/regarray.markdown @@ -1,7 +1,6 @@ --- layout: default title: regarray -published: true --- [%CFEngine_function_prototype(array, regex)%] diff --git a/reference/functions/regcmp.markdown b/content/reference/functions/regcmp.markdown similarity index 98% rename from reference/functions/regcmp.markdown rename to content/reference/functions/regcmp.markdown index 203493951..ca4822ee2 100644 --- a/reference/functions/regcmp.markdown +++ b/content/reference/functions/regcmp.markdown @@ -1,7 +1,6 @@ --- layout: default title: regcmp -published: true --- [%CFEngine_function_prototype(regex, string)%] diff --git a/reference/functions/regex_replace.markdown b/content/reference/functions/regex_replace.markdown similarity index 99% rename from reference/functions/regex_replace.markdown rename to content/reference/functions/regex_replace.markdown index 1579b2889..a618833f7 100644 --- a/reference/functions/regex_replace.markdown +++ b/content/reference/functions/regex_replace.markdown @@ -1,7 +1,6 @@ --- layout: default title: regex_replace -published: true --- [%CFEngine_function_prototype(string, regex, replacement, options)%] diff --git a/reference/functions/regextract.markdown b/content/reference/functions/regextract.markdown similarity index 98% rename from reference/functions/regextract.markdown rename to content/reference/functions/regextract.markdown index 681cd4da9..f177a573b 100644 --- a/reference/functions/regextract.markdown +++ b/content/reference/functions/regextract.markdown @@ -1,7 +1,6 @@ --- layout: default title: regextract -published: true --- [%CFEngine_function_prototype(regex, string, backref)%] diff --git a/reference/functions/registryvalue.markdown b/content/reference/functions/registryvalue.markdown similarity index 97% rename from reference/functions/registryvalue.markdown rename to content/reference/functions/registryvalue.markdown index 28ce5fafa..a0e8657c6 100644 --- a/reference/functions/registryvalue.markdown +++ b/content/reference/functions/registryvalue.markdown @@ -1,7 +1,6 @@ --- layout: default title: registryvalue -published: true --- [%CFEngine_function_prototype(key, valueid)%] diff --git a/reference/functions/regldap.markdown b/content/reference/functions/regldap.markdown similarity index 98% rename from reference/functions/regldap.markdown rename to content/reference/functions/regldap.markdown index ed180389d..af3eb7147 100644 --- a/reference/functions/regldap.markdown +++ b/content/reference/functions/regldap.markdown @@ -1,7 +1,6 @@ --- layout: default title: regldap -published: true --- **This function is only available in CFEngine Enterprise.** diff --git a/reference/functions/regline.markdown b/content/reference/functions/regline.markdown similarity index 99% rename from reference/functions/regline.markdown rename to content/reference/functions/regline.markdown index 9c868e0ed..586f4c0c1 100644 --- a/reference/functions/regline.markdown +++ b/content/reference/functions/regline.markdown @@ -1,7 +1,6 @@ --- layout: default title: regline -published: true --- [%CFEngine_function_prototype(regex, filename)%] diff --git a/reference/functions/reglist.markdown b/content/reference/functions/reglist.markdown similarity index 98% rename from reference/functions/reglist.markdown rename to content/reference/functions/reglist.markdown index 5f5af4058..3ec15bb65 100644 --- a/reference/functions/reglist.markdown +++ b/content/reference/functions/reglist.markdown @@ -1,7 +1,6 @@ --- layout: default title: reglist -published: true --- [%CFEngine_function_prototype(list, regex)%] diff --git a/reference/functions/remoteclassesmatching.markdown b/content/reference/functions/remoteclassesmatching.markdown similarity index 98% rename from reference/functions/remoteclassesmatching.markdown rename to content/reference/functions/remoteclassesmatching.markdown index 9ee0f9499..da4ba470d 100644 --- a/reference/functions/remoteclassesmatching.markdown +++ b/content/reference/functions/remoteclassesmatching.markdown @@ -1,7 +1,6 @@ --- layout: default title: remoteclassesmatching -published: true --- **This function is only available in CFEngine Enterprise.** diff --git a/reference/functions/remotescalar.markdown b/content/reference/functions/remotescalar.markdown similarity index 99% rename from reference/functions/remotescalar.markdown rename to content/reference/functions/remotescalar.markdown index 3934ffb37..c04da7523 100644 --- a/reference/functions/remotescalar.markdown +++ b/content/reference/functions/remotescalar.markdown @@ -1,7 +1,6 @@ --- layout: default title: remotescalar -published: true --- **This function is only available in CFEngine Enterprise.** diff --git a/reference/functions/returnszero.markdown b/content/reference/functions/returnszero.markdown similarity index 98% rename from reference/functions/returnszero.markdown rename to content/reference/functions/returnszero.markdown index 1d54aa77b..56b82049a 100644 --- a/reference/functions/returnszero.markdown +++ b/content/reference/functions/returnszero.markdown @@ -1,7 +1,6 @@ --- layout: default title: returnszero -published: true --- [%CFEngine_function_prototype(command, shell)%] diff --git a/reference/functions/reverse.markdown b/content/reference/functions/reverse.markdown similarity index 98% rename from reference/functions/reverse.markdown rename to content/reference/functions/reverse.markdown index 91f75534a..9d9419f0b 100644 --- a/reference/functions/reverse.markdown +++ b/content/reference/functions/reverse.markdown @@ -1,7 +1,6 @@ --- layout: default title: reverse -published: true --- [%CFEngine_function_prototype(list)%] diff --git a/reference/functions/rrange.markdown b/content/reference/functions/rrange.markdown similarity index 93% rename from reference/functions/rrange.markdown rename to content/reference/functions/rrange.markdown index 8502e618c..76ec6eae8 100644 --- a/reference/functions/rrange.markdown +++ b/content/reference/functions/rrange.markdown @@ -1,7 +1,6 @@ --- layout: default title: rrange -published: true --- [%CFEngine_function_prototype(arg1, arg2)%] diff --git a/reference/functions/selectservers.markdown b/content/reference/functions/selectservers.markdown similarity index 99% rename from reference/functions/selectservers.markdown rename to content/reference/functions/selectservers.markdown index 64fb267bd..e91292eb0 100644 --- a/reference/functions/selectservers.markdown +++ b/content/reference/functions/selectservers.markdown @@ -1,7 +1,6 @@ --- layout: default title: selectservers -published: true --- [%CFEngine_function_prototype(hostlist, port, query, regex, maxbytes, array)%] diff --git a/reference/functions/shuffle.markdown b/content/reference/functions/shuffle.markdown similarity index 98% rename from reference/functions/shuffle.markdown rename to content/reference/functions/shuffle.markdown index 48135af56..f4796ae5c 100644 --- a/reference/functions/shuffle.markdown +++ b/content/reference/functions/shuffle.markdown @@ -1,7 +1,6 @@ --- layout: default title: shuffle -published: true --- [%CFEngine_function_prototype(list, seed)%] diff --git a/reference/functions/some.markdown b/content/reference/functions/some.markdown similarity index 98% rename from reference/functions/some.markdown rename to content/reference/functions/some.markdown index 2fab47afe..40140fbca 100644 --- a/reference/functions/some.markdown +++ b/content/reference/functions/some.markdown @@ -1,7 +1,6 @@ --- layout: default title: some -published: true --- [%CFEngine_function_prototype(regex, list)%] diff --git a/reference/functions/sort.markdown b/content/reference/functions/sort.markdown similarity index 99% rename from reference/functions/sort.markdown rename to content/reference/functions/sort.markdown index ede0cc2e5..b5972467b 100644 --- a/reference/functions/sort.markdown +++ b/content/reference/functions/sort.markdown @@ -1,7 +1,6 @@ --- layout: default title: sort -published: true --- [%CFEngine_function_prototype(list, mode)%] diff --git a/reference/functions/splayclass.markdown b/content/reference/functions/splayclass.markdown similarity index 99% rename from reference/functions/splayclass.markdown rename to content/reference/functions/splayclass.markdown index 43857b252..715a0b4b8 100644 --- a/reference/functions/splayclass.markdown +++ b/content/reference/functions/splayclass.markdown @@ -1,7 +1,6 @@ --- layout: default title: splayclass -published: true --- [%CFEngine_function_prototype(input, policy)%] diff --git a/reference/functions/splitstring.markdown b/content/reference/functions/splitstring.markdown similarity index 97% rename from reference/functions/splitstring.markdown rename to content/reference/functions/splitstring.markdown index e22ed9af3..6d1f0a283 100644 --- a/reference/functions/splitstring.markdown +++ b/content/reference/functions/splitstring.markdown @@ -1,7 +1,6 @@ --- layout: default title: splitstring -published: true --- [%CFEngine_function_prototype(string, regex, maxent)%] diff --git a/reference/functions/storejson.markdown b/content/reference/functions/storejson.markdown similarity index 97% rename from reference/functions/storejson.markdown rename to content/reference/functions/storejson.markdown index eed076b43..10985ed74 100644 --- a/reference/functions/storejson.markdown +++ b/content/reference/functions/storejson.markdown @@ -1,7 +1,6 @@ --- layout: default title: storejson -published: true --- [%CFEngine_function_prototype(data_container)%] diff --git a/reference/functions/strcmp.markdown b/content/reference/functions/strcmp.markdown similarity index 96% rename from reference/functions/strcmp.markdown rename to content/reference/functions/strcmp.markdown index 84447c58e..285f4910d 100644 --- a/reference/functions/strcmp.markdown +++ b/content/reference/functions/strcmp.markdown @@ -1,7 +1,6 @@ --- layout: default title: strcmp -published: true --- [%CFEngine_function_prototype(string1, string2)%] diff --git a/reference/functions/strftime.markdown b/content/reference/functions/strftime.markdown similarity index 98% rename from reference/functions/strftime.markdown rename to content/reference/functions/strftime.markdown index 3585df6c3..f4cc7398c 100644 --- a/reference/functions/strftime.markdown +++ b/content/reference/functions/strftime.markdown @@ -1,7 +1,6 @@ --- layout: default title: strftime -published: true --- [%CFEngine_function_prototype(mode, template, time)%] diff --git a/reference/functions/string.markdown b/content/reference/functions/string.markdown similarity index 96% rename from reference/functions/string.markdown rename to content/reference/functions/string.markdown index a13b6f892..be0f18589 100644 --- a/reference/functions/string.markdown +++ b/content/reference/functions/string.markdown @@ -1,7 +1,6 @@ --- layout: default title: string -published: true --- [%CFEngine_function_prototype(arg)%] diff --git a/reference/functions/string_downcase.markdown b/content/reference/functions/string_downcase.markdown similarity index 96% rename from reference/functions/string_downcase.markdown rename to content/reference/functions/string_downcase.markdown index 05b6bf77f..6773c8150 100644 --- a/reference/functions/string_downcase.markdown +++ b/content/reference/functions/string_downcase.markdown @@ -1,7 +1,6 @@ --- layout: default title: string_downcase -published: true --- [%CFEngine_function_prototype(data)%] diff --git a/reference/functions/string_head.markdown b/content/reference/functions/string_head.markdown similarity index 97% rename from reference/functions/string_head.markdown rename to content/reference/functions/string_head.markdown index 5c7dd86e4..140db25dd 100644 --- a/reference/functions/string_head.markdown +++ b/content/reference/functions/string_head.markdown @@ -1,7 +1,6 @@ --- layout: default title: string_head -published: true --- [%CFEngine_function_prototype(data, max)%] diff --git a/reference/functions/string_length.markdown b/content/reference/functions/string_length.markdown similarity index 96% rename from reference/functions/string_length.markdown rename to content/reference/functions/string_length.markdown index e9f531168..705cc1249 100644 --- a/reference/functions/string_length.markdown +++ b/content/reference/functions/string_length.markdown @@ -1,7 +1,6 @@ --- layout: default title: string_length -published: true --- [%CFEngine_function_prototype(data)%] diff --git a/reference/functions/string_mustache.markdown b/content/reference/functions/string_mustache.markdown similarity index 95% rename from reference/functions/string_mustache.markdown rename to content/reference/functions/string_mustache.markdown index d4e205b2f..3a96bf5f8 100644 --- a/reference/functions/string_mustache.markdown +++ b/content/reference/functions/string_mustache.markdown @@ -1,7 +1,6 @@ --- layout: default title: string_mustache -published: true --- [%CFEngine_function_prototype(template_string, optional_data_container)%] @@ -13,9 +12,9 @@ The usual Mustache facilities like conditional evaluation and loops are availabl [%CFEngine_function_attributes(template_string, optional_data_container)%] **Example:** -{%raw%} + [%CFEngine_include_snippet(string_mustache.cf, #\+begin_src cfengine3, .*end_src)%] -{%endraw%} + Output: diff --git a/reference/functions/string_replace.markdown b/content/reference/functions/string_replace.markdown similarity index 98% rename from reference/functions/string_replace.markdown rename to content/reference/functions/string_replace.markdown index 32b66ff45..451acf55d 100644 --- a/reference/functions/string_replace.markdown +++ b/content/reference/functions/string_replace.markdown @@ -1,7 +1,6 @@ --- layout: default title: string_replace -published: true --- [%CFEngine_function_prototype(string, match, replacement)%] diff --git a/reference/functions/string_reverse.markdown b/content/reference/functions/string_reverse.markdown similarity index 96% rename from reference/functions/string_reverse.markdown rename to content/reference/functions/string_reverse.markdown index ea943fd0c..df77974eb 100644 --- a/reference/functions/string_reverse.markdown +++ b/content/reference/functions/string_reverse.markdown @@ -1,7 +1,6 @@ --- layout: default title: string_reverse -published: true --- [%CFEngine_function_prototype(data)%] diff --git a/reference/functions/string_split.markdown b/content/reference/functions/string_split.markdown similarity index 98% rename from reference/functions/string_split.markdown rename to content/reference/functions/string_split.markdown index 10994bfa2..044135c8a 100644 --- a/reference/functions/string_split.markdown +++ b/content/reference/functions/string_split.markdown @@ -1,7 +1,6 @@ --- layout: default title: string_split -published: true --- [%CFEngine_function_prototype(string, regex, maxent)%] diff --git a/reference/functions/string_tail.markdown b/content/reference/functions/string_tail.markdown similarity index 97% rename from reference/functions/string_tail.markdown rename to content/reference/functions/string_tail.markdown index b72e51a1e..a2b22361f 100644 --- a/reference/functions/string_tail.markdown +++ b/content/reference/functions/string_tail.markdown @@ -1,7 +1,6 @@ --- layout: default title: string_tail -published: true --- [%CFEngine_function_prototype(data, max)%] diff --git a/reference/functions/string_trim.markdown b/content/reference/functions/string_trim.markdown similarity index 96% rename from reference/functions/string_trim.markdown rename to content/reference/functions/string_trim.markdown index 153fff677..718405e11 100644 --- a/reference/functions/string_trim.markdown +++ b/content/reference/functions/string_trim.markdown @@ -1,7 +1,6 @@ --- layout: default title: string_trim -published: true --- [%CFEngine_function_prototype(string)%] diff --git a/reference/functions/string_upcase.markdown b/content/reference/functions/string_upcase.markdown similarity index 96% rename from reference/functions/string_upcase.markdown rename to content/reference/functions/string_upcase.markdown index 94d787dc4..cff7659da 100644 --- a/reference/functions/string_upcase.markdown +++ b/content/reference/functions/string_upcase.markdown @@ -1,7 +1,6 @@ --- layout: default title: string_upcase -published: true --- [%CFEngine_function_prototype(data)%] diff --git a/reference/functions/sublist.markdown b/content/reference/functions/sublist.markdown similarity index 98% rename from reference/functions/sublist.markdown rename to content/reference/functions/sublist.markdown index 403298c98..dbf53dbe0 100644 --- a/reference/functions/sublist.markdown +++ b/content/reference/functions/sublist.markdown @@ -1,7 +1,6 @@ --- layout: default title: sublist -published: true --- [%CFEngine_function_prototype(list, head_or_tail, max_elements)%] diff --git a/reference/functions/sum.markdown b/content/reference/functions/sum.markdown similarity index 98% rename from reference/functions/sum.markdown rename to content/reference/functions/sum.markdown index 8e916367b..f36bd8061 100644 --- a/reference/functions/sum.markdown +++ b/content/reference/functions/sum.markdown @@ -1,7 +1,6 @@ --- layout: default title: sum -published: true --- [%CFEngine_function_prototype(list)%] diff --git a/reference/functions/sysctlvalue.markdown b/content/reference/functions/sysctlvalue.markdown similarity index 97% rename from reference/functions/sysctlvalue.markdown rename to content/reference/functions/sysctlvalue.markdown index 3300860a3..07536d5a2 100644 --- a/reference/functions/sysctlvalue.markdown +++ b/content/reference/functions/sysctlvalue.markdown @@ -1,7 +1,6 @@ --- layout: default title: sysctlvalue -published: true --- [%CFEngine_function_prototype(key)%] diff --git a/reference/functions/translatepath.markdown b/content/reference/functions/translatepath.markdown similarity index 98% rename from reference/functions/translatepath.markdown rename to content/reference/functions/translatepath.markdown index 94b46713b..076010716 100644 --- a/reference/functions/translatepath.markdown +++ b/content/reference/functions/translatepath.markdown @@ -1,7 +1,6 @@ --- layout: default title: translatepath -published: true --- [%CFEngine_function_prototype(path)%] diff --git a/reference/functions/type.markdown b/content/reference/functions/type.markdown similarity index 99% rename from reference/functions/type.markdown rename to content/reference/functions/type.markdown index 6c597377d..a25eaa5ff 100644 --- a/reference/functions/type.markdown +++ b/content/reference/functions/type.markdown @@ -1,7 +1,6 @@ --- layout: default title: type -published: true --- [%CFEngine_function_prototype(var, detail)%] diff --git a/reference/functions/unique.markdown b/content/reference/functions/unique.markdown similarity index 97% rename from reference/functions/unique.markdown rename to content/reference/functions/unique.markdown index f4131a162..341d38100 100644 --- a/reference/functions/unique.markdown +++ b/content/reference/functions/unique.markdown @@ -1,7 +1,6 @@ --- layout: default title: unique -published: true --- [%CFEngine_function_prototype(list)%] diff --git a/reference/functions/url_get.markdown b/content/reference/functions/url_get.markdown similarity index 99% rename from reference/functions/url_get.markdown rename to content/reference/functions/url_get.markdown index 2685c3345..e1c1aa634 100644 --- a/reference/functions/url_get.markdown +++ b/content/reference/functions/url_get.markdown @@ -1,7 +1,6 @@ --- layout: default title: url_get -published: true --- [%CFEngine_function_prototype(url, options_container)%] diff --git a/reference/functions/usemodule.markdown b/content/reference/functions/usemodule.markdown similarity index 97% rename from reference/functions/usemodule.markdown rename to content/reference/functions/usemodule.markdown index 87cbea763..ab750af2d 100644 --- a/reference/functions/usemodule.markdown +++ b/content/reference/functions/usemodule.markdown @@ -1,7 +1,6 @@ --- layout: default title: usemodule -published: true --- [%CFEngine_function_prototype(module, args)%] diff --git a/reference/functions/userexists.markdown b/content/reference/functions/userexists.markdown similarity index 96% rename from reference/functions/userexists.markdown rename to content/reference/functions/userexists.markdown index 636185aa7..4424072b2 100644 --- a/reference/functions/userexists.markdown +++ b/content/reference/functions/userexists.markdown @@ -1,7 +1,6 @@ --- layout: default title: userexists -published: true --- [%CFEngine_function_prototype(user)%] diff --git a/reference/functions/useringroup.markdown b/content/reference/functions/useringroup.markdown similarity index 97% rename from reference/functions/useringroup.markdown rename to content/reference/functions/useringroup.markdown index 2b3f82c7e..d7ef52cb0 100644 --- a/reference/functions/useringroup.markdown +++ b/content/reference/functions/useringroup.markdown @@ -1,7 +1,6 @@ --- layout: default title: useringroup -published: true --- [%CFEngine_function_prototype(user)%] diff --git a/reference/functions/validdata.markdown b/content/reference/functions/validdata.markdown similarity index 98% rename from reference/functions/validdata.markdown rename to content/reference/functions/validdata.markdown index e8a4593a2..59f799b50 100644 --- a/reference/functions/validdata.markdown +++ b/content/reference/functions/validdata.markdown @@ -1,7 +1,6 @@ --- layout: default title: validdata -published: true --- [%CFEngine_function_prototype(data_container, type, strict)%] diff --git a/reference/functions/validjson.markdown b/content/reference/functions/validjson.markdown similarity index 98% rename from reference/functions/validjson.markdown rename to content/reference/functions/validjson.markdown index 8562407df..193347acf 100644 --- a/reference/functions/validjson.markdown +++ b/content/reference/functions/validjson.markdown @@ -1,7 +1,6 @@ --- layout: default title: validjson -published: true --- [%CFEngine_function_prototype(string, strict)%] diff --git a/reference/functions/variablesmatching.markdown b/content/reference/functions/variablesmatching.markdown similarity index 99% rename from reference/functions/variablesmatching.markdown rename to content/reference/functions/variablesmatching.markdown index fb689542f..b736d5dc4 100644 --- a/reference/functions/variablesmatching.markdown +++ b/content/reference/functions/variablesmatching.markdown @@ -1,7 +1,6 @@ --- layout: default title: variablesmatching -published: true --- [%CFEngine_function_prototype(name, tag1, tag2, ...)%] diff --git a/reference/functions/variablesmatching_as_data.markdown b/content/reference/functions/variablesmatching_as_data.markdown similarity index 99% rename from reference/functions/variablesmatching_as_data.markdown rename to content/reference/functions/variablesmatching_as_data.markdown index a079e1a36..cd74fecc0 100644 --- a/reference/functions/variablesmatching_as_data.markdown +++ b/content/reference/functions/variablesmatching_as_data.markdown @@ -1,7 +1,6 @@ --- layout: default title: variablesmatching_as_data -published: true --- [%CFEngine_function_prototype(name, tag1, tag2, ...)%] diff --git a/reference/functions/variance.markdown b/content/reference/functions/variance.markdown similarity index 98% rename from reference/functions/variance.markdown rename to content/reference/functions/variance.markdown index 0dfb92548..847529e02 100644 --- a/reference/functions/variance.markdown +++ b/content/reference/functions/variance.markdown @@ -1,7 +1,6 @@ --- layout: default title: variance -published: true --- [%CFEngine_function_prototype(list)%] diff --git a/reference/functions/version_compare.markdown b/content/reference/functions/version_compare.markdown similarity index 99% rename from reference/functions/version_compare.markdown rename to content/reference/functions/version_compare.markdown index b85d18809..286f92d94 100644 --- a/reference/functions/version_compare.markdown +++ b/content/reference/functions/version_compare.markdown @@ -1,7 +1,6 @@ --- layout: default title: version_compare -published: true --- [%CFEngine_function_prototype(version1, comparison, version2)%] diff --git a/reference/language-concepts.markdown b/content/reference/language-concepts/_index.markdown similarity index 99% rename from reference/language-concepts.markdown rename to content/reference/language-concepts/_index.markdown index e8a402df4..73ea48ace 100644 --- a/reference/language-concepts.markdown +++ b/content/reference/language-concepts/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Language concepts -published: true sorting: 50 --- diff --git a/reference/language-concepts/augments.markdown b/content/reference/language-concepts/augments.markdown similarity index 99% rename from reference/language-concepts/augments.markdown rename to content/reference/language-concepts/augments.markdown index 4d618d2c5..a443519db 100644 --- a/reference/language-concepts/augments.markdown +++ b/content/reference/language-concepts/augments.markdown @@ -1,7 +1,6 @@ --- layout: default title: Augments -published: true sorting: 70 --- diff --git a/reference/language-concepts/bodies.markdown b/content/reference/language-concepts/bodies.markdown similarity index 99% rename from reference/language-concepts/bodies.markdown rename to content/reference/language-concepts/bodies.markdown index d992c1b06..84f5438d2 100644 --- a/reference/language-concepts/bodies.markdown +++ b/content/reference/language-concepts/bodies.markdown @@ -1,7 +1,6 @@ --- layout: default title: Bodies -published: true sorting: 20 --- diff --git a/reference/language-concepts/bundles.markdown b/content/reference/language-concepts/bundles.markdown similarity index 99% rename from reference/language-concepts/bundles.markdown rename to content/reference/language-concepts/bundles.markdown index 9b3ad12c1..cadd29d78 100644 --- a/reference/language-concepts/bundles.markdown +++ b/content/reference/language-concepts/bundles.markdown @@ -1,7 +1,6 @@ --- layout: default title: Bundles -published: true sorting: 10 --- diff --git a/reference/language-concepts/classes.markdown b/content/reference/language-concepts/classes.markdown similarity index 99% rename from reference/language-concepts/classes.markdown rename to content/reference/language-concepts/classes.markdown index b273b1609..e4af681e5 100644 --- a/reference/language-concepts/classes.markdown +++ b/content/reference/language-concepts/classes.markdown @@ -1,7 +1,6 @@ --- layout: default title: Classes and decisions -published: true sorting: 50 --- diff --git a/reference/language-concepts/loops.markdown b/content/reference/language-concepts/loops.markdown similarity index 99% rename from reference/language-concepts/loops.markdown rename to content/reference/language-concepts/loops.markdown index 00988847b..c7cf115de 100644 --- a/reference/language-concepts/loops.markdown +++ b/content/reference/language-concepts/loops.markdown @@ -1,7 +1,6 @@ --- layout: default title: Loops -published: true sorting: 70 --- diff --git a/reference/language-concepts/modules.markdown b/content/reference/language-concepts/modules/_index.markdown similarity index 98% rename from reference/language-concepts/modules.markdown rename to content/reference/language-concepts/modules/_index.markdown index 85a2ede32..c864b3949 100644 --- a/reference/language-concepts/modules.markdown +++ b/content/reference/language-concepts/modules/_index.markdown @@ -1,18 +1,17 @@ --- layout: default title: Modules -published: true --- Modules allow users to extend the capabilities of CFEngine in a modular way, they can be easily added and upgraded independently of when you upgrade your CFEngine version. Several different types of modules are available. -{% comment %} + ## Promise modules diff --git a/reference/language-concepts/modules/package-module-api.markdown b/content/reference/language-concepts/modules/package-module-api.markdown similarity index 99% rename from reference/language-concepts/modules/package-module-api.markdown rename to content/reference/language-concepts/modules/package-module-api.markdown index 7d7955bd6..c36dcbbed 100644 --- a/reference/language-concepts/modules/package-module-api.markdown +++ b/content/reference/language-concepts/modules/package-module-api.markdown @@ -1,7 +1,6 @@ --- layout: default title: Package modules -published: true sorting: 70 --- diff --git a/reference/language-concepts/namespaces.markdown b/content/reference/language-concepts/namespaces.markdown similarity index 99% rename from reference/language-concepts/namespaces.markdown rename to content/reference/language-concepts/namespaces.markdown index bfa099a3c..ad226da78 100644 --- a/reference/language-concepts/namespaces.markdown +++ b/content/reference/language-concepts/namespaces.markdown @@ -1,7 +1,6 @@ --- layout: default title: Namespaces -published: true sorting: 100 --- diff --git a/reference/language-concepts/pattern-matching-and-referencing.markdown b/content/reference/language-concepts/pattern-matching-and-referencing.markdown similarity index 99% rename from reference/language-concepts/pattern-matching-and-referencing.markdown rename to content/reference/language-concepts/pattern-matching-and-referencing.markdown index 41b54703d..ed6805600 100644 --- a/reference/language-concepts/pattern-matching-and-referencing.markdown +++ b/content/reference/language-concepts/pattern-matching-and-referencing.markdown @@ -1,7 +1,6 @@ --- layout: default title: Pattern matching and referencing -published: true sorting: 80 --- diff --git a/reference/language-concepts/policy-evaluation.markdown b/content/reference/language-concepts/policy-evaluation.markdown similarity index 99% rename from reference/language-concepts/policy-evaluation.markdown rename to content/reference/language-concepts/policy-evaluation.markdown index 11e292e8c..aa58151d6 100644 --- a/reference/language-concepts/policy-evaluation.markdown +++ b/content/reference/language-concepts/policy-evaluation.markdown @@ -2,7 +2,6 @@ layout: default title: Policy evaluation alias: Normal ordering -published: true sorting: 40 --- diff --git a/reference/language-concepts/promises.markdown b/content/reference/language-concepts/promises.markdown similarity index 99% rename from reference/language-concepts/promises.markdown rename to content/reference/language-concepts/promises.markdown index ff7799400..2ae8748c9 100644 --- a/reference/language-concepts/promises.markdown +++ b/content/reference/language-concepts/promises.markdown @@ -1,7 +1,6 @@ --- layout: default title: Promises -published: true sorting: 30 --- diff --git a/reference/language-concepts/variables.markdown b/content/reference/language-concepts/variables.markdown similarity index 99% rename from reference/language-concepts/variables.markdown rename to content/reference/language-concepts/variables.markdown index ac0e2597b..4806cf658 100644 --- a/reference/language-concepts/variables.markdown +++ b/content/reference/language-concepts/variables.markdown @@ -1,7 +1,6 @@ --- layout: default title: Variables -published: true sorting: 60 --- diff --git a/reference/macros.markdown b/content/reference/macros.markdown similarity index 99% rename from reference/macros.markdown rename to content/reference/macros.markdown index c8184af97..5c0482f3b 100644 --- a/reference/macros.markdown +++ b/content/reference/macros.markdown @@ -2,7 +2,6 @@ layout: default title: Macros categories: [Reference, Macros] -published: true alias: reference-macros.html --- diff --git a/reference/masterfiles-policy-framework.markdown b/content/reference/masterfiles-policy-framework/_index.markdown similarity index 94% rename from reference/masterfiles-policy-framework.markdown rename to content/reference/masterfiles-policy-framework/_index.markdown index 84871eb13..531858b93 100644 --- a/reference/masterfiles-policy-framework.markdown +++ b/content/reference/masterfiles-policy-framework/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Masterfiles Policy Framework -published: true sorting: 90 --- diff --git a/reference/masterfiles-policy-framework/cfe_internal-CFE_cfengine.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-CFE_cfengine.markdown similarity index 87% rename from reference/masterfiles-policy-framework/cfe_internal-CFE_cfengine.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-CFE_cfengine.markdown index 1e50ac1b9..a81bdaeac 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-CFE_cfengine.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-CFE_cfengine.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/CFE_cfengine.cf -published: true --- [%CFEngine_library_include(cfe_internal/CFE_cfengine)%] diff --git a/reference/masterfiles-policy-framework/cfe_internal-core-watchdog-watchdog.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-core-watchdog-watchdog.markdown similarity index 89% rename from reference/masterfiles-policy-framework/cfe_internal-core-watchdog-watchdog.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-core-watchdog-watchdog.markdown index 00ed9cc21..a79f9f161 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-core-watchdog-watchdog.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-core-watchdog-watchdog.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/core/watchdog/watchdog.cf -published: true --- [%CFEngine_library_include(cfe_internal/core/watchdog/watchdog)%] diff --git a/reference/masterfiles-policy-framework/cfe_internal-core-watchdog.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-core-watchdog.markdown similarity index 90% rename from reference/masterfiles-policy-framework/cfe_internal-core-watchdog.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-core-watchdog.markdown index 11a72ed0d..f9011a9a0 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-core-watchdog.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-core-watchdog.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/core/watchdog -published: true --- [%CFEngine_include_markdown(../../masterfiles/cfe_internal/core/watchdog/README.md)%] diff --git a/reference/masterfiles-policy-framework/cfe_internal-core.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-core.markdown similarity index 91% rename from reference/masterfiles-policy-framework/cfe_internal-core.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-core.markdown index 50527465b..94d32af5e 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-core.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-core.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/core/ -published: true --- This directory contains internal management polcies related to CFEngine diff --git a/reference/masterfiles-policy-framework/cfe_internal-enterprise-federation-federation.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-enterprise-federation-federation.markdown similarity index 93% rename from reference/masterfiles-policy-framework/cfe_internal-enterprise-federation-federation.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-enterprise-federation-federation.markdown index 1af18f3db..60a8fe4ef 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-enterprise-federation-federation.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-enterprise-federation-federation.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/enterprise/federation/federation.cf -published: true --- This policy file handles Federated reporting setup and ongoing operations. diff --git a/reference/masterfiles-policy-framework/cfe_internal-enterprise-federation.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-enterprise-federation.markdown similarity index 92% rename from reference/masterfiles-policy-framework/cfe_internal-enterprise-federation.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-enterprise-federation.markdown index 1954e7017..6cc4c6f72 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-enterprise-federation.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-enterprise-federation.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/enterprise/federation/ -published: true --- This directory contains assets related to the function and configuration of [CFEngine Enterprise Federated reporting][Federated reporting]. diff --git a/reference/masterfiles-policy-framework/cfe_internal-enterprise.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-enterprise.markdown similarity index 91% rename from reference/masterfiles-policy-framework/cfe_internal-enterprise.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-enterprise.markdown index a90d170ce..07c68188a 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-enterprise.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-enterprise.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/enterprise/ -published: true --- This directory contains internal management polcies related to CFEngine diff --git a/reference/masterfiles-policy-framework/cfe_internal-recommendations.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-recommendations.markdown similarity index 88% rename from reference/masterfiles-policy-framework/cfe_internal-recommendations.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-recommendations.markdown index 4c224ea26..20aca9737 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-recommendations.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-recommendations.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/recommendations.cf -published: true --- [%CFEngine_library_include(cfe_internal/recommendations)%] diff --git a/reference/masterfiles-policy-framework/cfe_internal-update-cfe_internal_dc_workflow.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-update-cfe_internal_dc_workflow.markdown similarity index 90% rename from reference/masterfiles-policy-framework/cfe_internal-update-cfe_internal_dc_workflow.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-update-cfe_internal_dc_workflow.markdown index d50ac7021..784dfe70b 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-update-cfe_internal_dc_workflow.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-update-cfe_internal_dc_workflow.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/update/cfe_internal_dc_workflow.cf -published: true --- [%CFEngine_library_include(cfe_internal/update/cfe_internal_dc_workflow)%] diff --git a/reference/masterfiles-policy-framework/cfe_internal-update-cfe_internal_update_from_repository.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-update-cfe_internal_update_from_repository.markdown similarity index 91% rename from reference/masterfiles-policy-framework/cfe_internal-update-cfe_internal_update_from_repository.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-update-cfe_internal_update_from_repository.markdown index e59a3abcc..8c5e6c212 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-update-cfe_internal_update_from_repository.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-update-cfe_internal_update_from_repository.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/update/cfe_internal_update_from_repository.cf -published: true --- [%CFEngine_library_include(cfe_internal/update/cfe_internal_update_from_repository)%] diff --git a/reference/masterfiles-policy-framework/cfe_internal-update-lib.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-update-lib.markdown similarity index 87% rename from reference/masterfiles-policy-framework/cfe_internal-update-lib.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-update-lib.markdown index 9e2f5c1f7..19a6709b4 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-update-lib.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-update-lib.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/update/lib.cf -published: true --- [%CFEngine_library_include(cfe_internal/update/lib)%] diff --git a/reference/masterfiles-policy-framework/cfe_internal-update-systemd_units.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-update-systemd_units.markdown similarity index 89% rename from reference/masterfiles-policy-framework/cfe_internal-update-systemd_units.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-update-systemd_units.markdown index e527c9a5d..d06d5b5fb 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-update-systemd_units.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-update-systemd_units.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/update/systemd_units.cf -published: true --- [%CFEngine_library_include(cfe_internal/update/systemd_units)%] diff --git a/reference/masterfiles-policy-framework/cfe_internal-update-update_bins.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-update-update_bins.markdown similarity index 88% rename from reference/masterfiles-policy-framework/cfe_internal-update-update_bins.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-update-update_bins.markdown index c2de4a80b..53e70651d 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-update-update_bins.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-update-update_bins.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/update/update_bins.cf -published: true --- [%CFEngine_library_include(cfe_internal/update/update_bins)%] diff --git a/reference/masterfiles-policy-framework/cfe_internal-update-update_policy.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-update-update_policy.markdown similarity index 89% rename from reference/masterfiles-policy-framework/cfe_internal-update-update_policy.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-update-update_policy.markdown index fe7d42f27..1c5fb7e33 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-update-update_policy.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-update-update_policy.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/update/update_policy.cf -published: true --- [%CFEngine_library_include(cfe_internal/update/update_policy)%] diff --git a/reference/masterfiles-policy-framework/cfe_internal-update-update_processes.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-update-update_processes.markdown similarity index 89% rename from reference/masterfiles-policy-framework/cfe_internal-update-update_processes.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-update-update_processes.markdown index 2c0412850..08a26b57d 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-update-update_processes.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-update-update_processes.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/update/update_processes.cf -published: true --- [%CFEngine_library_include(cfe_internal/update/update_processes)%] diff --git a/reference/masterfiles-policy-framework/cfe_internal-update.markdown b/content/reference/masterfiles-policy-framework/cfe_internal-update.markdown similarity index 96% rename from reference/masterfiles-policy-framework/cfe_internal-update.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal-update.markdown index 53d4d2bc8..671b3a537 100644 --- a/reference/masterfiles-policy-framework/cfe_internal-update.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal-update.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/update/ -published: true --- This directory contains internal management polcies related to the default diff --git a/reference/masterfiles-policy-framework/cfe_internal.markdown b/content/reference/masterfiles-policy-framework/cfe_internal.markdown similarity index 97% rename from reference/masterfiles-policy-framework/cfe_internal.markdown rename to content/reference/masterfiles-policy-framework/cfe_internal.markdown index 5c29877d1..53a48aa51 100644 --- a/reference/masterfiles-policy-framework/cfe_internal.markdown +++ b/content/reference/masterfiles-policy-framework/cfe_internal.markdown @@ -1,7 +1,6 @@ --- layout: default title: cfe_internal/ -published: true --- This directory contains policy related to the internal control and functioning diff --git a/reference/masterfiles-policy-framework/controls-cf-hub.markdown b/content/reference/masterfiles-policy-framework/controls-cf-hub.markdown similarity index 94% rename from reference/masterfiles-policy-framework/controls-cf-hub.markdown rename to content/reference/masterfiles-policy-framework/controls-cf-hub.markdown index 8a6dd39fa..dda9b61b4 100644 --- a/reference/masterfiles-policy-framework/controls-cf-hub.markdown +++ b/content/reference/masterfiles-policy-framework/controls-cf-hub.markdown @@ -1,7 +1,6 @@ --- layout: default title: controls/cf_hub.cf -published: true --- This is where `body hub control` is defined. `body hub control` is where diff --git a/reference/masterfiles-policy-framework/controls-cf_agent.markdown b/content/reference/masterfiles-policy-framework/controls-cf_agent.markdown similarity index 93% rename from reference/masterfiles-policy-framework/controls-cf_agent.markdown rename to content/reference/masterfiles-policy-framework/controls-cf_agent.markdown index 3d3387117..1515cefba 100644 --- a/reference/masterfiles-policy-framework/controls-cf_agent.markdown +++ b/content/reference/masterfiles-policy-framework/controls-cf_agent.markdown @@ -1,7 +1,6 @@ --- layout: default title: controls/cf_agent.cf -published: true --- This is where `body agent control` is defined. `body agent control` is where diff --git a/reference/masterfiles-policy-framework/controls-cf_execd.markdown b/content/reference/masterfiles-policy-framework/controls-cf_execd.markdown similarity index 93% rename from reference/masterfiles-policy-framework/controls-cf_execd.markdown rename to content/reference/masterfiles-policy-framework/controls-cf_execd.markdown index 65c42fed1..f001d4f76 100644 --- a/reference/masterfiles-policy-framework/controls-cf_execd.markdown +++ b/content/reference/masterfiles-policy-framework/controls-cf_execd.markdown @@ -1,7 +1,6 @@ --- layout: default title: controls/cf_execd.cf -published: true --- This is where `body executor control` is defined. `body executor control` is where diff --git a/reference/masterfiles-policy-framework/controls-cf_monitord.markdown b/content/reference/masterfiles-policy-framework/controls-cf_monitord.markdown similarity index 93% rename from reference/masterfiles-policy-framework/controls-cf_monitord.markdown rename to content/reference/masterfiles-policy-framework/controls-cf_monitord.markdown index b80a80469..062ecde0f 100644 --- a/reference/masterfiles-policy-framework/controls-cf_monitord.markdown +++ b/content/reference/masterfiles-policy-framework/controls-cf_monitord.markdown @@ -1,7 +1,6 @@ --- layout: default title: controls/cf_monitord.cf -published: true --- This is where `body monitor control` is defined. `body monitor control` is where diff --git a/reference/masterfiles-policy-framework/controls-cf_runagent.markdown b/content/reference/masterfiles-policy-framework/controls-cf_runagent.markdown similarity index 95% rename from reference/masterfiles-policy-framework/controls-cf_runagent.markdown rename to content/reference/masterfiles-policy-framework/controls-cf_runagent.markdown index ecda64ff1..f768e67b0 100644 --- a/reference/masterfiles-policy-framework/controls-cf_runagent.markdown +++ b/content/reference/masterfiles-policy-framework/controls-cf_runagent.markdown @@ -1,7 +1,6 @@ --- layout: default title: controls/cf_runagent.cf -published: true --- This is where `body runagent control` is defined. `body runagent control` is where diff --git a/reference/masterfiles-policy-framework/controls-cf_serverd.markdown b/content/reference/masterfiles-policy-framework/controls-cf_serverd.markdown similarity index 93% rename from reference/masterfiles-policy-framework/controls-cf_serverd.markdown rename to content/reference/masterfiles-policy-framework/controls-cf_serverd.markdown index 0f69edde8..40cef2f4a 100644 --- a/reference/masterfiles-policy-framework/controls-cf_serverd.markdown +++ b/content/reference/masterfiles-policy-framework/controls-cf_serverd.markdown @@ -1,7 +1,6 @@ --- layout: default title: controls/cf_serverd.cf -published: true --- This is where `body server control` is defined. `body server control` is where diff --git a/reference/masterfiles-policy-framework/controls-def.markdown b/content/reference/masterfiles-policy-framework/controls-def.markdown similarity index 92% rename from reference/masterfiles-policy-framework/controls-def.markdown rename to content/reference/masterfiles-policy-framework/controls-def.markdown index 104555bc7..322a00f2d 100644 --- a/reference/masterfiles-policy-framework/controls-def.markdown +++ b/content/reference/masterfiles-policy-framework/controls-def.markdown @@ -1,7 +1,6 @@ --- layout: default title: controls/def.cf -published: true --- This is where most common variables and classes are defined. Note its variable scope can be augmented with `def.json`. diff --git a/reference/masterfiles-policy-framework/controls-def_inputs.markdown b/content/reference/masterfiles-policy-framework/controls-def_inputs.markdown similarity index 92% rename from reference/masterfiles-policy-framework/controls-def_inputs.markdown rename to content/reference/masterfiles-policy-framework/controls-def_inputs.markdown index 6e4346263..e36d55431 100644 --- a/reference/masterfiles-policy-framework/controls-def_inputs.markdown +++ b/content/reference/masterfiles-policy-framework/controls-def_inputs.markdown @@ -1,7 +1,6 @@ --- layout: default title: controls/def_inputs.cf -published: true --- This is where the list of policy files to include as defined from the augments diff --git a/reference/masterfiles-policy-framework/controls-reports.markdown b/content/reference/masterfiles-policy-framework/controls-reports.markdown similarity index 96% rename from reference/masterfiles-policy-framework/controls-reports.markdown rename to content/reference/masterfiles-policy-framework/controls-reports.markdown index bcfd17adc..5057236aa 100644 --- a/reference/masterfiles-policy-framework/controls-reports.markdown +++ b/content/reference/masterfiles-policy-framework/controls-reports.markdown @@ -1,7 +1,6 @@ --- layout: default title: controls/reports.cf -published: true --- This is where report settings for CFEngine Enterprise are found. Control which diff --git a/reference/masterfiles-policy-framework/controls-update_def.markdown b/content/reference/masterfiles-policy-framework/controls-update_def.markdown similarity index 93% rename from reference/masterfiles-policy-framework/controls-update_def.markdown rename to content/reference/masterfiles-policy-framework/controls-update_def.markdown index 8117e51ac..6b7861032 100644 --- a/reference/masterfiles-policy-framework/controls-update_def.markdown +++ b/content/reference/masterfiles-policy-framework/controls-update_def.markdown @@ -1,7 +1,6 @@ --- layout: default title: controls/update_def.cf -published: true --- This is where most common variables and classes are defined for the update diff --git a/reference/masterfiles-policy-framework/controls-update_def_inputs.markdown b/content/reference/masterfiles-policy-framework/controls-update_def_inputs.markdown similarity index 93% rename from reference/masterfiles-policy-framework/controls-update_def_inputs.markdown rename to content/reference/masterfiles-policy-framework/controls-update_def_inputs.markdown index 71762a22f..91b1a1b5e 100644 --- a/reference/masterfiles-policy-framework/controls-update_def_inputs.markdown +++ b/content/reference/masterfiles-policy-framework/controls-update_def_inputs.markdown @@ -1,7 +1,6 @@ --- layout: default title: controls/update_def_inputs.cf -published: true --- This is where the list of update related policy files to include as defined diff --git a/reference/masterfiles-policy-framework/controls.markdown b/content/reference/masterfiles-policy-framework/controls.markdown similarity index 96% rename from reference/masterfiles-policy-framework/controls.markdown rename to content/reference/masterfiles-policy-framework/controls.markdown index c1989ec3f..663d5d228 100644 --- a/reference/masterfiles-policy-framework/controls.markdown +++ b/content/reference/masterfiles-policy-framework/controls.markdown @@ -1,7 +1,6 @@ --- layout: default title: controls/ -published: true --- This directory contains policy related to the internal control and functioning diff --git a/reference/masterfiles-policy-framework/inventory-any.markdown b/content/reference/masterfiles-policy-framework/inventory-any.markdown similarity index 97% rename from reference/masterfiles-policy-framework/inventory-any.markdown rename to content/reference/masterfiles-policy-framework/inventory-any.markdown index 8da56d649..c7e60e603 100644 --- a/reference/masterfiles-policy-framework/inventory-any.markdown +++ b/content/reference/masterfiles-policy-framework/inventory-any.markdown @@ -1,7 +1,6 @@ --- layout: default title: inventory/any.cf -published: true --- This policy is inventory related policy that can be run on any OS. This diff --git a/reference/masterfiles-policy-framework/inventory-debian.markdown b/content/reference/masterfiles-policy-framework/inventory-debian.markdown similarity index 90% rename from reference/masterfiles-policy-framework/inventory-debian.markdown rename to content/reference/masterfiles-policy-framework/inventory-debian.markdown index 222495429..18fc88cc8 100644 --- a/reference/masterfiles-policy-framework/inventory-debian.markdown +++ b/content/reference/masterfiles-policy-framework/inventory-debian.markdown @@ -1,7 +1,6 @@ --- layout: default title: inventory/debian.cf -published: true --- This policy is inventory related to debian hosts. diff --git a/reference/masterfiles-policy-framework/inventory-freebsd.markdown b/content/reference/masterfiles-policy-framework/inventory-freebsd.markdown similarity index 90% rename from reference/masterfiles-policy-framework/inventory-freebsd.markdown rename to content/reference/masterfiles-policy-framework/inventory-freebsd.markdown index 3f25dcaeb..e48b8ada1 100644 --- a/reference/masterfiles-policy-framework/inventory-freebsd.markdown +++ b/content/reference/masterfiles-policy-framework/inventory-freebsd.markdown @@ -1,7 +1,6 @@ --- layout: default title: inventory/freebsd.cf -published: true --- This policy is inventory related to freebsd hosts. diff --git a/reference/masterfiles-policy-framework/inventory-generic.markdown b/content/reference/masterfiles-policy-framework/inventory-generic.markdown similarity index 90% rename from reference/masterfiles-policy-framework/inventory-generic.markdown rename to content/reference/masterfiles-policy-framework/inventory-generic.markdown index d2068558f..e478345e6 100644 --- a/reference/masterfiles-policy-framework/inventory-generic.markdown +++ b/content/reference/masterfiles-policy-framework/inventory-generic.markdown @@ -1,7 +1,6 @@ --- layout: default title: inventory/generic.cf -published: true --- This policy is inventory related to generic hosts. diff --git a/reference/masterfiles-policy-framework/inventory-linux.markdown b/content/reference/masterfiles-policy-framework/inventory-linux.markdown similarity index 90% rename from reference/masterfiles-policy-framework/inventory-linux.markdown rename to content/reference/masterfiles-policy-framework/inventory-linux.markdown index b5541cb01..2085aceb6 100644 --- a/reference/masterfiles-policy-framework/inventory-linux.markdown +++ b/content/reference/masterfiles-policy-framework/inventory-linux.markdown @@ -1,7 +1,6 @@ --- layout: default title: inventory/linux.cf -published: true --- This policy is inventory related to linux hosts. diff --git a/reference/masterfiles-policy-framework/inventory-lsb.markdown b/content/reference/masterfiles-policy-framework/inventory-lsb.markdown similarity index 89% rename from reference/masterfiles-policy-framework/inventory-lsb.markdown rename to content/reference/masterfiles-policy-framework/inventory-lsb.markdown index 70cf71b93..cbd7d30f6 100644 --- a/reference/masterfiles-policy-framework/inventory-lsb.markdown +++ b/content/reference/masterfiles-policy-framework/inventory-lsb.markdown @@ -1,7 +1,6 @@ --- layout: default title: inventory/lsb.cf -published: true --- This policy is inventory related to lsb hosts. diff --git a/reference/masterfiles-policy-framework/inventory-macos.markdown b/content/reference/masterfiles-policy-framework/inventory-macos.markdown similarity index 90% rename from reference/masterfiles-policy-framework/inventory-macos.markdown rename to content/reference/masterfiles-policy-framework/inventory-macos.markdown index 20d9232a8..b9e09ef5e 100644 --- a/reference/masterfiles-policy-framework/inventory-macos.markdown +++ b/content/reference/masterfiles-policy-framework/inventory-macos.markdown @@ -1,7 +1,6 @@ --- layout: default title: inventory/macos.cf -published: true --- This policy is inventory related to macos hosts. diff --git a/reference/masterfiles-policy-framework/inventory-os.markdown b/content/reference/masterfiles-policy-framework/inventory-os.markdown similarity index 89% rename from reference/masterfiles-policy-framework/inventory-os.markdown rename to content/reference/masterfiles-policy-framework/inventory-os.markdown index f1cd41d92..cd2946f1d 100644 --- a/reference/masterfiles-policy-framework/inventory-os.markdown +++ b/content/reference/masterfiles-policy-framework/inventory-os.markdown @@ -1,7 +1,6 @@ --- layout: default title: inventory/os.cf -published: true --- This policy is inventory related to os hosts. diff --git a/reference/masterfiles-policy-framework/inventory-redhat.markdown b/content/reference/masterfiles-policy-framework/inventory-redhat.markdown similarity index 90% rename from reference/masterfiles-policy-framework/inventory-redhat.markdown rename to content/reference/masterfiles-policy-framework/inventory-redhat.markdown index 58e2a466b..b91ba010d 100644 --- a/reference/masterfiles-policy-framework/inventory-redhat.markdown +++ b/content/reference/masterfiles-policy-framework/inventory-redhat.markdown @@ -1,7 +1,6 @@ --- layout: default title: inventory/redhat.cf -published: true --- This policy is inventory related to redhat hosts. diff --git a/reference/masterfiles-policy-framework/inventory-suse.markdown b/content/reference/masterfiles-policy-framework/inventory-suse.markdown similarity index 90% rename from reference/masterfiles-policy-framework/inventory-suse.markdown rename to content/reference/masterfiles-policy-framework/inventory-suse.markdown index a1211c438..e3f451b23 100644 --- a/reference/masterfiles-policy-framework/inventory-suse.markdown +++ b/content/reference/masterfiles-policy-framework/inventory-suse.markdown @@ -1,7 +1,6 @@ --- layout: default title: inventory/suse.cf -published: true --- This policy is inventory related to suse hosts. diff --git a/reference/masterfiles-policy-framework/inventory-windows.markdown b/content/reference/masterfiles-policy-framework/inventory-windows.markdown similarity index 90% rename from reference/masterfiles-policy-framework/inventory-windows.markdown rename to content/reference/masterfiles-policy-framework/inventory-windows.markdown index 05de8196b..1f2833ac8 100644 --- a/reference/masterfiles-policy-framework/inventory-windows.markdown +++ b/content/reference/masterfiles-policy-framework/inventory-windows.markdown @@ -1,7 +1,6 @@ --- layout: default title: inventory/windows.cf -published: true --- This policy is inventory related to windows hosts. diff --git a/reference/masterfiles-policy-framework/inventory.markdown b/content/reference/masterfiles-policy-framework/inventory.markdown similarity index 87% rename from reference/masterfiles-policy-framework/inventory.markdown rename to content/reference/masterfiles-policy-framework/inventory.markdown index 5ee048a9b..baa2f88ca 100644 --- a/reference/masterfiles-policy-framework/inventory.markdown +++ b/content/reference/masterfiles-policy-framework/inventory.markdown @@ -1,7 +1,6 @@ --- layout: default title: inventory/ -published: true --- [%CFEngine_include_markdown(../../masterfiles/inventory/README.md)%] diff --git a/reference/masterfiles-policy-framework/lib-autorun.markdown b/content/reference/masterfiles-policy-framework/lib-autorun.markdown similarity index 84% rename from reference/masterfiles-policy-framework/lib-autorun.markdown rename to content/reference/masterfiles-policy-framework/lib-autorun.markdown index 7753fcf76..3b4734d5a 100644 --- a/reference/masterfiles-policy-framework/lib-autorun.markdown +++ b/content/reference/masterfiles-policy-framework/lib-autorun.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/autorun.cf -published: true --- [%CFEngine_library_include(lib/autorun)%] diff --git a/reference/masterfiles-policy-framework/lib-bundles.markdown b/content/reference/masterfiles-policy-framework/lib-bundles.markdown similarity index 84% rename from reference/masterfiles-policy-framework/lib-bundles.markdown rename to content/reference/masterfiles-policy-framework/lib-bundles.markdown index 8592320ef..ce1cb1771 100644 --- a/reference/masterfiles-policy-framework/lib-bundles.markdown +++ b/content/reference/masterfiles-policy-framework/lib-bundles.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/bundles.cf -published: true --- [%CFEngine_library_include(lib/bundles)%] diff --git a/reference/masterfiles-policy-framework/lib-cfe_internal.markdown b/content/reference/masterfiles-policy-framework/lib-cfe_internal.markdown similarity index 86% rename from reference/masterfiles-policy-framework/lib-cfe_internal.markdown rename to content/reference/masterfiles-policy-framework/lib-cfe_internal.markdown index d2169eeb9..96cb83423 100644 --- a/reference/masterfiles-policy-framework/lib-cfe_internal.markdown +++ b/content/reference/masterfiles-policy-framework/lib-cfe_internal.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/cfe_internal.cf -published: true --- [%CFEngine_library_include(lib/cfe_internal)%] diff --git a/reference/masterfiles-policy-framework/lib-cfe_internal_hub.markdown b/content/reference/masterfiles-policy-framework/lib-cfe_internal_hub.markdown similarity index 86% rename from reference/masterfiles-policy-framework/lib-cfe_internal_hub.markdown rename to content/reference/masterfiles-policy-framework/lib-cfe_internal_hub.markdown index 9cba4956d..ec0a41fd8 100644 --- a/reference/masterfiles-policy-framework/lib-cfe_internal_hub.markdown +++ b/content/reference/masterfiles-policy-framework/lib-cfe_internal_hub.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/cfe_internal_hub.cf -published: true --- [%CFEngine_library_include(lib/cfe_internal_hub)%] diff --git a/reference/masterfiles-policy-framework/lib-cfengine_enterprise_hub_ha.markdown b/content/reference/masterfiles-policy-framework/lib-cfengine_enterprise_hub_ha.markdown similarity index 88% rename from reference/masterfiles-policy-framework/lib-cfengine_enterprise_hub_ha.markdown rename to content/reference/masterfiles-policy-framework/lib-cfengine_enterprise_hub_ha.markdown index 226b69d59..93a84e848 100644 --- a/reference/masterfiles-policy-framework/lib-cfengine_enterprise_hub_ha.markdown +++ b/content/reference/masterfiles-policy-framework/lib-cfengine_enterprise_hub_ha.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/cfengine_enterprise_hub_ha.cf -published: true --- [%CFEngine_library_include(lib/cfengine_enterprise_hub_ha)%] diff --git a/reference/masterfiles-policy-framework/lib-commands.markdown b/content/reference/masterfiles-policy-framework/lib-commands.markdown similarity index 93% rename from reference/masterfiles-policy-framework/lib-commands.markdown rename to content/reference/masterfiles-policy-framework/lib-commands.markdown index c5521565c..8f472a976 100644 --- a/reference/masterfiles-policy-framework/lib-commands.markdown +++ b/content/reference/masterfiles-policy-framework/lib-commands.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/commands.cf -published: true --- See the [`commands` promises][commands] documentation for a diff --git a/reference/masterfiles-policy-framework/lib-common.markdown b/content/reference/masterfiles-policy-framework/lib-common.markdown similarity index 94% rename from reference/masterfiles-policy-framework/lib-common.markdown rename to content/reference/masterfiles-policy-framework/lib-common.markdown index 9c981d99f..4405ed888 100644 --- a/reference/masterfiles-policy-framework/lib-common.markdown +++ b/content/reference/masterfiles-policy-framework/lib-common.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/common.cf -published: true --- See diff --git a/reference/masterfiles-policy-framework/lib-databases.markdown b/content/reference/masterfiles-policy-framework/lib-databases.markdown similarity index 93% rename from reference/masterfiles-policy-framework/lib-databases.markdown rename to content/reference/masterfiles-policy-framework/lib-databases.markdown index c5d60907a..808095500 100644 --- a/reference/masterfiles-policy-framework/lib-databases.markdown +++ b/content/reference/masterfiles-policy-framework/lib-databases.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/databases.cf -published: true --- See the [`databases` promises][databases] documentation for a diff --git a/reference/masterfiles-policy-framework/lib-edit_xml.markdown b/content/reference/masterfiles-policy-framework/lib-edit_xml.markdown similarity index 85% rename from reference/masterfiles-policy-framework/lib-edit_xml.markdown rename to content/reference/masterfiles-policy-framework/lib-edit_xml.markdown index 81e1cca6c..f544c2d97 100644 --- a/reference/masterfiles-policy-framework/lib-edit_xml.markdown +++ b/content/reference/masterfiles-policy-framework/lib-edit_xml.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/edit_xml.cf -published: true --- [%CFEngine_library_include(lib/edit_xml)%] diff --git a/reference/masterfiles-policy-framework/lib-event.markdown b/content/reference/masterfiles-policy-framework/lib-event.markdown similarity index 84% rename from reference/masterfiles-policy-framework/lib-event.markdown rename to content/reference/masterfiles-policy-framework/lib-event.markdown index 1e81ee78b..ff919b253 100644 --- a/reference/masterfiles-policy-framework/lib-event.markdown +++ b/content/reference/masterfiles-policy-framework/lib-event.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/event.cf -published: true --- [%CFEngine_library_include(lib/event)%] diff --git a/reference/masterfiles-policy-framework/lib-examples.markdown b/content/reference/masterfiles-policy-framework/lib-examples.markdown similarity index 85% rename from reference/masterfiles-policy-framework/lib-examples.markdown rename to content/reference/masterfiles-policy-framework/lib-examples.markdown index b060e5baf..d9cb82eba 100644 --- a/reference/masterfiles-policy-framework/lib-examples.markdown +++ b/content/reference/masterfiles-policy-framework/lib-examples.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/examples.cf -published: true --- [%CFEngine_library_include(lib/examples)%] diff --git a/reference/masterfiles-policy-framework/lib-feature.markdown b/content/reference/masterfiles-policy-framework/lib-feature.markdown similarity index 84% rename from reference/masterfiles-policy-framework/lib-feature.markdown rename to content/reference/masterfiles-policy-framework/lib-feature.markdown index d2f047c14..a1e4f9cd2 100644 --- a/reference/masterfiles-policy-framework/lib-feature.markdown +++ b/content/reference/masterfiles-policy-framework/lib-feature.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/feature.cf -published: true --- [%CFEngine_library_include(lib/feature)%] diff --git a/reference/masterfiles-policy-framework/lib-files.markdown b/content/reference/masterfiles-policy-framework/lib-files.markdown similarity index 94% rename from reference/masterfiles-policy-framework/lib-files.markdown rename to content/reference/masterfiles-policy-framework/lib-files.markdown index e0ae675e5..3bd846dac 100644 --- a/reference/masterfiles-policy-framework/lib-files.markdown +++ b/content/reference/masterfiles-policy-framework/lib-files.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/files.cf -published: true --- See the [`files` promises][files] and [`edit_line` bundles][edit_line] diff --git a/reference/masterfiles-policy-framework/lib-guest_environments.markdown b/content/reference/masterfiles-policy-framework/lib-guest_environments.markdown similarity index 87% rename from reference/masterfiles-policy-framework/lib-guest_environments.markdown rename to content/reference/masterfiles-policy-framework/lib-guest_environments.markdown index 0f510cac4..f00f3bdf2 100644 --- a/reference/masterfiles-policy-framework/lib-guest_environments.markdown +++ b/content/reference/masterfiles-policy-framework/lib-guest_environments.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/guest_environments.cf -published: true --- [%CFEngine_library_include(lib/guest_environments)%] diff --git a/reference/masterfiles-policy-framework/lib-monitor.markdown b/content/reference/masterfiles-policy-framework/lib-monitor.markdown similarity index 84% rename from reference/masterfiles-policy-framework/lib-monitor.markdown rename to content/reference/masterfiles-policy-framework/lib-monitor.markdown index b04055d72..0fc0908d9 100644 --- a/reference/masterfiles-policy-framework/lib-monitor.markdown +++ b/content/reference/masterfiles-policy-framework/lib-monitor.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/monitor.cf -published: true --- [%CFEngine_library_include(lib/monitor)%] diff --git a/reference/masterfiles-policy-framework/lib-packages.markdown b/content/reference/masterfiles-policy-framework/lib-packages.markdown similarity index 93% rename from reference/masterfiles-policy-framework/lib-packages.markdown rename to content/reference/masterfiles-policy-framework/lib-packages.markdown index 7a7f0fbda..175480b9e 100644 --- a/reference/masterfiles-policy-framework/lib-packages.markdown +++ b/content/reference/masterfiles-policy-framework/lib-packages.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/packages.cf -published: true --- See the [`packages` promises][packages] documentation for a diff --git a/reference/masterfiles-policy-framework/lib-paths.markdown b/content/reference/masterfiles-policy-framework/lib-paths.markdown similarity index 84% rename from reference/masterfiles-policy-framework/lib-paths.markdown rename to content/reference/masterfiles-policy-framework/lib-paths.markdown index 697d24b35..2399f21fa 100644 --- a/reference/masterfiles-policy-framework/lib-paths.markdown +++ b/content/reference/masterfiles-policy-framework/lib-paths.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/paths.cf -published: true --- [%CFEngine_library_include(lib/paths)%] diff --git a/reference/masterfiles-policy-framework/lib-processes.markdown b/content/reference/masterfiles-policy-framework/lib-processes.markdown similarity index 93% rename from reference/masterfiles-policy-framework/lib-processes.markdown rename to content/reference/masterfiles-policy-framework/lib-processes.markdown index cf237bc4e..2e03d83f5 100644 --- a/reference/masterfiles-policy-framework/lib-processes.markdown +++ b/content/reference/masterfiles-policy-framework/lib-processes.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/processes.cf -published: true --- See the [`processes` promises][processes] documentation for a diff --git a/reference/masterfiles-policy-framework/lib-reports.markdown b/content/reference/masterfiles-policy-framework/lib-reports.markdown similarity index 84% rename from reference/masterfiles-policy-framework/lib-reports.markdown rename to content/reference/masterfiles-policy-framework/lib-reports.markdown index eb84d830d..740b0795b 100644 --- a/reference/masterfiles-policy-framework/lib-reports.markdown +++ b/content/reference/masterfiles-policy-framework/lib-reports.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/reports.cf -published: true --- [%CFEngine_library_include(lib/reports)%] diff --git a/reference/masterfiles-policy-framework/lib-services.markdown b/content/reference/masterfiles-policy-framework/lib-services.markdown similarity index 93% rename from reference/masterfiles-policy-framework/lib-services.markdown rename to content/reference/masterfiles-policy-framework/lib-services.markdown index b00f1f361..df38393fb 100644 --- a/reference/masterfiles-policy-framework/lib-services.markdown +++ b/content/reference/masterfiles-policy-framework/lib-services.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/services.cf -published: true --- See the [`services` promises][services] documentation for a diff --git a/reference/masterfiles-policy-framework/lib-stdlib.markdown b/content/reference/masterfiles-policy-framework/lib-stdlib.markdown similarity index 84% rename from reference/masterfiles-policy-framework/lib-stdlib.markdown rename to content/reference/masterfiles-policy-framework/lib-stdlib.markdown index 4f83a5bec..8d69dc906 100644 --- a/reference/masterfiles-policy-framework/lib-stdlib.markdown +++ b/content/reference/masterfiles-policy-framework/lib-stdlib.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/stdlib.cf -published: true --- [%CFEngine_library_include(lib/stdlib)%] diff --git a/reference/masterfiles-policy-framework/lib-storage.markdown b/content/reference/masterfiles-policy-framework/lib-storage.markdown similarity index 93% rename from reference/masterfiles-policy-framework/lib-storage.markdown rename to content/reference/masterfiles-policy-framework/lib-storage.markdown index 3bf6bedb0..d438c779a 100644 --- a/reference/masterfiles-policy-framework/lib-storage.markdown +++ b/content/reference/masterfiles-policy-framework/lib-storage.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/storage.cf -published: true --- See the [`storage` promises][storage] documentation for a diff --git a/reference/masterfiles-policy-framework/lib-testing.markdown b/content/reference/masterfiles-policy-framework/lib-testing.markdown similarity index 93% rename from reference/masterfiles-policy-framework/lib-testing.markdown rename to content/reference/masterfiles-policy-framework/lib-testing.markdown index 68b7c5a5c..96dc2f299 100644 --- a/reference/masterfiles-policy-framework/lib-testing.markdown +++ b/content/reference/masterfiles-policy-framework/lib-testing.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/testing.cf -published: true --- The `testing.cf` library provides bundles for working testing frameworks like diff --git a/reference/masterfiles-policy-framework/lib-users.markdown b/content/reference/masterfiles-policy-framework/lib-users.markdown similarity index 92% rename from reference/masterfiles-policy-framework/lib-users.markdown rename to content/reference/masterfiles-policy-framework/lib-users.markdown index a2dad9617..ee26609df 100644 --- a/reference/masterfiles-policy-framework/lib-users.markdown +++ b/content/reference/masterfiles-policy-framework/lib-users.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/users.cf -published: true --- See the [`users` promises][users] documentation for a diff --git a/reference/masterfiles-policy-framework/lib-vcs.markdown b/content/reference/masterfiles-policy-framework/lib-vcs.markdown similarity index 90% rename from reference/masterfiles-policy-framework/lib-vcs.markdown rename to content/reference/masterfiles-policy-framework/lib-vcs.markdown index 7bb9874da..4868ef8f4 100644 --- a/reference/masterfiles-policy-framework/lib-vcs.markdown +++ b/content/reference/masterfiles-policy-framework/lib-vcs.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/vcs.cf -published: true --- The `vcs.cf` library provides bundles for working with version control tools. diff --git a/reference/masterfiles-policy-framework/lib.markdown b/content/reference/masterfiles-policy-framework/lib.markdown similarity index 96% rename from reference/masterfiles-policy-framework/lib.markdown rename to content/reference/masterfiles-policy-framework/lib.markdown index 86e8e78a0..3ff508b38 100644 --- a/reference/masterfiles-policy-framework/lib.markdown +++ b/content/reference/masterfiles-policy-framework/lib.markdown @@ -1,7 +1,6 @@ --- layout: default title: lib/ -published: true --- This directory contains the standard library aka COPBL or the Community Open diff --git a/reference/masterfiles-policy-framework/modules-mustache.markdown b/content/reference/masterfiles-policy-framework/modules-mustache.markdown similarity index 88% rename from reference/masterfiles-policy-framework/modules-mustache.markdown rename to content/reference/masterfiles-policy-framework/modules-mustache.markdown index 65725c239..1d2cbb53b 100644 --- a/reference/masterfiles-policy-framework/modules-mustache.markdown +++ b/content/reference/masterfiles-policy-framework/modules-mustache.markdown @@ -1,7 +1,6 @@ --- layout: default title: modules/mustache/ -published: true --- [%CFEngine_include_markdown(../../masterfiles/modules/mustache/README.md)%] diff --git a/reference/masterfiles-policy-framework/modules-packages-vendored.markdown b/content/reference/masterfiles-policy-framework/modules-packages-vendored.markdown similarity index 94% rename from reference/masterfiles-policy-framework/modules-packages-vendored.markdown rename to content/reference/masterfiles-policy-framework/modules-packages-vendored.markdown index ae39f8663..d14fda5c7 100644 --- a/reference/masterfiles-policy-framework/modules-packages-vendored.markdown +++ b/content/reference/masterfiles-policy-framework/modules-packages-vendored.markdown @@ -1,6 +1,5 @@ --- layout: default title: modules/packages/vendored/ -published: true --- This directory tree is used for distributing package modules that are rendered into place with mustache. The modules found here are rendered into place if no plain copy is found in the parent directory. diff --git a/reference/masterfiles-policy-framework/modules-packages.markdown b/content/reference/masterfiles-policy-framework/modules-packages.markdown similarity index 96% rename from reference/masterfiles-policy-framework/modules-packages.markdown rename to content/reference/masterfiles-policy-framework/modules-packages.markdown index cef683896..ffb0baa79 100644 --- a/reference/masterfiles-policy-framework/modules-packages.markdown +++ b/content/reference/masterfiles-policy-framework/modules-packages.markdown @@ -1,7 +1,6 @@ --- layout: default title: modules/packages/ -published: true --- This directory tree is used for distributing package modules. diff --git a/reference/masterfiles-policy-framework/modules-promises-cfengine.py.markdown b/content/reference/masterfiles-policy-framework/modules-promises-cfengine.py.markdown similarity index 78% rename from reference/masterfiles-policy-framework/modules-promises-cfengine.py.markdown rename to content/reference/masterfiles-policy-framework/modules-promises-cfengine.py.markdown index 2c1fe9774..27257e1d5 100644 --- a/reference/masterfiles-policy-framework/modules-promises-cfengine.py.markdown +++ b/content/reference/masterfiles-policy-framework/modules-promises-cfengine.py.markdown @@ -1,10 +1,8 @@ --- layout: default title: modules/promises/cfengine.py -published: true --- -{% raw %} + ``` [%CFEngine_include_markdown(../../masterfiles/modules/promises/cfengine.py)%] ``` -{% endraw %} diff --git a/reference/masterfiles-policy-framework/modules-promises-cfengine.sh.markdown b/content/reference/masterfiles-policy-framework/modules-promises-cfengine.sh.markdown similarity index 78% rename from reference/masterfiles-policy-framework/modules-promises-cfengine.sh.markdown rename to content/reference/masterfiles-policy-framework/modules-promises-cfengine.sh.markdown index bc94fa43c..64a92c284 100644 --- a/reference/masterfiles-policy-framework/modules-promises-cfengine.sh.markdown +++ b/content/reference/masterfiles-policy-framework/modules-promises-cfengine.sh.markdown @@ -1,10 +1,8 @@ --- layout: default title: modules/promises/cfengine.sh -published: true --- -{% raw %} + ``` [%CFEngine_include_markdown(../../masterfiles/modules/promises/cfengine.sh)%] ``` -{% endraw %} diff --git a/reference/masterfiles-policy-framework/modules-promises.markdown b/content/reference/masterfiles-policy-framework/modules-promises.markdown similarity index 96% rename from reference/masterfiles-policy-framework/modules-promises.markdown rename to content/reference/masterfiles-policy-framework/modules-promises.markdown index 66e7f2467..bc847ce73 100644 --- a/reference/masterfiles-policy-framework/modules-promises.markdown +++ b/content/reference/masterfiles-policy-framework/modules-promises.markdown @@ -1,7 +1,6 @@ --- layout: default title: modules/promises/ -published: true --- This directory tree is used for distributing promise modules and supporting libraries. diff --git a/reference/masterfiles-policy-framework/modules.markdown b/content/reference/masterfiles-policy-framework/modules.markdown similarity index 96% rename from reference/masterfiles-policy-framework/modules.markdown rename to content/reference/masterfiles-policy-framework/modules.markdown index df704fb7e..c52a6129e 100644 --- a/reference/masterfiles-policy-framework/modules.markdown +++ b/content/reference/masterfiles-policy-framework/modules.markdown @@ -1,7 +1,6 @@ --- layout: default title: modules/ -published: true --- This directory tree is used for distributing Modules. The [packages subtree][modules/packages/] is used for vendoring packages modules and the [promises sub-directory][modules/promises/] is used for promise modules, including the libraries used by promise modules. diff --git a/reference/masterfiles-policy-framework/no-distrib.markdown b/content/reference/masterfiles-policy-framework/no-distrib.markdown similarity index 88% rename from reference/masterfiles-policy-framework/no-distrib.markdown rename to content/reference/masterfiles-policy-framework/no-distrib.markdown index 36665ab5a..ff6379274 100644 --- a/reference/masterfiles-policy-framework/no-distrib.markdown +++ b/content/reference/masterfiles-policy-framework/no-distrib.markdown @@ -1,7 +1,6 @@ --- layout: default title: .no-distrib/ -published: true sorting: 20 --- diff --git a/reference/masterfiles-policy-framework/promises.markdown b/content/reference/masterfiles-policy-framework/promises.markdown similarity index 95% rename from reference/masterfiles-policy-framework/promises.markdown rename to content/reference/masterfiles-policy-framework/promises.markdown index 6b4a4c716..444001775 100644 --- a/reference/masterfiles-policy-framework/promises.markdown +++ b/content/reference/masterfiles-policy-framework/promises.markdown @@ -1,7 +1,6 @@ --- layout: default title: promises.cf -published: true sorting: 10 --- diff --git a/reference/masterfiles-policy-framework/services-autorun.markdown b/content/reference/masterfiles-policy-framework/services-autorun.markdown similarity index 88% rename from reference/masterfiles-policy-framework/services-autorun.markdown rename to content/reference/masterfiles-policy-framework/services-autorun.markdown index 0492c5617..372765cc2 100644 --- a/reference/masterfiles-policy-framework/services-autorun.markdown +++ b/content/reference/masterfiles-policy-framework/services-autorun.markdown @@ -1,7 +1,6 @@ --- layout: default title: services/autorun/ -published: true --- [%CFEngine_include_markdown(../../masterfiles/services/autorun/README.md)%] diff --git a/reference/masterfiles-policy-framework/services-main.markdown b/content/reference/masterfiles-policy-framework/services-main.markdown similarity index 87% rename from reference/masterfiles-policy-framework/services-main.markdown rename to content/reference/masterfiles-policy-framework/services-main.markdown index 6db4bdbbe..1d8b04050 100644 --- a/reference/masterfiles-policy-framework/services-main.markdown +++ b/content/reference/masterfiles-policy-framework/services-main.markdown @@ -1,7 +1,6 @@ --- layout: default title: services/main.cf -published: true --- This directory is the suggested place to add your custom policies. diff --git a/reference/masterfiles-policy-framework/services.markdown b/content/reference/masterfiles-policy-framework/services.markdown similarity index 87% rename from reference/masterfiles-policy-framework/services.markdown rename to content/reference/masterfiles-policy-framework/services.markdown index c52e5dc05..d349e478c 100644 --- a/reference/masterfiles-policy-framework/services.markdown +++ b/content/reference/masterfiles-policy-framework/services.markdown @@ -1,7 +1,6 @@ --- layout: default title: services/ -published: true --- This directory is the suggested place to add your custom policies. diff --git a/reference/masterfiles-policy-framework/standalone_self_upgrade.markdown b/content/reference/masterfiles-policy-framework/standalone_self_upgrade.markdown similarity index 97% rename from reference/masterfiles-policy-framework/standalone_self_upgrade.markdown rename to content/reference/masterfiles-policy-framework/standalone_self_upgrade.markdown index ccb085a12..8bc9de36e 100644 --- a/reference/masterfiles-policy-framework/standalone_self_upgrade.markdown +++ b/content/reference/masterfiles-policy-framework/standalone_self_upgrade.markdown @@ -1,7 +1,6 @@ --- layout: default title: standalone_self_upgrade.cf -published: true sorting: 30 --- diff --git a/reference/masterfiles-policy-framework/update.markdown b/content/reference/masterfiles-policy-framework/update.markdown similarity index 93% rename from reference/masterfiles-policy-framework/update.markdown rename to content/reference/masterfiles-policy-framework/update.markdown index 8a011331c..d9f91ba09 100644 --- a/reference/masterfiles-policy-framework/update.markdown +++ b/content/reference/masterfiles-policy-framework/update.markdown @@ -1,7 +1,6 @@ --- layout: default title: update.cf -published: true sorting: 20 --- diff --git a/reference/promise-types.markdown b/content/reference/promise-types/_index.markdown similarity index 99% rename from reference/promise-types.markdown rename to content/reference/promise-types/_index.markdown index 94a67f377..66c12e904 100644 --- a/reference/promise-types.markdown +++ b/content/reference/promise-types/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Promise types -published: true sorting: 20 --- diff --git a/reference/promise-types/access.markdown b/content/reference/promise-types/access.markdown similarity index 99% rename from reference/promise-types/access.markdown rename to content/reference/promise-types/access.markdown index 6a18fb26b..0b54ad66e 100644 --- a/reference/promise-types/access.markdown +++ b/content/reference/promise-types/access.markdown @@ -1,7 +1,6 @@ --- layout: default title: access -published: true --- Access promises are conditional promises made by resources living on the server. diff --git a/reference/promise-types/classes.markdown b/content/reference/promise-types/classes.markdown similarity index 99% rename from reference/promise-types/classes.markdown rename to content/reference/promise-types/classes.markdown index 57b1233d9..7f3627984 100644 --- a/reference/promise-types/classes.markdown +++ b/content/reference/promise-types/classes.markdown @@ -1,7 +1,6 @@ --- layout: default title: classes -published: true --- [Classes][classes] promises may be made in any bundle. Classes defined by @@ -25,9 +24,9 @@ classes: - The promiser is automatically canonified when classes are defined. - Classes are not automatically canonified when checked. -{% raw %} + [%CFEngine_include_example(class-automatic-canonificiation.cf)%] -{% endraw %} + - The term ```class``` and ```context``` are sometimes used interchangeably. - The following attributes to make a complete promise. diff --git a/reference/promise-types/commands.markdown b/content/reference/promise-types/commands.markdown similarity index 99% rename from reference/promise-types/commands.markdown rename to content/reference/promise-types/commands.markdown index 09026d65d..e41e875ad 100644 --- a/reference/promise-types/commands.markdown +++ b/content/reference/promise-types/commands.markdown @@ -1,7 +1,6 @@ --- layout: default title: commands -published: true --- Commands and [processes][processes] are separated cleanly. Restarting of @@ -91,7 +90,7 @@ continue. ## Attributes -[%CFEngine_include_markdown(common-attributes-include.markdown)%] +[%CFEngine_include_markdown(common-attributes.include.markdown)%] ### args diff --git a/reference/promise-types/custom.markdown b/content/reference/promise-types/custom.markdown similarity index 99% rename from reference/promise-types/custom.markdown rename to content/reference/promise-types/custom.markdown index 4b175245d..05818e64a 100644 --- a/reference/promise-types/custom.markdown +++ b/content/reference/promise-types/custom.markdown @@ -1,7 +1,6 @@ --- layout: default title: custom -published: true --- Custom promise types can be added as _Promise modules_. diff --git a/reference/promise-types/databases.markdown b/content/reference/promise-types/databases.markdown similarity index 99% rename from reference/promise-types/databases.markdown rename to content/reference/promise-types/databases.markdown index 105429b28..55c6edad2 100644 --- a/reference/promise-types/databases.markdown +++ b/content/reference/promise-types/databases.markdown @@ -1,7 +1,6 @@ --- layout: default title: databases -published: true sorting: 9999 --- @@ -150,7 +149,7 @@ a hierarchy of depth 1. ## Attributes -[%CFEngine_include_markdown(common-attributes-include.markdown)%] +[%CFEngine_include_markdown(common-attributes.include.markdown)%] ### database_server diff --git a/reference/promise-types/defaults.markdown b/content/reference/promise-types/defaults.markdown similarity index 99% rename from reference/promise-types/defaults.markdown rename to content/reference/promise-types/defaults.markdown index 17a2916de..544792a32 100644 --- a/reference/promise-types/defaults.markdown +++ b/content/reference/promise-types/defaults.markdown @@ -1,7 +1,6 @@ --- layout: default title: defaults -published: true --- Defaults promises are related to [variables][variables]. If a variable or diff --git a/reference/promise-types/filelogic.png b/content/reference/promise-types/filelogic.png similarity index 100% rename from reference/promise-types/filelogic.png rename to content/reference/promise-types/filelogic.png diff --git a/reference/promise-types/files.markdown b/content/reference/promise-types/files/_index.markdown similarity index 98% rename from reference/promise-types/files.markdown rename to content/reference/promise-types/files/_index.markdown index abb222bd5..d25289a3a 100644 --- a/reference/promise-types/files.markdown +++ b/content/reference/promise-types/files/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: files -published: true --- Files promises manage all aspects of files. Presence, absence, file content, permissions, and ownership. File content can be fully or partially managed. @@ -317,7 +316,7 @@ alter such a socket. This is a known issue, documented in ## Attributes -[%CFEngine_include_markdown(common-attributes-include.markdown)%] +[%CFEngine_include_markdown(common-attributes.include.markdown)%] ### acl @@ -1404,9 +1403,9 @@ verify => "true"; **Example:** -{%raw%} + [%CFEngine_include_example(files_content.cf)%] -{%endraw%} + **History:** Was introduced in 3.16.0 @@ -2033,10 +2032,10 @@ bundle agent example **Example:** -{% comment %} This example contains mustache, so it needs to be wrapped in raw or else it won't render as desired.{% endcomment %} -{% raw %} + + [%CFEngine_include_example(template_method-inline_mustache.cf)%] -{% endraw %} + **History:** Was introduced in 3.12.0 @@ -3179,10 +3178,10 @@ for `inline_mustache` and `mustache`. For mustache explanation see **Example:** -{% comment %} This example contains mustache, so it needs to be wrapped in raw or else it won't render as desired.{% endcomment %} -{% raw %} + + [%CFEngine_include_example(template_method-inline_mustache.cf)%] -{% endraw %} + **History:** Was introduced in 3.12.0 @@ -3213,28 +3212,28 @@ currently supported. ##### template_method mustache Variables -The most basic tag type is the variable. A {%raw%}```{{name}}```{%endraw%} tag in a basic +The most basic tag type is the variable. A ```{{name}}``` tag in a basic template will try to find the name key in the current context. If there is no name key, the parent contexts will be checked recursively. If the top context is reached and the name key is still not found, nothing will be rendered. **All variables are HTML escaped by default**. If you want to return unescaped -HTML, use the triple mustache: {%raw%}```{{{name}}}```{%endraw%} or an ampersand -({%raw%}```{{& name}}```{%endraw%}). +HTML, use the triple mustache: ```{{{name}}}``` or an ampersand +(```{{& name}}```). A variable "miss" returns an empty string. -{%raw%} + [%CFEngine_include_example(mustache_variables.cf)%] -{%endraw%} + ##### template_method mustache Sections Sections render blocks of text one or more times, depending on the value of the key in the current context. -A section begins with a pound and ends with a slash. That is, {%raw%}```{{#key}}```{%endraw%} -begins a "person" section while {%raw%}```{{/key}}```{%endraw%} ends it. +A section begins with a pound and ends with a slash. That is, ```{{#key}}``` +begins a "person" section while ```{{/key}}``` ends it. The behavior of the section is determined by the value of the key. @@ -3243,89 +3242,89 @@ The behavior of the section is determined by the value of the key. If the key exists and has a value of false or an empty list, the HTML between the pound and slash will not be displayed. -{%raw%} + [%CFEngine_include_example(mustache_sections_empty_list.cf)%] -{%endraw%} + **Non-Empty Lists:** -{%raw%} + [%CFEngine_include_example(mustache_sections_non_empty_list.cf)%] -{%endraw%} + **Non-False Values:** When the value is non-false but not a list, it will be used as the context for a single rendering of the block. -{%raw%} + [%CFEngine_include_example(mustache_sections_non_false_value.cf)%] -{%endraw%} + ##### template_method mustache Inverted Sections An inverted section begins with a caret (hat) and ends with a slash. That is -{%raw%}```{{^key}}```{%endraw%} begins a "key" inverted section while -{%raw%}```{{/key}}```{%endraw%} ends it. +```{{^key}}``` begins a "key" inverted section while +```{{/key}}``` ends it. While sections can be used to render text one or more times based on the value of the key, inverted sections may render text once based on the inverse value of the key. That is, they will be rendered if the key doesn't exist, is false, or is an empty list. -{%raw%} + [%CFEngine_include_example(mustache_sections_inverted.cf)%] -{%endraw%} + ##### template_method mustache Comments Comments begin with a bang and are ignored. Comments may contain newlines. -{%raw%} + [%CFEngine_include_example(mustache_comments.cf)%] -{%endraw%} + ##### template_method mustache Set Delimiter Set Delimiter tags start with an equal sign and change the tag delimiters from -{%raw%}```{{```{%endraw%} and {%raw%}```}}```{%endraw%} to custom strings. +```{{``` and ```}}``` to custom strings. + -{%raw%} [%CFEngine_include_example(mustache_set_delimiters.cf)%] -{%endraw%} + ##### template_method mustache extensions The following are **CFEngine-specific extensions**. `-top-` special key representing the complete data given. Useful for iterating -over the top level of a container {%raw%}`{{#-top-}} ... {{/-top-}}`{%endraw%} +over the top level of a container `{{#-top-}} ... {{/-top-}}` and rendering json representation of data given with `$` and `%`. -{%raw%} + [%CFEngine_include_example(mustache_extension_top.cf)%] -{%endraw%} + `%` variable prefix causing data to be rendered as multi-line json representation. Like output from `storejson()`. -{%raw%} + [%CFEngine_include_example(mustache_extension_multiline_json.cf)%] -{%endraw%} + `$` variable prefix causing data to be rendered as compact json representation. Like output from `format()` with the ```%S``` format string. -{%raw%} + [%CFEngine_include_example(mustache_extension_compact_json.cf)%] -{%endraw%} + `@` expands the current key being iterated to complement the value as accessed with `.`. -{%raw%} + [%CFEngine_include_example(mustache_extension_expand_key.cf)%] -{%endraw%} + **See also:** `edit_template`, `template_data`, `datastate()` diff --git a/reference/promise-types/files/edit_line.markdown b/content/reference/promise-types/files/edit_line/_index.markdown similarity index 99% rename from reference/promise-types/files/edit_line.markdown rename to content/reference/promise-types/files/edit_line/_index.markdown index 28a01010e..7e19f502f 100644 --- a/reference/promise-types/files/edit_line.markdown +++ b/content/reference/promise-types/files/edit_line/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: edit_line -published: true --- Line based editing is a simple model for editing files. Before XML, and diff --git a/reference/promise-types/files/edit_line/delete_lines.markdown b/content/reference/promise-types/files/edit_line/delete_lines.markdown similarity index 99% rename from reference/promise-types/files/edit_line/delete_lines.markdown rename to content/reference/promise-types/files/edit_line/delete_lines.markdown index 3dce273f0..c505e3d3d 100644 --- a/reference/promise-types/files/edit_line/delete_lines.markdown +++ b/content/reference/promise-types/files/edit_line/delete_lines.markdown @@ -1,7 +1,6 @@ --- layout: default title: delete_lines -published: true --- This promise assures that certain lines exactly matching regular diff --git a/reference/promise-types/files/edit_line/field_edits.markdown b/content/reference/promise-types/files/edit_line/field_edits.markdown similarity index 99% rename from reference/promise-types/files/edit_line/field_edits.markdown rename to content/reference/promise-types/files/edit_line/field_edits.markdown index b7153b5b9..b50f13074 100644 --- a/reference/promise-types/files/edit_line/field_edits.markdown +++ b/content/reference/promise-types/files/edit_line/field_edits.markdown @@ -1,7 +1,6 @@ --- layout: default title: field_edits -published: true --- Certain types of text files are tabular in nature, with field separators (e.g. diff --git a/reference/promise-types/files/edit_line/insert_lines.markdown b/content/reference/promise-types/files/edit_line/insert_lines.markdown similarity index 99% rename from reference/promise-types/files/edit_line/insert_lines.markdown rename to content/reference/promise-types/files/edit_line/insert_lines.markdown index 586fe0f31..a602e80de 100644 --- a/reference/promise-types/files/edit_line/insert_lines.markdown +++ b/content/reference/promise-types/files/edit_line/insert_lines.markdown @@ -1,7 +1,6 @@ --- layout: default title: insert_lines -published: true --- This promise type is part of the line-editing model. It inserts lines into diff --git a/reference/promise-types/files/edit_line/replace_patterns.markdown b/content/reference/promise-types/files/edit_line/replace_patterns.markdown similarity index 99% rename from reference/promise-types/files/edit_line/replace_patterns.markdown rename to content/reference/promise-types/files/edit_line/replace_patterns.markdown index 4072f2b3a..9f5317098 100644 --- a/reference/promise-types/files/edit_line/replace_patterns.markdown +++ b/content/reference/promise-types/files/edit_line/replace_patterns.markdown @@ -1,7 +1,6 @@ --- layout: default title: replace_patterns -published: true --- This promise refers to arbitrary text patterns in a file. The pattern is diff --git a/reference/promise-types/files/edit_xml.markdown b/content/reference/promise-types/files/edit_xml/_index.markdown similarity index 99% rename from reference/promise-types/files/edit_xml.markdown rename to content/reference/promise-types/files/edit_xml/_index.markdown index 4a726286b..8eaec5ff6 100644 --- a/reference/promise-types/files/edit_xml.markdown +++ b/content/reference/promise-types/files/edit_xml/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: edit_xml -published: true --- The use of XML documents in systems configuration is widespread. XML diff --git a/reference/promise-types/files/edit_xml/build_xpath.markdown b/content/reference/promise-types/files/edit_xml/build_xpath.markdown similarity index 98% rename from reference/promise-types/files/edit_xml/build_xpath.markdown rename to content/reference/promise-types/files/edit_xml/build_xpath.markdown index b681b3988..05442cdf9 100644 --- a/reference/promise-types/files/edit_xml/build_xpath.markdown +++ b/content/reference/promise-types/files/edit_xml/build_xpath.markdown @@ -1,7 +1,6 @@ --- layout: default title: build_xpath -published: true --- This promise type assures that a balanced XML tree, described by the given diff --git a/reference/promise-types/files/edit_xml/delete_attribute.markdown b/content/reference/promise-types/files/edit_xml/delete_attribute.markdown similarity index 98% rename from reference/promise-types/files/edit_xml/delete_attribute.markdown rename to content/reference/promise-types/files/edit_xml/delete_attribute.markdown index 61ba3870d..490915c6c 100644 --- a/reference/promise-types/files/edit_xml/delete_attribute.markdown +++ b/content/reference/promise-types/files/edit_xml/delete_attribute.markdown @@ -1,7 +1,6 @@ --- layout: default title: delete_attribute -published: true --- This promise type assures that an attribute, with the given name, will not be diff --git a/reference/promise-types/files/edit_xml/delete_text.markdown b/content/reference/promise-types/files/edit_xml/delete_text.markdown similarity index 98% rename from reference/promise-types/files/edit_xml/delete_text.markdown rename to content/reference/promise-types/files/edit_xml/delete_text.markdown index ea9412f02..b0ed58bab 100644 --- a/reference/promise-types/files/edit_xml/delete_text.markdown +++ b/content/reference/promise-types/files/edit_xml/delete_text.markdown @@ -1,7 +1,6 @@ --- layout: default title: delete_text -published: true --- This promise type assures that a value string, containing the matching diff --git a/reference/promise-types/files/edit_xml/delete_tree.markdown b/content/reference/promise-types/files/edit_xml/delete_tree.markdown similarity index 97% rename from reference/promise-types/files/edit_xml/delete_tree.markdown rename to content/reference/promise-types/files/edit_xml/delete_tree.markdown index e953a42dd..19f5be156 100644 --- a/reference/promise-types/files/edit_xml/delete_tree.markdown +++ b/content/reference/promise-types/files/edit_xml/delete_tree.markdown @@ -1,7 +1,6 @@ --- layout: default title: delete_tree -published: true --- This promise type assures that a balanced XML tree, containing the matching diff --git a/reference/promise-types/files/edit_xml/insert_text.markdown b/content/reference/promise-types/files/edit_xml/insert_text.markdown similarity index 98% rename from reference/promise-types/files/edit_xml/insert_text.markdown rename to content/reference/promise-types/files/edit_xml/insert_text.markdown index 7d5694ceb..f424014f9 100644 --- a/reference/promise-types/files/edit_xml/insert_text.markdown +++ b/content/reference/promise-types/files/edit_xml/insert_text.markdown @@ -1,7 +1,6 @@ --- layout: default title: insert_text -published: true --- This proimse type assures that a value string, containing the matching diff --git a/reference/promise-types/files/edit_xml/insert_tree.markdown b/content/reference/promise-types/files/edit_xml/insert_tree.markdown similarity index 97% rename from reference/promise-types/files/edit_xml/insert_tree.markdown rename to content/reference/promise-types/files/edit_xml/insert_tree.markdown index 2c9d2f707..e45d395ec 100644 --- a/reference/promise-types/files/edit_xml/insert_tree.markdown +++ b/content/reference/promise-types/files/edit_xml/insert_tree.markdown @@ -1,7 +1,6 @@ --- layout: default title: insert_tree -published: true --- This promise type assures that a diff --git a/reference/promise-types/files/edit_xml/set_attribute.markdown b/content/reference/promise-types/files/edit_xml/set_attribute.markdown similarity index 98% rename from reference/promise-types/files/edit_xml/set_attribute.markdown rename to content/reference/promise-types/files/edit_xml/set_attribute.markdown index dade549e4..5980d2c23 100644 --- a/reference/promise-types/files/edit_xml/set_attribute.markdown +++ b/content/reference/promise-types/files/edit_xml/set_attribute.markdown @@ -1,7 +1,6 @@ --- layout: default title: set_attribute -published: true --- This promise type assures that an attribute, with the given name and value, will diff --git a/reference/promise-types/files/edit_xml/set_text.markdown b/content/reference/promise-types/files/edit_xml/set_text.markdown similarity index 98% rename from reference/promise-types/files/edit_xml/set_text.markdown rename to content/reference/promise-types/files/edit_xml/set_text.markdown index 97dd1b331..65629934c 100644 --- a/reference/promise-types/files/edit_xml/set_text.markdown +++ b/content/reference/promise-types/files/edit_xml/set_text.markdown @@ -1,7 +1,6 @@ --- layout: default title: set_text -published: true --- This promise type assures that a matching value string will be present in the diff --git a/content/reference/promise-types/files/filelogic.png b/content/reference/promise-types/files/filelogic.png new file mode 100644 index 000000000..01835571c Binary files /dev/null and b/content/reference/promise-types/files/filelogic.png differ diff --git a/reference/promise-types/guest_environments.markdown b/content/reference/promise-types/guest_environments.markdown similarity index 99% rename from reference/promise-types/guest_environments.markdown rename to content/reference/promise-types/guest_environments.markdown index aa943348f..d7370b402 100644 --- a/reference/promise-types/guest_environments.markdown +++ b/content/reference/promise-types/guest_environments.markdown @@ -1,7 +1,6 @@ --- layout: default title: guest_environments -published: true sorting: 9999 --- @@ -53,7 +52,7 @@ CFEngine currently provides a convergent interface to *libvirt*. ## Attributes -[%CFEngine_include_markdown(common-attributes-include.markdown)%] +[%CFEngine_include_markdown(common-attributes.include.markdown)%] ### environment_host diff --git a/reference/promise-types/measurements.markdown b/content/reference/promise-types/measurements.markdown similarity index 99% rename from reference/promise-types/measurements.markdown rename to content/reference/promise-types/measurements.markdown index 8a6d2cbb6..986228b45 100644 --- a/reference/promise-types/measurements.markdown +++ b/content/reference/promise-types/measurements.markdown @@ -1,7 +1,6 @@ --- layout: default title: measurements -published: true --- By default, CFEngine's monitoring component `cf-monitord` records performance diff --git a/reference/promise-types/meta.markdown b/content/reference/promise-types/meta.markdown similarity index 97% rename from reference/promise-types/meta.markdown rename to content/reference/promise-types/meta.markdown index 09e639164..311e7b7fe 100644 --- a/reference/promise-types/meta.markdown +++ b/content/reference/promise-types/meta.markdown @@ -1,7 +1,6 @@ --- layout: default title: meta -published: true --- Meta-data promises have no internal function. They are intended to be used to diff --git a/reference/promise-types/methods.markdown b/content/reference/promise-types/methods.markdown similarity index 98% rename from reference/promise-types/methods.markdown rename to content/reference/promise-types/methods.markdown index 1db1a1c05..40506762a 100644 --- a/reference/promise-types/methods.markdown +++ b/content/reference/promise-types/methods.markdown @@ -1,7 +1,6 @@ --- layout: default title: methods -published: true --- Methods are compound promises that refer to whole bundles of promises. @@ -115,7 +114,7 @@ Output: ## Attributes -[%CFEngine_include_markdown(common-attributes-include.markdown)%] +[%CFEngine_include_markdown(common-attributes.include.markdown)%] ### inherit diff --git a/reference/promise-types/packages-deprecated.markdown b/content/reference/promise-types/packages-deprecated.markdown similarity index 99% rename from reference/promise-types/packages-deprecated.markdown rename to content/reference/promise-types/packages-deprecated.markdown index ebf423999..ca6fa1260 100644 --- a/reference/promise-types/packages-deprecated.markdown +++ b/content/reference/promise-types/packages-deprecated.markdown @@ -1,7 +1,6 @@ --- layout: default title: packages (deprecated) -published: true --- **NOTE:** This package promise is deprecated and has been superseded by @@ -233,7 +232,7 @@ does not come with package bodies for that platform. ## Attributes -[%CFEngine_include_markdown(common-attributes-include.markdown)%] +[%CFEngine_include_markdown(common-attributes.include.markdown)%] ### package_architectures diff --git a/reference/promise-types/packages.markdown b/content/reference/promise-types/packages.markdown similarity index 99% rename from reference/promise-types/packages.markdown rename to content/reference/promise-types/packages.markdown index 1514d7fc3..7c6656b55 100644 --- a/reference/promise-types/packages.markdown +++ b/content/reference/promise-types/packages.markdown @@ -1,7 +1,6 @@ --- layout: default title: packages -published: true --- CFEngine 3.7 and later supports package management through a simple promise @@ -92,7 +91,7 @@ string needs to be a bare package name, you cannot use a file name for this. ## Attributes -[%CFEngine_include_markdown(common-attributes-include.markdown)%] +[%CFEngine_include_markdown(common-attributes.include.markdown)%] ### architecture diff --git a/reference/promise-types/processes.markdown b/content/reference/promise-types/processes.markdown similarity index 99% rename from reference/promise-types/processes.markdown rename to content/reference/promise-types/processes.markdown index 1eea1d413..119edc1ca 100644 --- a/reference/promise-types/processes.markdown +++ b/content/reference/promise-types/processes.markdown @@ -1,7 +1,6 @@ --- layout: default title: processes -published: true --- Process promises refer to items in the system process table, i.e., a command in @@ -92,7 +91,7 @@ commands: ## Attributes -[%CFEngine_include_markdown(common-attributes-include.markdown)%] +[%CFEngine_include_markdown(common-attributes.include.markdown)%] ### process_count diff --git a/reference/promise-types/promise-types-services-winservice-properties_name.png b/content/reference/promise-types/promise-types-services-winservice-properties_name.png similarity index 100% rename from reference/promise-types/promise-types-services-winservice-properties_name.png rename to content/reference/promise-types/promise-types-services-winservice-properties_name.png diff --git a/reference/promise-types/reports.markdown b/content/reference/promise-types/reports.markdown similarity index 96% rename from reference/promise-types/reports.markdown rename to content/reference/promise-types/reports.markdown index 89721174e..e67e56e98 100644 --- a/reference/promise-types/reports.markdown +++ b/content/reference/promise-types/reports.markdown @@ -1,7 +1,6 @@ --- layout: default title: reports -published: true --- Reports promises simply print messages. Outputting a message without @@ -11,9 +10,9 @@ reports are guarded appropriately. [%CFEngine_include_example(reports.cf)%] -{% comment %} TODO: Should link to a page that describes all CFEngine output + Messages output by report promises are prefixed with the letter R to distinguish them from other output. @@ -72,7 +71,7 @@ R: found class: report_not_repaired ## Attributes -[%CFEngine_include_markdown(common-attributes-include.markdown)%] +[%CFEngine_include_markdown(common-attributes.include.markdown)%] ### friend_pattern diff --git a/reference/promise-types/roles.markdown b/content/reference/promise-types/roles.markdown similarity index 99% rename from reference/promise-types/roles.markdown rename to content/reference/promise-types/roles.markdown index cb15b489d..1cb6acd61 100644 --- a/reference/promise-types/roles.markdown +++ b/content/reference/promise-types/roles.markdown @@ -1,7 +1,6 @@ --- layout: default title: roles -published: true --- Roles promises are server-side decisions about which users are allowed diff --git a/reference/promise-types/services.markdown b/content/reference/promise-types/services.markdown similarity index 99% rename from reference/promise-types/services.markdown rename to content/reference/promise-types/services.markdown index 44510e7a1..7ede7f4ac 100644 --- a/reference/promise-types/services.markdown +++ b/content/reference/promise-types/services.markdown @@ -1,7 +1,6 @@ --- layout: default title: services -published: true --- `services` type promises in their simplest *generic* form are an abstraction on @@ -135,7 +134,7 @@ for services promises. ## Attributes -[%CFEngine_include_markdown(common-attributes-include.markdown)%] +[%CFEngine_include_markdown(common-attributes.include.markdown)%] ### service_policy diff --git a/reference/promise-types/storage.markdown b/content/reference/promise-types/storage.markdown similarity index 95% rename from reference/promise-types/storage.markdown rename to content/reference/promise-types/storage.markdown index 2a6fce414..2d27d9591 100644 --- a/reference/promise-types/storage.markdown +++ b/content/reference/promise-types/storage.markdown @@ -1,7 +1,6 @@ --- layout: default title: storage -published: true --- Storage promises refer to disks and filesystem properties. @@ -49,7 +48,7 @@ body mount nfs(server,source) ## Attributes -[%CFEngine_include_markdown(common-attributes-include.markdown)%] +[%CFEngine_include_markdown(common-attributes.include.markdown)%] ### mount @@ -84,7 +83,7 @@ body mount example **Type:** (menu option) **Allowed input range:** -{% comment %}cf-promises --syntax-description=json | jq '.bodyTypes.mount.attributes.mount_type.range|split(",")'{% endcomment %} + * `nfs` * `nfs2` diff --git a/reference/promise-types/users.markdown b/content/reference/promise-types/users.markdown similarity index 99% rename from reference/promise-types/users.markdown rename to content/reference/promise-types/users.markdown index c8f93465c..6e0c1f54a 100644 --- a/reference/promise-types/users.markdown +++ b/content/reference/promise-types/users.markdown @@ -1,7 +1,6 @@ --- layout: default title: users -published: true --- User promises are promises made about **local users** on a host. They @@ -45,7 +44,7 @@ users: ## Attributes -[%CFEngine_include_markdown(common-attributes-include.markdown)%] +[%CFEngine_include_markdown(common-attributes.include.markdown)%] ### description diff --git a/reference/promise-types/vars.markdown b/content/reference/promise-types/vars.markdown similarity index 99% rename from reference/promise-types/vars.markdown rename to content/reference/promise-types/vars.markdown index f7d9f2571..417c8a929 100644 --- a/reference/promise-types/vars.markdown +++ b/content/reference/promise-types/vars.markdown @@ -1,7 +1,6 @@ --- layout: default title: vars -published: true --- [Variables][variables] in CFEngine are defined diff --git a/reference/special-variables.markdown b/content/reference/special-variables/_index.markdown similarity index 98% rename from reference/special-variables.markdown rename to content/reference/special-variables/_index.markdown index a8ee0da46..4e4c9bb1c 100644 --- a/reference/special-variables.markdown +++ b/content/reference/special-variables/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Special variables -published: true sorting: 50 --- diff --git a/reference/special-variables/connection.markdown b/content/reference/special-variables/connection.markdown similarity index 99% rename from reference/special-variables/connection.markdown rename to content/reference/special-variables/connection.markdown index 253b45da8..9b80540af 100644 --- a/reference/special-variables/connection.markdown +++ b/content/reference/special-variables/connection.markdown @@ -1,7 +1,6 @@ --- layout: default title: connection -published: true --- The context `connection` is used by the `shortcut` attribute in `access` diff --git a/reference/special-variables/const.markdown b/content/reference/special-variables/const.markdown similarity index 99% rename from reference/special-variables/const.markdown rename to content/reference/special-variables/const.markdown index a523ffd75..ca764153a 100644 --- a/reference/special-variables/const.markdown +++ b/content/reference/special-variables/const.markdown @@ -1,7 +1,6 @@ --- layout: default title: const -published: true --- CFEngine defines a number of variables for embedding unprintable values diff --git a/reference/special-variables/def.markdown b/content/reference/special-variables/def.markdown similarity index 98% rename from reference/special-variables/def.markdown rename to content/reference/special-variables/def.markdown index a8aa32652..c95494dc7 100644 --- a/reference/special-variables/def.markdown +++ b/content/reference/special-variables/def.markdown @@ -1,7 +1,6 @@ --- layout: default title: def -published: true --- The context `def` is populated by the diff --git a/reference/special-variables/edit.markdown b/content/reference/special-variables/edit.markdown similarity index 98% rename from reference/special-variables/edit.markdown rename to content/reference/special-variables/edit.markdown index 4b0dffaee..a41095013 100644 --- a/reference/special-variables/edit.markdown +++ b/content/reference/special-variables/edit.markdown @@ -1,7 +1,6 @@ --- layout: default title: edit -published: true --- This context is used to access information about editing promises during diff --git a/reference/special-variables/match.markdown b/content/reference/special-variables/match.markdown similarity index 97% rename from reference/special-variables/match.markdown rename to content/reference/special-variables/match.markdown index 23b9d2d31..7edc444cb 100644 --- a/reference/special-variables/match.markdown +++ b/content/reference/special-variables/match.markdown @@ -1,7 +1,6 @@ --- layout: default title: match -published: true --- Each time CFEngine matches a string, these values are assigned to a special diff --git a/reference/special-variables/mon.markdown b/content/reference/special-variables/mon.markdown similarity index 99% rename from reference/special-variables/mon.markdown rename to content/reference/special-variables/mon.markdown index 126ff27c2..e47781e62 100644 --- a/reference/special-variables/mon.markdown +++ b/content/reference/special-variables/mon.markdown @@ -1,7 +1,6 @@ --- layout: default title: mon -published: true --- The variables discovered by `cf-monitord` are placed in this monitoring diff --git a/reference/special-variables/sys.markdown b/content/reference/special-variables/sys.markdown similarity index 99% rename from reference/special-variables/sys.markdown rename to content/reference/special-variables/sys.markdown index 2b08e3e5f..45129ab68 100644 --- a/reference/special-variables/sys.markdown +++ b/content/reference/special-variables/sys.markdown @@ -1,7 +1,6 @@ --- layout: default title: sys -published: true --- System variables are derived from CFEngine's automated discovery of system diff --git a/reference/special-variables/this.markdown b/content/reference/special-variables/this.markdown similarity index 99% rename from reference/special-variables/this.markdown rename to content/reference/special-variables/this.markdown index f355954c7..e1c25b333 100644 --- a/reference/special-variables/this.markdown +++ b/content/reference/special-variables/this.markdown @@ -1,7 +1,6 @@ --- layout: default title: this -published: true --- The context `this` is used to access information about promises during diff --git a/release-notes.markdown b/content/release-notes/_index.markdown similarity index 96% rename from release-notes.markdown rename to content/release-notes/_index.markdown index 3bb6bcb44..028fe70cc 100644 --- a/release-notes.markdown +++ b/content/release-notes/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Release notes -published: true sorting: 30 --- diff --git a/release-notes/known-issues.markdown b/content/release-notes/known-issues.markdown similarity index 99% rename from release-notes/known-issues.markdown rename to content/release-notes/known-issues.markdown index 85ba51b5c..34b831c74 100644 --- a/release-notes/known-issues.markdown +++ b/content/release-notes/known-issues.markdown @@ -2,7 +2,6 @@ layout: default title: Known issues sorting: 50 -published: true --- CFEngine defects are managed in our [bug tracker][bug tracker]. diff --git a/release-notes/legal-and-licenses.markdown b/content/release-notes/legal-and-licenses.markdown similarity index 99% rename from release-notes/legal-and-licenses.markdown rename to content/release-notes/legal-and-licenses.markdown index 6039938ed..13b5298c2 100644 --- a/release-notes/legal-and-licenses.markdown +++ b/content/release-notes/legal-and-licenses.markdown @@ -1,7 +1,6 @@ --- layout: default title: Legal and licenses -published: true sorting: 999 alias: legal.html --- diff --git a/release-notes/supported-platforms.markdown b/content/release-notes/supported-platforms.markdown similarity index 99% rename from release-notes/supported-platforms.markdown rename to content/release-notes/supported-platforms.markdown index 09de614b6..d63809450 100644 --- a/release-notes/supported-platforms.markdown +++ b/content/release-notes/supported-platforms.markdown @@ -2,7 +2,6 @@ layout: default title: Supported platforms and versions sorting: 20 -published: true --- CFEngine works on a wide range of platforms, and the CFEngine team strives to diff --git a/release-notes/whatsnew.markdown b/content/release-notes/whatsnew/_index.markdown similarity index 93% rename from release-notes/whatsnew.markdown rename to content/release-notes/whatsnew/_index.markdown index 94580d30e..6f27a3754 100644 --- a/release-notes/whatsnew.markdown +++ b/content/release-notes/whatsnew/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: New in CFEngine -published: true sorting: 10 --- diff --git a/release-notes/whatsnew/changelog-core.markdown b/content/release-notes/whatsnew/changelog-core.markdown similarity index 85% rename from release-notes/whatsnew/changelog-core.markdown rename to content/release-notes/whatsnew/changelog-core.markdown index 48b1b911d..9f880095f 100644 --- a/release-notes/whatsnew/changelog-core.markdown +++ b/content/release-notes/whatsnew/changelog-core.markdown @@ -1,14 +1,13 @@ --- layout: default title: Changelog -published: true sorting: 10 --- **See also:** [Enterprise changelog][Enterprise changelog], [Masterfiles changelog][Masterfiles changelog] 
-{% raw %}
+
 [%CFEngine_include_markdown(core/ChangeLog)%]
-{% endraw %}
+
diff --git a/release-notes/whatsnew/changelog-enterprise.markdown b/content/release-notes/whatsnew/changelog-enterprise.markdown similarity index 85% rename from release-notes/whatsnew/changelog-enterprise.markdown rename to content/release-notes/whatsnew/changelog-enterprise.markdown index 7e16a9ff0..7030f7b01 100644 --- a/release-notes/whatsnew/changelog-enterprise.markdown +++ b/content/release-notes/whatsnew/changelog-enterprise.markdown @@ -1,14 +1,13 @@ --- layout: default title: Enterprise changelog -published: true sorting: 30 --- **See also:** [Core changelog][Changelog], [Masterfiles changelog][Masterfiles changelog] 
-{% raw %}
+
 [%CFEngine_include_markdown(enterprise/ChangeLog.Enterprise)%]
-{% endraw %}
+
diff --git a/release-notes/whatsnew/changelog-masterfiles-policy-framework.markdown b/content/release-notes/whatsnew/changelog-masterfiles-policy-framework.markdown similarity index 85% rename from release-notes/whatsnew/changelog-masterfiles-policy-framework.markdown rename to content/release-notes/whatsnew/changelog-masterfiles-policy-framework.markdown index 66fa88380..9689db9a7 100644 --- a/release-notes/whatsnew/changelog-masterfiles-policy-framework.markdown +++ b/content/release-notes/whatsnew/changelog-masterfiles-policy-framework.markdown @@ -1,14 +1,13 @@ --- layout: default title: Masterfiles changelog -published: true sorting: 20 --- **See also:** [Core changelog][Changelog], [Enterprise changelog][Enterprise changelog] 
-{% raw %}
+
 [%CFEngine_include_markdown(masterfiles/CHANGELOG.md)%]
-{% endraw %}
+
diff --git a/resources.markdown b/content/resources/_index.markdown similarity index 76% rename from resources.markdown rename to content/resources/_index.markdown index cefdc3d1f..6ec84c814 100644 --- a/resources.markdown +++ b/content/resources/_index.markdown @@ -1,6 +1,5 @@ --- layout: default title: Resources -published: true sorting: 80 --- diff --git a/resources/additional-topics/BDMA-model.png b/content/resources/additional-topics/BDMA-model.png similarity index 100% rename from resources/additional-topics/BDMA-model.png rename to content/resources/additional-topics/BDMA-model.png diff --git a/resources/additional-topics/STIGs.cf b/content/resources/additional-topics/STIGs.cf similarity index 100% rename from resources/additional-topics/STIGs.cf rename to content/resources/additional-topics/STIGs.cf diff --git a/resources/additional-topics/STIGs_readme.txt b/content/resources/additional-topics/STIGs_readme.txt similarity index 100% rename from resources/additional-topics/STIGs_readme.txt rename to content/resources/additional-topics/STIGs_readme.txt diff --git a/resources/additional-topics.markdown b/content/resources/additional-topics/_index.markdown similarity index 79% rename from resources/additional-topics.markdown rename to content/resources/additional-topics/_index.markdown index c4f60b940..daf43e09c 100644 --- a/resources/additional-topics.markdown +++ b/content/resources/additional-topics/_index.markdown @@ -1,6 +1,5 @@ --- layout: default title: Additional topics -published: true sorting: 20 --- diff --git a/content/resources/additional-topics/adopting-cfengine-mission-plan.png b/content/resources/additional-topics/adopting-cfengine-mission-plan.png new file mode 100644 index 000000000..0b627b428 Binary files /dev/null and b/content/resources/additional-topics/adopting-cfengine-mission-plan.png differ diff --git a/resources/additional-topics/agility.markdown b/content/resources/additional-topics/agility.markdown similarity index 99% rename from resources/additional-topics/agility.markdown rename to content/resources/additional-topics/agility.markdown index 138afeec4..9a5a18087 100644 --- a/resources/additional-topics/agility.markdown +++ b/content/resources/additional-topics/agility.markdown @@ -1,7 +1,6 @@ --- layout: default title: Agility -published: true sorting: 80 --- diff --git a/resources/additional-topics/agility.png b/content/resources/additional-topics/agility.png similarity index 100% rename from resources/additional-topics/agility.png rename to content/resources/additional-topics/agility.png diff --git a/resources/additional-topics/application-management.markdown b/content/resources/additional-topics/application-management.markdown similarity index 99% rename from resources/additional-topics/application-management.markdown rename to content/resources/additional-topics/application-management.markdown index f8ab796bd..c586cfb6c 100644 --- a/resources/additional-topics/application-management.markdown +++ b/content/resources/additional-topics/application-management.markdown @@ -1,7 +1,6 @@ --- layout: default title: Application management -published: true sorting: 80 --- diff --git a/resources/additional-topics/authority-paradox.png b/content/resources/additional-topics/authority-paradox.png similarity index 100% rename from resources/additional-topics/authority-paradox.png rename to content/resources/additional-topics/authority-paradox.png diff --git a/resources/additional-topics/bow-tie-delegation.png b/content/resources/additional-topics/bow-tie-delegation.png similarity index 100% rename from resources/additional-topics/bow-tie-delegation.png rename to content/resources/additional-topics/bow-tie-delegation.png diff --git a/resources/additional-topics/build-deploy-manage-audit.markdown b/content/resources/additional-topics/build-deploy-manage-audit.markdown similarity index 99% rename from resources/additional-topics/build-deploy-manage-audit.markdown rename to content/resources/additional-topics/build-deploy-manage-audit.markdown index 930a76b86..0d64d86f9 100644 --- a/resources/additional-topics/build-deploy-manage-audit.markdown +++ b/content/resources/additional-topics/build-deploy-manage-audit.markdown @@ -1,7 +1,6 @@ --- layout: default title: Build Deploy Manage Audit -published: true sorting: 80 --- diff --git a/resources/additional-topics/cfengine-relationship-to-infrastructure.png b/content/resources/additional-topics/cfengine-relationship-to-infrastructure.png similarity index 100% rename from resources/additional-topics/cfengine-relationship-to-infrastructure.png rename to content/resources/additional-topics/cfengine-relationship-to-infrastructure.png diff --git a/resources/additional-topics/change-management.markdown b/content/resources/additional-topics/change-management.markdown similarity index 99% rename from resources/additional-topics/change-management.markdown rename to content/resources/additional-topics/change-management.markdown index abfddef63..e168fb15d 100644 --- a/resources/additional-topics/change-management.markdown +++ b/content/resources/additional-topics/change-management.markdown @@ -1,7 +1,6 @@ --- layout: default title: Change management -published: true sorting: 80 --- diff --git a/resources/additional-topics/cloud-computing.markdown b/content/resources/additional-topics/cloud-computing.markdown similarity index 99% rename from resources/additional-topics/cloud-computing.markdown rename to content/resources/additional-topics/cloud-computing.markdown index 4090fae70..f507f3097 100644 --- a/resources/additional-topics/cloud-computing.markdown +++ b/content/resources/additional-topics/cloud-computing.markdown @@ -1,7 +1,6 @@ --- layout: default title: Cloud computing -published: true sorting: 80 --- diff --git a/resources/additional-topics/content-driven-policy.markdown b/content/resources/additional-topics/content-driven-policy.markdown similarity index 99% rename from resources/additional-topics/content-driven-policy.markdown rename to content/resources/additional-topics/content-driven-policy.markdown index 653b798f7..a0aa2e75d 100644 --- a/resources/additional-topics/content-driven-policy.markdown +++ b/content/resources/additional-topics/content-driven-policy.markdown @@ -1,7 +1,6 @@ --- layout: default title: Content driven policy -published: true sorting: 80 reviewed: 2019-05-06 --- diff --git a/resources/additional-topics/convergence.png b/content/resources/additional-topics/convergence.png similarity index 100% rename from resources/additional-topics/convergence.png rename to content/resources/additional-topics/convergence.png diff --git a/resources/additional-topics/coordination.png b/content/resources/additional-topics/coordination.png similarity index 100% rename from resources/additional-topics/coordination.png rename to content/resources/additional-topics/coordination.png diff --git a/resources/additional-topics/demolish.png b/content/resources/additional-topics/demolish.png similarity index 100% rename from resources/additional-topics/demolish.png rename to content/resources/additional-topics/demolish.png diff --git a/resources/additional-topics/devops.markdown b/content/resources/additional-topics/devops.markdown similarity index 99% rename from resources/additional-topics/devops.markdown rename to content/resources/additional-topics/devops.markdown index 3578e1842..13b151dd6 100644 --- a/resources/additional-topics/devops.markdown +++ b/content/resources/additional-topics/devops.markdown @@ -1,7 +1,6 @@ --- layout: default title: DevOps -published: true sorting: 80 --- diff --git a/resources/additional-topics/distributed-scheduling.markdown b/content/resources/additional-topics/distributed-scheduling.markdown similarity index 99% rename from resources/additional-topics/distributed-scheduling.markdown rename to content/resources/additional-topics/distributed-scheduling.markdown index e860ce549..61645f121 100644 --- a/resources/additional-topics/distributed-scheduling.markdown +++ b/content/resources/additional-topics/distributed-scheduling.markdown @@ -1,7 +1,6 @@ --- layout: default title: Distributed scheduling -published: true sorting: 80 --- diff --git a/resources/additional-topics/fed2.png b/content/resources/additional-topics/fed2.png similarity index 100% rename from resources/additional-topics/fed2.png rename to content/resources/additional-topics/fed2.png diff --git a/resources/additional-topics/fed3.png b/content/resources/additional-topics/fed3.png similarity index 100% rename from resources/additional-topics/fed3.png rename to content/resources/additional-topics/fed3.png diff --git a/resources/additional-topics/file-content.markdown b/content/resources/additional-topics/file-content.markdown similarity index 99% rename from resources/additional-topics/file-content.markdown rename to content/resources/additional-topics/file-content.markdown index fce9e0b37..2d9028fd7 100644 --- a/resources/additional-topics/file-content.markdown +++ b/content/resources/additional-topics/file-content.markdown @@ -1,7 +1,6 @@ --- layout: default title: File content -published: true sorting: 80 --- diff --git a/resources/additional-topics/file-integrity-monitoring.markdown.breaks_build b/content/resources/additional-topics/file-integrity-monitoring.markdown.breaks_build similarity index 100% rename from resources/additional-topics/file-integrity-monitoring.markdown.breaks_build rename to content/resources/additional-topics/file-integrity-monitoring.markdown.breaks_build diff --git a/resources/additional-topics/hierarchies.markdown b/content/resources/additional-topics/hierarchies.markdown similarity index 99% rename from resources/additional-topics/hierarchies.markdown rename to content/resources/additional-topics/hierarchies.markdown index d82350888..9a6eacca2 100644 --- a/resources/additional-topics/hierarchies.markdown +++ b/content/resources/additional-topics/hierarchies.markdown @@ -1,7 +1,6 @@ --- layout: default title: Hierarchies -published: true sorting: 80 --- diff --git a/resources/additional-topics/hierarchy-vs-team.png b/content/resources/additional-topics/hierarchy-vs-team.png similarity index 100% rename from resources/additional-topics/hierarchy-vs-team.png rename to content/resources/additional-topics/hierarchy-vs-team.png diff --git a/resources/additional-topics/inherit.png b/content/resources/additional-topics/inherit.png similarity index 100% rename from resources/additional-topics/inherit.png rename to content/resources/additional-topics/inherit.png diff --git a/resources/additional-topics/iteration.markdown b/content/resources/additional-topics/iteration.markdown similarity index 99% rename from resources/additional-topics/iteration.markdown rename to content/resources/additional-topics/iteration.markdown index 6f75739a6..d99ecf472 100644 --- a/resources/additional-topics/iteration.markdown +++ b/content/resources/additional-topics/iteration.markdown @@ -1,7 +1,6 @@ --- layout: default title: Iteration (Loops) -published: true sorting: 80 --- diff --git a/resources/additional-topics/itil-cfengine.png b/content/resources/additional-topics/itil-cfengine.png similarity index 100% rename from resources/additional-topics/itil-cfengine.png rename to content/resources/additional-topics/itil-cfengine.png diff --git a/resources/additional-topics/itil.markdown b/content/resources/additional-topics/itil.markdown similarity index 99% rename from resources/additional-topics/itil.markdown rename to content/resources/additional-topics/itil.markdown index cd427a84a..15b903692 100644 --- a/resources/additional-topics/itil.markdown +++ b/content/resources/additional-topics/itil.markdown @@ -1,7 +1,6 @@ --- layout: default title: ITIL -published: true sorting: 80 --- @@ -412,14 +411,14 @@ know how much equipment is in use and how much can be brought in at a moment's notice to solve a business problem. These are a few of the reasons why we need to keep track of assets. -{% comment %} + ### Change management in the enterprise diff --git a/resources/additional-topics/km1.png b/content/resources/additional-topics/km1.png similarity index 100% rename from resources/additional-topics/km1.png rename to content/resources/additional-topics/km1.png diff --git a/resources/additional-topics/km2.png b/content/resources/additional-topics/km2.png similarity index 100% rename from resources/additional-topics/km2.png rename to content/resources/additional-topics/km2.png diff --git a/resources/additional-topics/km3.png b/content/resources/additional-topics/km3.png similarity index 100% rename from resources/additional-topics/km3.png rename to content/resources/additional-topics/km3.png diff --git a/resources/additional-topics/km4.png b/content/resources/additional-topics/km4.png similarity index 100% rename from resources/additional-topics/km4.png rename to content/resources/additional-topics/km4.png diff --git a/resources/additional-topics/km5.png b/content/resources/additional-topics/km5.png similarity index 100% rename from resources/additional-topics/km5.png rename to content/resources/additional-topics/km5.png diff --git a/resources/additional-topics/km6.png b/content/resources/additional-topics/km6.png similarity index 100% rename from resources/additional-topics/km6.png rename to content/resources/additional-topics/km6.png diff --git a/resources/additional-topics/km7.png b/content/resources/additional-topics/km7.png similarity index 100% rename from resources/additional-topics/km7.png rename to content/resources/additional-topics/km7.png diff --git a/resources/additional-topics/km8.png b/content/resources/additional-topics/km8.png similarity index 100% rename from resources/additional-topics/km8.png rename to content/resources/additional-topics/km8.png diff --git a/resources/additional-topics/km9.png b/content/resources/additional-topics/km9.png similarity index 100% rename from resources/additional-topics/km9.png rename to content/resources/additional-topics/km9.png diff --git a/resources/additional-topics/knowledge-management.markdown.breaks_build b/content/resources/additional-topics/knowledge-management.markdown.breaks_build similarity index 100% rename from resources/additional-topics/knowledge-management.markdown.breaks_build rename to content/resources/additional-topics/knowledge-management.markdown.breaks_build diff --git a/resources/additional-topics/menu-driven-configuration.markdown.breaks_build b/content/resources/additional-topics/menu-driven-configuration.markdown.breaks_build similarity index 100% rename from resources/additional-topics/menu-driven-configuration.markdown.breaks_build rename to content/resources/additional-topics/menu-driven-configuration.markdown.breaks_build diff --git a/resources/additional-topics/mission-critical-operations.markdown.breaks_build b/content/resources/additional-topics/mission-critical-operations.markdown.breaks_build similarity index 100% rename from resources/additional-topics/mission-critical-operations.markdown.breaks_build rename to content/resources/additional-topics/mission-critical-operations.markdown.breaks_build diff --git a/resources/additional-topics/modularity.markdown b/content/resources/additional-topics/modularity.markdown similarity index 99% rename from resources/additional-topics/modularity.markdown rename to content/resources/additional-topics/modularity.markdown index 70ec67fab..d8bb9e62f 100644 --- a/resources/additional-topics/modularity.markdown +++ b/content/resources/additional-topics/modularity.markdown @@ -1,7 +1,6 @@ --- layout: default title: Modularity and orchestrating system policy -published: true sorting: 80 --- diff --git a/resources/additional-topics/monitoring.markdown.breaks_build b/content/resources/additional-topics/monitoring.markdown.breaks_build similarity index 100% rename from resources/additional-topics/monitoring.markdown.breaks_build rename to content/resources/additional-topics/monitoring.markdown.breaks_build diff --git a/resources/additional-topics/network-organizational-structures.png b/content/resources/additional-topics/network-organizational-structures.png similarity index 100% rename from resources/additional-topics/network-organizational-structures.png rename to content/resources/additional-topics/network-organizational-structures.png diff --git a/resources/additional-topics/open-nebula-architecture.png b/content/resources/additional-topics/open-nebula-architecture.png similarity index 100% rename from resources/additional-topics/open-nebula-architecture.png rename to content/resources/additional-topics/open-nebula-architecture.png diff --git a/resources/additional-topics/open-nebula.markdown b/content/resources/additional-topics/open-nebula.markdown similarity index 99% rename from resources/additional-topics/open-nebula.markdown rename to content/resources/additional-topics/open-nebula.markdown index 72154e506..e23a98887 100644 --- a/resources/additional-topics/open-nebula.markdown +++ b/content/resources/additional-topics/open-nebula.markdown @@ -1,7 +1,6 @@ --- layout: default title: Using CFEngine with Open Nebula -published: true sorting: 80 --- diff --git a/resources/additional-topics/orchestration.markdown b/content/resources/additional-topics/orchestration.markdown similarity index 99% rename from resources/additional-topics/orchestration.markdown rename to content/resources/additional-topics/orchestration.markdown index eab20b871..bb80d488d 100644 --- a/resources/additional-topics/orchestration.markdown +++ b/content/resources/additional-topics/orchestration.markdown @@ -1,7 +1,6 @@ --- layout: default title: Orchestration -published: true sorting: 80 --- diff --git a/resources/additional-topics/overlapping-sets.png b/content/resources/additional-topics/overlapping-sets.png similarity index 100% rename from resources/additional-topics/overlapping-sets.png rename to content/resources/additional-topics/overlapping-sets.png diff --git a/resources/additional-topics/package-flow.png b/content/resources/additional-topics/package-flow.png similarity index 100% rename from resources/additional-topics/package-flow.png rename to content/resources/additional-topics/package-flow.png diff --git a/resources/additional-topics/package-management.markdown.breaks_build b/content/resources/additional-topics/package-management.markdown.breaks_build similarity index 100% rename from resources/additional-topics/package-management.markdown.breaks_build rename to content/resources/additional-topics/package-management.markdown.breaks_build diff --git a/resources/additional-topics/policy-distribution-fanout.png b/content/resources/additional-topics/policy-distribution-fanout.png similarity index 100% rename from resources/additional-topics/policy-distribution-fanout.png rename to content/resources/additional-topics/policy-distribution-fanout.png diff --git a/resources/additional-topics/reporting.markdown.breaks_build b/content/resources/additional-topics/reporting.markdown.breaks_build similarity index 100% rename from resources/additional-topics/reporting.markdown.breaks_build rename to content/resources/additional-topics/reporting.markdown.breaks_build diff --git a/resources/additional-topics/role-based-access-control.markdown.breaks_build b/content/resources/additional-topics/role-based-access-control.markdown.breaks_build similarity index 100% rename from resources/additional-topics/role-based-access-control.markdown.breaks_build rename to content/resources/additional-topics/role-based-access-control.markdown.breaks_build diff --git a/resources/additional-topics/rollback.markdown.breaks_build b/content/resources/additional-topics/rollback.markdown.breaks_build similarity index 100% rename from resources/additional-topics/rollback.markdown.breaks_build rename to content/resources/additional-topics/rollback.markdown.breaks_build diff --git a/resources/additional-topics/scale-and-scalability.markdown.breaks_build b/content/resources/additional-topics/scale-and-scalability.markdown.breaks_build similarity index 100% rename from resources/additional-topics/scale-and-scalability.markdown.breaks_build rename to content/resources/additional-topics/scale-and-scalability.markdown.breaks_build diff --git a/resources/additional-topics/scheduleing-jobs.markdown.breaks_build b/content/resources/additional-topics/scheduleing-jobs.markdown.breaks_build similarity index 100% rename from resources/additional-topics/scheduleing-jobs.markdown.breaks_build rename to content/resources/additional-topics/scheduleing-jobs.markdown.breaks_build diff --git a/resources/additional-topics/scheduleing-patterns.png b/content/resources/additional-topics/scheduleing-patterns.png similarity index 100% rename from resources/additional-topics/scheduleing-patterns.png rename to content/resources/additional-topics/scheduleing-patterns.png diff --git a/resources/additional-topics/security.markdown b/content/resources/additional-topics/security.markdown similarity index 99% rename from resources/additional-topics/security.markdown rename to content/resources/additional-topics/security.markdown index 2ea2b867d..fb10d17b2 100644 --- a/resources/additional-topics/security.markdown +++ b/content/resources/additional-topics/security.markdown @@ -1,7 +1,6 @@ --- layout: default title: Security -published: True sorting: 80 --- diff --git a/resources/additional-topics/single-points-of-failure.png b/content/resources/additional-topics/single-points-of-failure.png similarity index 100% rename from resources/additional-topics/single-points-of-failure.png rename to content/resources/additional-topics/single-points-of-failure.png diff --git a/resources/additional-topics/stigs.markdown b/content/resources/additional-topics/stigs.markdown similarity index 99% rename from resources/additional-topics/stigs.markdown rename to content/resources/additional-topics/stigs.markdown index b78c1517c..a63f6249f 100644 --- a/resources/additional-topics/stigs.markdown +++ b/content/resources/additional-topics/stigs.markdown @@ -1,7 +1,6 @@ --- layout: default title: STIGs -published: true sorting: 80 --- diff --git a/resources/additional-topics/teamwork.markdown b/content/resources/additional-topics/teamwork.markdown similarity index 99% rename from resources/additional-topics/teamwork.markdown rename to content/resources/additional-topics/teamwork.markdown index 5721ebff4..08358c14c 100644 --- a/resources/additional-topics/teamwork.markdown +++ b/content/resources/additional-topics/teamwork.markdown @@ -1,7 +1,6 @@ --- layout: default title: Teamwork -published: true sorting: 80 --- diff --git a/resources/additional-topics/understanding.png b/content/resources/additional-topics/understanding.png similarity index 100% rename from resources/additional-topics/understanding.png rename to content/resources/additional-topics/understanding.png diff --git a/resources/additional-topics/virtualization.markdown.breaks_build b/content/resources/additional-topics/virtualization.markdown.breaks_build similarity index 100% rename from resources/additional-topics/virtualization.markdown.breaks_build rename to content/resources/additional-topics/virtualization.markdown.breaks_build diff --git a/resources/additional-topics/windows-management.markdown.breaks_build b/content/resources/additional-topics/windows-management.markdown.breaks_build similarity index 100% rename from resources/additional-topics/windows-management.markdown.breaks_build rename to content/resources/additional-topics/windows-management.markdown.breaks_build diff --git a/resources/best-practices.markdown b/content/resources/best-practices.markdown similarity index 99% rename from resources/best-practices.markdown rename to content/resources/best-practices.markdown index eea976d52..bb0ad1efd 100644 --- a/resources/best-practices.markdown +++ b/content/resources/best-practices.markdown @@ -2,7 +2,6 @@ layout: default title: Best practices sorting: 100 -published: true --- ## Policy style guide diff --git a/resources/external-resources.markdown b/content/resources/external-resources.markdown similarity index 99% rename from resources/external-resources.markdown rename to content/resources/external-resources.markdown index 7eedb3cd5..328bd0f7d 100644 --- a/resources/external-resources.markdown +++ b/content/resources/external-resources.markdown @@ -1,7 +1,6 @@ --- layout: default title: External resources -published: true sorting: 30 --- diff --git a/resources/faq.markdown b/content/resources/faq/_index.markdown similarity index 94% rename from resources/faq.markdown rename to content/resources/faq/_index.markdown index 026b0366e..1a58affaa 100644 --- a/resources/faq.markdown +++ b/content/resources/faq/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: FAQ -published: true sorting: 10 --- diff --git a/resources/faq/agents-not-running.png b/content/resources/faq/agents-not-running.png similarity index 100% rename from resources/faq/agents-not-running.png rename to content/resources/faq/agents-not-running.png diff --git a/resources/faq/bootstrap-failed.markdown b/content/resources/faq/bootstrap-failed.markdown similarity index 99% rename from resources/faq/bootstrap-failed.markdown rename to content/resources/faq/bootstrap-failed.markdown index df8a1b90f..6ca3e6748 100644 --- a/resources/faq/bootstrap-failed.markdown +++ b/content/resources/faq/bootstrap-failed.markdown @@ -1,7 +1,6 @@ --- layout: default title: Bootstrapping -published: true --- Frequently asked questions around bootstrapping, the process of starting CFEngine for the first time, and connecting the agents to the correct policy server. diff --git a/resources/faq/debugging-slow-queries.markdown b/content/resources/faq/debugging-slow-queries.markdown similarity index 98% rename from resources/faq/debugging-slow-queries.markdown rename to content/resources/faq/debugging-slow-queries.markdown index 603dc5da4..453c242e6 100644 --- a/resources/faq/debugging-slow-queries.markdown +++ b/content/resources/faq/debugging-slow-queries.markdown @@ -1,7 +1,6 @@ --- layout: default title: Debugging slow queries -published: true sorting: 90 --- diff --git a/resources/faq/enterprise-changes-ui.png b/content/resources/faq/enterprise-changes-ui.png similarity index 100% rename from resources/faq/enterprise-changes-ui.png rename to content/resources/faq/enterprise-changes-ui.png diff --git a/resources/faq/enterprise-license.markdown b/content/resources/faq/enterprise-license.markdown similarity index 98% rename from resources/faq/enterprise-license.markdown rename to content/resources/faq/enterprise-license.markdown index 8c4e9fb0c..e5bb64fda 100644 --- a/resources/faq/enterprise-license.markdown +++ b/content/resources/faq/enterprise-license.markdown @@ -1,7 +1,6 @@ --- layout: default title: Requesting a CFEngine Enterprise License -published: true sorting: 40 --- diff --git a/resources/faq/enterprise-report-collection.markdown b/content/resources/faq/enterprise-report-collection.markdown similarity index 98% rename from resources/faq/enterprise-report-collection.markdown rename to content/resources/faq/enterprise-report-collection.markdown index b728b1795..aeabf0a17 100644 --- a/resources/faq/enterprise-report-collection.markdown +++ b/content/resources/faq/enterprise-report-collection.markdown @@ -1,7 +1,6 @@ --- layout: default title: Enterprise report collection -published: true sorting: 90 --- @@ -26,7 +25,7 @@ in [`body hub control`][cf-hub#control-promises]. ## How often does cf-hub re-check the LICENSE -{% comment %}cf-hub/license-checking.c:#define SECONDS_BETWEEN_CHECKS (5 * SECONDS_PER_MINUTE){% endcomment %} + `cf-hub` re-checks the license when it is started and once every 5 minutes after that. diff --git a/resources/faq/enterprise-report-filtering.markdown b/content/resources/faq/enterprise-report-filtering.markdown similarity index 98% rename from resources/faq/enterprise-report-filtering.markdown rename to content/resources/faq/enterprise-report-filtering.markdown index 9f382dedf..06656ad0a 100644 --- a/resources/faq/enterprise-report-filtering.markdown +++ b/content/resources/faq/enterprise-report-filtering.markdown @@ -1,7 +1,6 @@ --- layout: default title: Enterprise Report Filtering -published: true sorting: 90 --- diff --git a/resources/faq/enterprise.markdown b/content/resources/faq/enterprise.markdown similarity index 99% rename from resources/faq/enterprise.markdown rename to content/resources/faq/enterprise.markdown index 5b3c43667..54c6eaab7 100644 --- a/resources/faq/enterprise.markdown +++ b/content/resources/faq/enterprise.markdown @@ -1,7 +1,6 @@ --- layout: default title: Enterprise reporting database -published: true sorting: 90 --- diff --git a/resources/faq/fhs.markdown b/content/resources/faq/fhs.markdown similarity index 98% rename from resources/faq/fhs.markdown rename to content/resources/faq/fhs.markdown index ebaf2a288..95bc3e68a 100644 --- a/resources/faq/fhs.markdown +++ b/content/resources/faq/fhs.markdown @@ -1,7 +1,6 @@ --- layout: default title: Why does CFEngine install into /var/cfengine instead of following the FHS? -published: true sorting: 90 --- diff --git a/resources/faq/filter-inventoried-list-items.png b/content/resources/faq/filter-inventoried-list-items.png similarity index 100% rename from resources/faq/filter-inventoried-list-items.png rename to content/resources/faq/filter-inventoried-list-items.png diff --git a/resources/faq/find-public-key-for-host-sha.markdown b/content/resources/faq/find-public-key-for-host-sha.markdown similarity index 96% rename from resources/faq/find-public-key-for-host-sha.markdown rename to content/resources/faq/find-public-key-for-host-sha.markdown index 5ce7bb6fd..fdb4eb24b 100644 --- a/resources/faq/find-public-key-for-host-sha.markdown +++ b/content/resources/faq/find-public-key-for-host-sha.markdown @@ -1,7 +1,6 @@ --- layout: default title: How do I find the public key for a given host -published: true sorting: 90 --- diff --git a/resources/faq/fix-trust-after-ip-change.markdown b/content/resources/faq/fix-trust-after-ip-change.markdown similarity index 99% rename from resources/faq/fix-trust-after-ip-change.markdown rename to content/resources/faq/fix-trust-after-ip-change.markdown index 3a2eeba14..534d56d77 100644 --- a/resources/faq/fix-trust-after-ip-change.markdown +++ b/content/resources/faq/fix-trust-after-ip-change.markdown @@ -1,7 +1,6 @@ --- layout: default title: How do I fix trust after an IP change? -published: true sorting: 90 --- diff --git a/resources/faq/fix-undefined-body-error.markdown b/content/resources/faq/fix-undefined-body-error.markdown similarity index 99% rename from resources/faq/fix-undefined-body-error.markdown rename to content/resources/faq/fix-undefined-body-error.markdown index 3ead18a53..9d8adee07 100644 --- a/resources/faq/fix-undefined-body-error.markdown +++ b/content/resources/faq/fix-undefined-body-error.markdown @@ -1,7 +1,6 @@ --- layout: default title: How do I fix undefined body errors? -published: true sorting: 90 --- diff --git a/resources/faq/hosts-not-reporting.png b/content/resources/faq/hosts-not-reporting.png similarity index 100% rename from resources/faq/hosts-not-reporting.png rename to content/resources/faq/hosts-not-reporting.png diff --git a/content/resources/faq/how-does-cfengine-work-agent-workflow.png b/content/resources/faq/how-does-cfengine-work-agent-workflow.png new file mode 100644 index 000000000..e44ccfe64 Binary files /dev/null and b/content/resources/faq/how-does-cfengine-work-agent-workflow.png differ diff --git a/content/resources/faq/how-does-cfengine-work-process.png b/content/resources/faq/how-does-cfengine-work-process.png new file mode 100644 index 000000000..83023fafa Binary files /dev/null and b/content/resources/faq/how-does-cfengine-work-process.png differ diff --git a/resources/faq/integrate-custom-policy.markdown b/content/resources/faq/integrate-custom-policy.markdown similarity index 99% rename from resources/faq/integrate-custom-policy.markdown rename to content/resources/faq/integrate-custom-policy.markdown index 94d2fed32..3d2990ba6 100644 --- a/resources/faq/integrate-custom-policy.markdown +++ b/content/resources/faq/integrate-custom-policy.markdown @@ -1,7 +1,6 @@ --- layout: default title: How do I integrate custom policy? -published: true sorting: 90 --- diff --git a/resources/faq/inventoried-list-items.png b/content/resources/faq/inventoried-list-items.png similarity index 100% rename from resources/faq/inventoried-list-items.png rename to content/resources/faq/inventoried-list-items.png diff --git a/resources/faq/manual-execution.markdown b/content/resources/faq/manual-execution.markdown similarity index 99% rename from resources/faq/manual-execution.markdown rename to content/resources/faq/manual-execution.markdown index 38819f055..c3e3a6739 100644 --- a/resources/faq/manual-execution.markdown +++ b/content/resources/faq/manual-execution.markdown @@ -1,7 +1,6 @@ --- layout: default title: Manual execution -published: true sorting: 90 --- diff --git a/resources/faq/mustache-templating.markdown b/content/resources/faq/mustache-templating.markdown similarity index 95% rename from resources/faq/mustache-templating.markdown rename to content/resources/faq/mustache-templating.markdown index f57209ac0..92df41f74 100644 --- a/resources/faq/mustache-templating.markdown +++ b/content/resources/faq/mustache-templating.markdown @@ -1,7 +1,6 @@ --- layout: default title: Mustache templating -published: true sorting: 90 --- @@ -36,11 +35,11 @@ This template should not be passed a data container; it uses the `datastate()` of the CFEngine system. That's where `classes.enterprise` and `vars.sys.cf_version` came from. -{% raw %} + ``` Version: CFEngine {{#classes.enterprise}}Enterprise{{/classes.enterprise}} {{vars.sys.cf_version}} ``` -{% endraw %} + ## How do I render a section only if a given class is not defined? @@ -54,11 +53,11 @@ This template should not be passed a data container; it uses the `datastate()` of the CFEngine system. That's where `classes.cfengine_enterprise` and `vars.sys.cf_version` came from. -{% raw %} + ``` Version: CFEngine {{#classes.cfengine_enterprise}}Enterprise{{/classes.cfengine_enterprise}}{{^classes.cfengine_enterprise}}Community{{/classes.cfengine_enterprise}} {{vars.sys.cf_version}} ``` -{% endraw %} + ## How do I use class expressions? @@ -67,30 +66,30 @@ possible to use full class expressions in mustache templates. Instead, use class expressions inside CFEngine policy to define a singular class which can be used to conditionally render a block. -{% raw %} + [%CFEngine_include_example(mustache_classes.cf)%] -{% endraw %} + ## How do I iterate over a list? This template should not be passed a data container; it uses the `datastate()` of the CFEngine system. That's where `vars.mon.listening_tcp4_ports` came from. -{% raw %} + ``` {{#vars.mon.listening_tcp4_ports}} * {{.}} {{/vars.mon.listening_tcp4_ports}} ``` -{% endraw %} + ## How can I access keys when iterating over a dict? In CFEngine, the `@` symbol expands to the current key when iterating over a dict. -{% raw %} + [%CFEngine_include_example(mustache_extension_expand_key.cf)%] -{% endraw %} + ## Can you use nested classes? @@ -99,7 +98,7 @@ In this example for ssh daemon the authorized key configuration will only be add class `SSH_LDAP_PUBKEY_BUNDLE` is true and for the class debian/centos diffenrent keywords are added. -{% raw %} + ``` {{#classes.SSH_LDAP_PUBKEY_BUNDLE}} {{#classes.debian}} @@ -112,4 +111,3 @@ AuthorizedKeysCommandRunAs {{vars.sara_data.ssh.authorized_keys_commanduser}} {{/classes.centos}} {{/classes.SSH_LDAP_PUBKEY_BUNDLE}} ``` -{% endraw %} diff --git a/resources/faq/output-email.markdown b/content/resources/faq/output-email.markdown similarity index 98% rename from resources/faq/output-email.markdown rename to content/resources/faq/output-email.markdown index 1eec8f91e..9cea44539 100644 --- a/resources/faq/output-email.markdown +++ b/content/resources/faq/output-email.markdown @@ -1,7 +1,6 @@ --- layout: default title: Agent output email -published: true sorting: 90 --- diff --git a/resources/faq/show-classes-and-vars.markdown b/content/resources/faq/show-classes-and-vars.markdown similarity index 98% rename from resources/faq/show-classes-and-vars.markdown rename to content/resources/faq/show-classes-and-vars.markdown index c1a623d9d..83f050bb8 100644 --- a/resources/faq/show-classes-and-vars.markdown +++ b/content/resources/faq/show-classes-and-vars.markdown @@ -1,7 +1,6 @@ --- layout: default title: How can I tell what classes and variables are defined? -published: true sorting: 90 --- diff --git a/resources/faq/tuning-postgresql.markdown b/content/resources/faq/tuning-postgresql.markdown similarity index 98% rename from resources/faq/tuning-postgresql.markdown rename to content/resources/faq/tuning-postgresql.markdown index bc971f54b..dcbdb46b0 100644 --- a/resources/faq/tuning-postgresql.markdown +++ b/content/resources/faq/tuning-postgresql.markdown @@ -1,7 +1,6 @@ --- layout: default title: Tuning PostgreSQL -published: true --- During install the CFEngine Enterprise Hub Package pre-configures PostgreSQL with a configuration for low (<3GB), medium (>3GB <64GB) or high (>64GB) memory which adjusts the values of `effective_cache_size`, `shared_buffers`, and `maintenance_work_mem`. diff --git a/resources/faq/unable-to-log-in-mission-portal.markdown b/content/resources/faq/unable-to-log-in-mission-portal.markdown similarity index 99% rename from resources/faq/unable-to-log-in-mission-portal.markdown rename to content/resources/faq/unable-to-log-in-mission-portal.markdown index 1f92fe489..f9d8b9546 100644 --- a/resources/faq/unable-to-log-in-mission-portal.markdown +++ b/content/resources/faq/unable-to-log-in-mission-portal.markdown @@ -1,7 +1,6 @@ --- layout: default title: Unable to log into Mission Portal -published: true sorting: 90 --- diff --git a/resources/faq/uninstall-reinstall.markdown b/content/resources/faq/uninstall-reinstall.markdown similarity index 98% rename from resources/faq/uninstall-reinstall.markdown rename to content/resources/faq/uninstall-reinstall.markdown index b572a034d..90399447c 100644 --- a/resources/faq/uninstall-reinstall.markdown +++ b/content/resources/faq/uninstall-reinstall.markdown @@ -1,7 +1,6 @@ --- layout: default title: Uninstalling / reinstalling -published: true sorting: 40 --- diff --git a/resources/faq/users.markdown b/content/resources/faq/users.markdown similarity index 95% rename from resources/faq/users.markdown rename to content/resources/faq/users.markdown index cdc6feff7..0cf309ccc 100644 --- a/resources/faq/users.markdown +++ b/content/resources/faq/users.markdown @@ -1,7 +1,6 @@ --- layout: default title: Users -published: true sorting: 90 --- diff --git a/resources/faq/variables.markdown b/content/resources/faq/variables.markdown similarity index 98% rename from resources/faq/variables.markdown rename to content/resources/faq/variables.markdown index 00f7853ed..d023fbdef 100644 --- a/resources/faq/variables.markdown +++ b/content/resources/faq/variables.markdown @@ -1,7 +1,6 @@ --- layout: default title: How do I pass a data type variable? -published: true sorting: 90 --- diff --git a/resources/faq/what-did-cfengine-change.markdown b/content/resources/faq/what-did-cfengine-change.markdown similarity index 99% rename from resources/faq/what-did-cfengine-change.markdown rename to content/resources/faq/what-did-cfengine-change.markdown index 0dd0d81e4..ec649d729 100644 --- a/resources/faq/what-did-cfengine-change.markdown +++ b/content/resources/faq/what-did-cfengine-change.markdown @@ -1,7 +1,6 @@ --- layout: default title: What did CFEngine do? -published: true --- This page presents a few ways of understanding what CFEngine has done to your machine. diff --git a/resources/faq/what-is-promise-locking.markdown b/content/resources/faq/what-is-promise-locking.markdown similarity index 98% rename from resources/faq/what-is-promise-locking.markdown rename to content/resources/faq/what-is-promise-locking.markdown index 5dd2fe289..f99386efd 100644 --- a/resources/faq/what-is-promise-locking.markdown +++ b/content/resources/faq/what-is-promise-locking.markdown @@ -1,7 +1,6 @@ --- layout: default title: What is promise locking? -published: true sorting: 90 --- diff --git a/resources/faq/why-are-files-not-being-distributed.markdown b/content/resources/faq/why-are-files-not-being-distributed.markdown similarity index 97% rename from resources/faq/why-are-files-not-being-distributed.markdown rename to content/resources/faq/why-are-files-not-being-distributed.markdown index 9b084f103..a89fa4600 100644 --- a/resources/faq/why-are-files-not-being-distributed.markdown +++ b/content/resources/faq/why-are-files-not-being-distributed.markdown @@ -1,7 +1,6 @@ --- layout: default title: Why are some files inside masterfiles not being updated/distributed? -published: true sorting: 90 --- diff --git a/resources/faq/why-are-remote-agents-not-updating.markdown b/content/resources/faq/why-are-remote-agents-not-updating.markdown similarity index 99% rename from resources/faq/why-are-remote-agents-not-updating.markdown rename to content/resources/faq/why-are-remote-agents-not-updating.markdown index 74cb7b7b5..faf5de27b 100644 --- a/resources/faq/why-are-remote-agents-not-updating.markdown +++ b/content/resources/faq/why-are-remote-agents-not-updating.markdown @@ -1,7 +1,6 @@ --- layout: default title: Why are remote agents not updating? -published: true sorting: 90 --- diff --git a/resources/faq/why-knowledge-management.markdown b/content/resources/faq/why-knowledge-management.markdown similarity index 97% rename from resources/faq/why-knowledge-management.markdown rename to content/resources/faq/why-knowledge-management.markdown index e8e527c7e..99b9e9a45 100644 --- a/resources/faq/why-knowledge-management.markdown +++ b/content/resources/faq/why-knowledge-management.markdown @@ -1,7 +1,6 @@ --- layout: default title: Why knowledge management? -published: true sorting: 3 --- diff --git a/content/search.markdown b/content/search.markdown new file mode 100644 index 000000000..c6f890be6 --- /dev/null +++ b/content/search.markdown @@ -0,0 +1,6 @@ +--- +layout: search +title: Search +hidden: true +alias: search +--- diff --git a/versions.markdown b/content/versions.markdown similarity index 56% rename from versions.markdown rename to content/versions.markdown index d6a0462a0..d1edfa73b 100644 --- a/versions.markdown +++ b/content/versions.markdown @@ -1,9 +1,8 @@ --- -layout: versions title: Versions -published: true +hidden: true sorting: 1 --- -# Versions Following versions are available in CFEngine docs. +{{< includehtml file="static/versions_list.html" >}} diff --git a/web-ui/Alerts.bottom.condition.type.png b/content/web-ui/Alerts.bottom.condition.type.png similarity index 100% rename from web-ui/Alerts.bottom.condition.type.png rename to content/web-ui/Alerts.bottom.condition.type.png diff --git a/web-ui/Alerts.bottom.hosts.png b/content/web-ui/Alerts.bottom.hosts.png similarity index 100% rename from web-ui/Alerts.bottom.hosts.png rename to content/web-ui/Alerts.bottom.hosts.png diff --git a/web-ui/Alerts.bottom.notifications.png b/content/web-ui/Alerts.bottom.notifications.png similarity index 100% rename from web-ui/Alerts.bottom.notifications.png rename to content/web-ui/Alerts.bottom.notifications.png diff --git a/web-ui/Alerts.new.png b/content/web-ui/Alerts.new.png similarity index 100% rename from web-ui/Alerts.new.png rename to content/web-ui/Alerts.new.png diff --git a/web-ui/Alerts.top.condition.png b/content/web-ui/Alerts.top.condition.png similarity index 100% rename from web-ui/Alerts.top.condition.png rename to content/web-ui/Alerts.top.condition.png diff --git a/web-ui/Alerts.top.name.png b/content/web-ui/Alerts.top.name.png similarity index 100% rename from web-ui/Alerts.top.name.png rename to content/web-ui/Alerts.top.name.png diff --git a/web-ui/Alerts.top.severity.png b/content/web-ui/Alerts.top.severity.png similarity index 100% rename from web-ui/Alerts.top.severity.png rename to content/web-ui/Alerts.top.severity.png diff --git a/web-ui/Authentication-settings.png b/content/web-ui/Authentication-settings.png similarity index 100% rename from web-ui/Authentication-settings.png rename to content/web-ui/Authentication-settings.png diff --git a/web-ui/Host-info-page.png b/content/web-ui/Host-info-page.png similarity index 100% rename from web-ui/Host-info-page.png rename to content/web-ui/Host-info-page.png diff --git a/web-ui/Hosts-app-custom-tree-geographic-region.png b/content/web-ui/Hosts-app-custom-tree-geographic-region.png similarity index 100% rename from web-ui/Hosts-app-custom-tree-geographic-region.png rename to content/web-ui/Hosts-app-custom-tree-geographic-region.png diff --git a/web-ui/Hosts-app-overview.png b/content/web-ui/Hosts-app-overview.png similarity index 100% rename from web-ui/Hosts-app-overview.png rename to content/web-ui/Hosts-app-overview.png diff --git a/web-ui/Mission-Portal-Monitoring-1.png b/content/web-ui/Mission-Portal-Monitoring-1.png similarity index 100% rename from web-ui/Mission-Portal-Monitoring-1.png rename to content/web-ui/Mission-Portal-Monitoring-1.png diff --git a/web-ui/Mission-portal-health-dignostics-header.png b/content/web-ui/Mission-portal-health-dignostics-header.png similarity index 100% rename from web-ui/Mission-portal-health-dignostics-header.png rename to content/web-ui/Mission-portal-health-dignostics-header.png diff --git a/web-ui/Settings-1.png b/content/web-ui/Settings-1.png similarity index 100% rename from web-ui/Settings-1.png rename to content/web-ui/Settings-1.png diff --git a/web-ui/Settings-2.png b/content/web-ui/Settings-2.png similarity index 100% rename from web-ui/Settings-2.png rename to content/web-ui/Settings-2.png diff --git a/web-ui/Settings-3.png b/content/web-ui/Settings-3.png similarity index 100% rename from web-ui/Settings-3.png rename to content/web-ui/Settings-3.png diff --git a/web-ui/Settings-4.png b/content/web-ui/Settings-4.png similarity index 100% rename from web-ui/Settings-4.png rename to content/web-ui/Settings-4.png diff --git a/web-ui/Settings-6.png b/content/web-ui/Settings-6.png similarity index 100% rename from web-ui/Settings-6.png rename to content/web-ui/Settings-6.png diff --git a/web-ui/Settings-7.png b/content/web-ui/Settings-7.png similarity index 100% rename from web-ui/Settings-7.png rename to content/web-ui/Settings-7.png diff --git a/web-ui/Settings-role.png b/content/web-ui/Settings-role.png similarity index 100% rename from web-ui/Settings-role.png rename to content/web-ui/Settings-role.png diff --git a/web-ui/Time-zone-modal.png b/content/web-ui/Time-zone-modal.png similarity index 100% rename from web-ui/Time-zone-modal.png rename to content/web-ui/Time-zone-modal.png diff --git a/web-ui/User-profile.png b/content/web-ui/User-profile.png similarity index 100% rename from web-ui/User-profile.png rename to content/web-ui/User-profile.png diff --git a/web-ui.markdown b/content/web-ui/_index.markdown similarity index 98% rename from web-ui.markdown rename to content/web-ui/_index.markdown index a01e0d422..af880706e 100644 --- a/web-ui.markdown +++ b/content/web-ui/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Web UI -published: true sorting: 40 --- @@ -72,7 +71,7 @@ Examples of significant events include: - Deleting a host - Alert status change -Events are accessible {% comment %}via the Events API {% endcomment %}from every Mission Portal +Events are accessible from every Mission Portal dashboard. The event log on the dashboard is filtered to show only information relevant based on the widgets present. It shows when alerts are triggered and cleared and when hosts are bootstrapped or decommissioned. diff --git a/web-ui/add-new-user.png b/content/web-ui/add-new-user.png similarity index 100% rename from web-ui/add-new-user.png rename to content/web-ui/add-new-user.png diff --git a/web-ui/add_columns.png b/content/web-ui/add_columns.png similarity index 100% rename from web-ui/add_columns.png rename to content/web-ui/add_columns.png diff --git a/web-ui/alerts-and-notifications.markdown b/content/web-ui/alerts-and-notifications.markdown similarity index 99% rename from web-ui/alerts-and-notifications.markdown rename to content/web-ui/alerts-and-notifications.markdown index 0e7f94a23..a8a29cdc3 100644 --- a/web-ui/alerts-and-notifications.markdown +++ b/content/web-ui/alerts-and-notifications.markdown @@ -2,7 +2,6 @@ layout: default title: Alerts and notifications sorting: 40 -published: true --- ## Create a new alert diff --git a/web-ui/clone-dashboard.png b/content/web-ui/clone-dashboard.png similarity index 100% rename from web-ui/clone-dashboard.png rename to content/web-ui/clone-dashboard.png diff --git a/web-ui/create-alert-custom-action-syslog.png b/content/web-ui/create-alert-custom-action-syslog.png similarity index 100% rename from web-ui/create-alert-custom-action-syslog.png rename to content/web-ui/create-alert-custom-action-syslog.png diff --git a/web-ui/custom-actions-for-alerts.markdown b/content/web-ui/custom-actions-for-alerts.markdown similarity index 99% rename from web-ui/custom-actions-for-alerts.markdown rename to content/web-ui/custom-actions-for-alerts.markdown index 6776e21eb..a9493238f 100644 --- a/web-ui/custom-actions-for-alerts.markdown +++ b/content/web-ui/custom-actions-for-alerts.markdown @@ -2,7 +2,6 @@ layout: default title: Custom actions for alerts sorting: 50 -published: true --- Once you have become familiar with the [Alerts widgets][Web UI#Alert widgets], you might see the need to integrate the alerts with an existing system like Nagios, instead of relying on emails for getting notified. diff --git a/web-ui/dashboard-event-log.png b/content/web-ui/dashboard-event-log.png similarity index 100% rename from web-ui/dashboard-event-log.png rename to content/web-ui/dashboard-event-log.png diff --git a/web-ui/dashboard-widget-changes.png b/content/web-ui/dashboard-widget-changes.png similarity index 100% rename from web-ui/dashboard-widget-changes.png rename to content/web-ui/dashboard-widget-changes.png diff --git a/web-ui/dashboard-widget-newly-bootstrapped.png b/content/web-ui/dashboard-widget-newly-bootstrapped.png similarity index 100% rename from web-ui/dashboard-widget-newly-bootstrapped.png rename to content/web-ui/dashboard-widget-newly-bootstrapped.png diff --git a/web-ui/debugging-mission-portal.markdown b/content/web-ui/debugging-mission-portal.markdown similarity index 98% rename from web-ui/debugging-mission-portal.markdown rename to content/web-ui/debugging-mission-portal.markdown index 7145b71f8..0702acf00 100644 --- a/web-ui/debugging-mission-portal.markdown +++ b/content/web-ui/debugging-mission-portal.markdown @@ -1,7 +1,6 @@ --- layout: default title: Debugging Mission Portal -published: true sorting: 90 --- diff --git a/web-ui/enterprise-reporting/Report-Builder-3.18.0.png b/content/web-ui/enterprise-reporting/Report-Builder-3.18.0.png similarity index 100% rename from web-ui/enterprise-reporting/Report-Builder-3.18.0.png rename to content/web-ui/enterprise-reporting/Report-Builder-3.18.0.png diff --git a/content/web-ui/enterprise-reporting/Reports-Inventory-1.png b/content/web-ui/enterprise-reporting/Reports-Inventory-1.png new file mode 100644 index 000000000..be174cc24 Binary files /dev/null and b/content/web-ui/enterprise-reporting/Reports-Inventory-1.png differ diff --git a/web-ui/enterprise-reporting/Reports-Inventory-2.png b/content/web-ui/enterprise-reporting/Reports-Inventory-2.png similarity index 100% rename from web-ui/enterprise-reporting/Reports-Inventory-2.png rename to content/web-ui/enterprise-reporting/Reports-Inventory-2.png diff --git a/web-ui/enterprise-reporting/Reports-Inventory-3.png b/content/web-ui/enterprise-reporting/Reports-Inventory-3.png similarity index 100% rename from web-ui/enterprise-reporting/Reports-Inventory-3.png rename to content/web-ui/enterprise-reporting/Reports-Inventory-3.png diff --git a/web-ui/enterprise-reporting/Reports-Inventory-4.png b/content/web-ui/enterprise-reporting/Reports-Inventory-4.png similarity index 100% rename from web-ui/enterprise-reporting/Reports-Inventory-4.png rename to content/web-ui/enterprise-reporting/Reports-Inventory-4.png diff --git a/web-ui/enterprise-reporting/Reports-Inventory-5.png b/content/web-ui/enterprise-reporting/Reports-Inventory-5.png similarity index 100% rename from web-ui/enterprise-reporting/Reports-Inventory-5.png rename to content/web-ui/enterprise-reporting/Reports-Inventory-5.png diff --git a/web-ui/enterprise-reporting/Reports-Inventory-6.png b/content/web-ui/enterprise-reporting/Reports-Inventory-6.png similarity index 100% rename from web-ui/enterprise-reporting/Reports-Inventory-6.png rename to content/web-ui/enterprise-reporting/Reports-Inventory-6.png diff --git a/web-ui/enterprise-reporting.markdown b/content/web-ui/enterprise-reporting/_index.markdown similarity index 99% rename from web-ui/enterprise-reporting.markdown rename to content/web-ui/enterprise-reporting/_index.markdown index aa547b674..0b616be29 100644 --- a/web-ui/enterprise-reporting.markdown +++ b/content/web-ui/enterprise-reporting/_index.markdown @@ -2,7 +2,6 @@ layout: default title: Enterprise reporting sorting: 50 -published: true --- CFEngine Enterprise can report on promise outcomes (changes made by `cf-agent` diff --git a/web-ui/enterprise-reporting/client-initiated-reporting.markdown b/content/web-ui/enterprise-reporting/client-initiated-reporting.markdown similarity index 99% rename from web-ui/enterprise-reporting/client-initiated-reporting.markdown rename to content/web-ui/enterprise-reporting/client-initiated-reporting.markdown index ea48cd164..e2b1280ab 100644 --- a/web-ui/enterprise-reporting/client-initiated-reporting.markdown +++ b/content/web-ui/enterprise-reporting/client-initiated-reporting.markdown @@ -2,7 +2,6 @@ layout: default title: Client initiated reporting / call collect sorting: 60 -published: true --- Pull collect is the default mode of reporting. diff --git a/web-ui/enterprise-reporting/reporting-architecture.markdown b/content/web-ui/enterprise-reporting/reporting-architecture.markdown similarity index 98% rename from web-ui/enterprise-reporting/reporting-architecture.markdown rename to content/web-ui/enterprise-reporting/reporting-architecture.markdown index 5b7c2520e..7be7a01e5 100644 --- a/web-ui/enterprise-reporting/reporting-architecture.markdown +++ b/content/web-ui/enterprise-reporting/reporting-architecture.markdown @@ -1,7 +1,6 @@ --- layout: default title: Reporting architecture -published: true sorting: 10 --- diff --git a/web-ui/enterprise-reporting/reporting_ui.markdown b/content/web-ui/enterprise-reporting/reporting_ui.markdown similarity index 99% rename from web-ui/enterprise-reporting/reporting_ui.markdown rename to content/web-ui/enterprise-reporting/reporting_ui.markdown index 2aa533741..a6a4a03a1 100644 --- a/web-ui/enterprise-reporting/reporting_ui.markdown +++ b/content/web-ui/enterprise-reporting/reporting_ui.markdown @@ -2,7 +2,6 @@ layout: default title: Reporting UI sorting: 50 -published: true --- CFEngine collects a large amount of data. To inspect it, you can run and schedule pre-defined reports or use the [query builder][Reporting UI#Query builder] for your own custom reports. You can save these queries for later use, and schedule reports for specified times. diff --git a/web-ui/enterprise-reporting/sql-queries-enterprise-api.markdown b/content/web-ui/enterprise-reporting/sql-queries-enterprise-api.markdown similarity index 99% rename from web-ui/enterprise-reporting/sql-queries-enterprise-api.markdown rename to content/web-ui/enterprise-reporting/sql-queries-enterprise-api.markdown index 578a5511c..3b1574be3 100644 --- a/web-ui/enterprise-reporting/sql-queries-enterprise-api.markdown +++ b/content/web-ui/enterprise-reporting/sql-queries-enterprise-api.markdown @@ -1,7 +1,6 @@ --- layout: default title: SQL queries using the Enterprise API -published: true sorting: 20 --- diff --git a/web-ui/federated-reporting.markdown b/content/web-ui/federated-reporting.markdown similarity index 99% rename from web-ui/federated-reporting.markdown rename to content/web-ui/federated-reporting.markdown index fb1c7dc2a..0ae294a2e 100644 --- a/web-ui/federated-reporting.markdown +++ b/content/web-ui/federated-reporting.markdown @@ -1,7 +1,6 @@ --- layout: default title: Federated reporting -published: true sorting: 60 --- diff --git a/web-ui/fr-connect-a-hub.png b/content/web-ui/fr-connect-a-hub.png similarity index 100% rename from web-ui/fr-connect-a-hub.png rename to content/web-ui/fr-connect-a-hub.png diff --git a/web-ui/fr-disabled-feeder.png b/content/web-ui/fr-disabled-feeder.png similarity index 100% rename from web-ui/fr-disabled-feeder.png rename to content/web-ui/fr-disabled-feeder.png diff --git a/web-ui/fr-edit-hub-disable.png b/content/web-ui/fr-edit-hub-disable.png similarity index 100% rename from web-ui/fr-edit-hub-disable.png rename to content/web-ui/fr-edit-hub-disable.png diff --git a/web-ui/fr-feeder-added.png b/content/web-ui/fr-feeder-added.png similarity index 100% rename from web-ui/fr-feeder-added.png rename to content/web-ui/fr-feeder-added.png diff --git a/web-ui/fr-hub-management-default.png b/content/web-ui/fr-hub-management-default.png similarity index 100% rename from web-ui/fr-hub-management-default.png rename to content/web-ui/fr-hub-management-default.png diff --git a/web-ui/fr-hub-management-enabled.png b/content/web-ui/fr-hub-management-enabled.png similarity index 100% rename from web-ui/fr-hub-management-enabled.png rename to content/web-ui/fr-hub-management-enabled.png diff --git a/web-ui/fr-superhub-enabled-no-feeders.png b/content/web-ui/fr-superhub-enabled-no-feeders.png similarity index 100% rename from web-ui/fr-superhub-enabled-no-feeders.png rename to content/web-ui/fr-superhub-enabled-no-feeders.png diff --git a/web-ui/health.markdown b/content/web-ui/health.markdown similarity index 99% rename from web-ui/health.markdown rename to content/web-ui/health.markdown index 334585db3..7cf281145 100644 --- a/web-ui/health.markdown +++ b/content/web-ui/health.markdown @@ -2,7 +2,6 @@ layout: default title: Health sorting: 20 -published: true --- diff --git a/web-ui/host-action-buttons.png b/content/web-ui/host-action-buttons.png similarity index 100% rename from web-ui/host-action-buttons.png rename to content/web-ui/host-action-buttons.png diff --git a/web-ui/host-info-collect-reports.png b/content/web-ui/host-info-collect-reports.png similarity index 100% rename from web-ui/host-info-collect-reports.png rename to content/web-ui/host-info-collect-reports.png diff --git a/web-ui/host-info-delete-host.png b/content/web-ui/host-info-delete-host.png similarity index 100% rename from web-ui/host-info-delete-host.png rename to content/web-ui/host-info-delete-host.png diff --git a/web-ui/host-info-get-url.png b/content/web-ui/host-info-get-url.png similarity index 100% rename from web-ui/host-info-get-url.png rename to content/web-ui/host-info-get-url.png diff --git a/web-ui/host-info-run-agent.png b/content/web-ui/host-info-run-agent.png similarity index 100% rename from web-ui/host-info-run-agent.png rename to content/web-ui/host-info-run-agent.png diff --git a/web-ui/host-specific-data-classes.png b/content/web-ui/host-specific-data-classes.png similarity index 100% rename from web-ui/host-specific-data-classes.png rename to content/web-ui/host-specific-data-classes.png diff --git a/web-ui/host-specific-data-variables.png b/content/web-ui/host-specific-data-variables.png similarity index 100% rename from web-ui/host-specific-data-variables.png rename to content/web-ui/host-specific-data-variables.png diff --git a/web-ui/hosts.markdown b/content/web-ui/hosts.markdown similarity index 99% rename from web-ui/hosts.markdown rename to content/web-ui/hosts.markdown index 7a6fc48bd..a20e10a48 100644 --- a/web-ui/hosts.markdown +++ b/content/web-ui/hosts.markdown @@ -2,7 +2,6 @@ layout: default title: Hosts sorting: 30 -published: true --- The Hosts app provides a customizable global overview of _promise_ compliance. A summary of compliant vs non-compliant hosts is provided at each branch in the tree. diff --git a/web-ui/hub_administration/Mission-portal-remove-host.png b/content/web-ui/hub_administration/Mission-portal-remove-host.png similarity index 100% rename from web-ui/hub_administration/Mission-portal-remove-host.png rename to content/web-ui/hub_administration/Mission-portal-remove-host.png diff --git a/web-ui/hub_administration.markdown b/content/web-ui/hub_administration/_index.markdown similarity index 93% rename from web-ui/hub_administration.markdown rename to content/web-ui/hub_administration/_index.markdown index cc6265e2e..0a0aef57b 100644 --- a/web-ui/hub_administration.markdown +++ b/content/web-ui/hub_administration/_index.markdown @@ -1,7 +1,6 @@ --- layout: default title: Hub administration -published: true sorting: 80 --- diff --git a/web-ui/hub_administration/adjusting-schedules.markdown b/content/web-ui/hub_administration/adjusting-schedules.markdown similarity index 99% rename from web-ui/hub_administration/adjusting-schedules.markdown rename to content/web-ui/hub_administration/adjusting-schedules.markdown index 0b74d9540..ccf3aff17 100644 --- a/web-ui/hub_administration/adjusting-schedules.markdown +++ b/content/web-ui/hub_administration/adjusting-schedules.markdown @@ -1,7 +1,6 @@ --- layout: default title: Adjusting schedules -published: true --- ## Set cf-execd agent execution schedule diff --git a/web-ui/hub_administration/backup-and-restore.markdown b/content/web-ui/hub_administration/backup-and-restore.markdown similarity index 99% rename from web-ui/hub_administration/backup-and-restore.markdown rename to content/web-ui/hub_administration/backup-and-restore.markdown index 4b24d95c4..b6c528a1e 100644 --- a/web-ui/hub_administration/backup-and-restore.markdown +++ b/content/web-ui/hub_administration/backup-and-restore.markdown @@ -1,7 +1,6 @@ --- layout: default title: Backup and restore -published: true --- With policy stored in version control there are few things that should be diff --git a/web-ui/hub_administration/custom-https-certificate.markdown b/content/web-ui/hub_administration/custom-https-certificate.markdown similarity index 98% rename from web-ui/hub_administration/custom-https-certificate.markdown rename to content/web-ui/hub_administration/custom-https-certificate.markdown index d9617f5cb..3f9a56631 100644 --- a/web-ui/hub_administration/custom-https-certificate.markdown +++ b/content/web-ui/hub_administration/custom-https-certificate.markdown @@ -1,7 +1,6 @@ --- layout: default title: Custom SSL certificate -published: true --- When first installed a self-signed ssl certificate is automatically generated diff --git a/web-ui/hub_administration/custom-ldap-port-settings.png b/content/web-ui/hub_administration/custom-ldap-port-settings.png similarity index 100% rename from web-ui/hub_administration/custom-ldap-port-settings.png rename to content/web-ui/hub_administration/custom-ldap-port-settings.png diff --git a/web-ui/hub_administration/custom-ldap-port.markdown b/content/web-ui/hub_administration/custom-ldap-port.markdown similarity index 99% rename from web-ui/hub_administration/custom-ldap-port.markdown rename to content/web-ui/hub_administration/custom-ldap-port.markdown index 8fd3ea7de..19b94deba 100644 --- a/web-ui/hub_administration/custom-ldap-port.markdown +++ b/content/web-ui/hub_administration/custom-ldap-port.markdown @@ -1,7 +1,6 @@ --- layout: default title: Configure a custom LDAP port -published: true --- Mission Portals User settings and preferences provides a radio button diff --git a/web-ui/hub_administration/custom-ldaps-certificate.markdown b/content/web-ui/hub_administration/custom-ldaps-certificate.markdown similarity index 96% rename from web-ui/hub_administration/custom-ldaps-certificate.markdown rename to content/web-ui/hub_administration/custom-ldaps-certificate.markdown index fa43bfb6e..6e2bbdbff 100644 --- a/web-ui/hub_administration/custom-ldaps-certificate.markdown +++ b/content/web-ui/hub_administration/custom-ldaps-certificate.markdown @@ -1,7 +1,6 @@ --- layout: default title: Custom LDAPs certificate -published: true --- To use a custom LDAPs certificate install it into your hubs operating system. diff --git a/web-ui/hub_administration/decommissioning-hosts.markdown b/content/web-ui/hub_administration/decommissioning-hosts.markdown similarity index 99% rename from web-ui/hub_administration/decommissioning-hosts.markdown rename to content/web-ui/hub_administration/decommissioning-hosts.markdown index b9f906fd2..34cbd2485 100644 --- a/web-ui/hub_administration/decommissioning-hosts.markdown +++ b/content/web-ui/hub_administration/decommissioning-hosts.markdown @@ -2,7 +2,6 @@ layout: default title: Decommissioning hosts sorting: 30 -published: true --- Once a host is shut off, or CFEngine is uninstalled, you should remove it from Mission Portal. diff --git a/web-ui/hub_administration/enable-plain-http.markdown b/content/web-ui/hub_administration/enable-plain-http.markdown similarity index 96% rename from web-ui/hub_administration/enable-plain-http.markdown rename to content/web-ui/hub_administration/enable-plain-http.markdown index fdfbaffc6..4e081f0ae 100644 --- a/web-ui/hub_administration/enable-plain-http.markdown +++ b/content/web-ui/hub_administration/enable-plain-http.markdown @@ -1,7 +1,6 @@ --- layout: default title: Enable plain http -published: true --- By default HTTPS is enforced by redirecting any non secure connection requests. diff --git a/web-ui/hub_administration/extended-menu.png b/content/web-ui/hub_administration/extended-menu.png similarity index 100% rename from web-ui/hub_administration/extended-menu.png rename to content/web-ui/hub_administration/extended-menu.png diff --git a/web-ui/hub_administration/extended-query-builder-report.png b/content/web-ui/hub_administration/extended-query-builder-report.png similarity index 100% rename from web-ui/hub_administration/extended-query-builder-report.png rename to content/web-ui/hub_administration/extended-query-builder-report.png diff --git a/web-ui/hub_administration/extended-query-builder.png b/content/web-ui/hub_administration/extended-query-builder.png similarity index 100% rename from web-ui/hub_administration/extended-query-builder.png rename to content/web-ui/hub_administration/extended-query-builder.png diff --git a/web-ui/hub_administration/extending-mission-portal.markdown b/content/web-ui/hub_administration/extending-mission-portal.markdown similarity index 98% rename from web-ui/hub_administration/extending-mission-portal.markdown rename to content/web-ui/hub_administration/extending-mission-portal.markdown index 9b72c01ee..36de67e87 100644 --- a/web-ui/hub_administration/extending-mission-portal.markdown +++ b/content/web-ui/hub_administration/extending-mission-portal.markdown @@ -1,7 +1,6 @@ --- layout: default title: Extending Mission Portal -published: true sorting: 90 --- diff --git a/web-ui/hub_administration/extending-query-builder.markdown b/content/web-ui/hub_administration/extending-query-builder.markdown similarity index 99% rename from web-ui/hub_administration/extending-query-builder.markdown rename to content/web-ui/hub_administration/extending-query-builder.markdown index b0040fcf0..cf0290a95 100644 --- a/web-ui/hub_administration/extending-query-builder.markdown +++ b/content/web-ui/hub_administration/extending-query-builder.markdown @@ -1,7 +1,6 @@ --- layout: default title: Extending query builder in Mission Portal -published: true sorting: 90 --- diff --git a/web-ui/hub_administration/lookup-license-info.markdown b/content/web-ui/hub_administration/lookup-license-info.markdown similarity index 98% rename from web-ui/hub_administration/lookup-license-info.markdown rename to content/web-ui/hub_administration/lookup-license-info.markdown index 273a4d801..a7524434f 100644 --- a/web-ui/hub_administration/lookup-license-info.markdown +++ b/content/web-ui/hub_administration/lookup-license-info.markdown @@ -1,7 +1,6 @@ --- layout: default title: Lookup license info -published: true --- Information about the currently issued license can be obtained from the About section in Mission Portal web interface or from the command line as shown here. diff --git a/web-ui/hub_administration/policy-deployment.markdown b/content/web-ui/hub_administration/policy-deployment.markdown similarity index 99% rename from web-ui/hub_administration/policy-deployment.markdown rename to content/web-ui/hub_administration/policy-deployment.markdown index 4946251ce..05d9aabda 100644 --- a/web-ui/hub_administration/policy-deployment.markdown +++ b/content/web-ui/hub_administration/policy-deployment.markdown @@ -1,7 +1,6 @@ --- layout: default title: Policy deployment -published: true --- By default CFEngine policy is distributed from `/var/cfengine/masterfiles` on diff --git a/web-ui/hub_administration/public-key-distribution.markdown b/content/web-ui/hub_administration/public-key-distribution.markdown similarity index 99% rename from web-ui/hub_administration/public-key-distribution.markdown rename to content/web-ui/hub_administration/public-key-distribution.markdown index 09c4c4cc1..76c87786a 100644 --- a/web-ui/hub_administration/public-key-distribution.markdown +++ b/content/web-ui/hub_administration/public-key-distribution.markdown @@ -1,7 +1,6 @@ --- layout: default title: Public key distribution -published: true --- > How can I arrange for the hosts in my infrastructure to trust a new key? diff --git a/web-ui/hub_administration/regenerate-self-signed-cert.markdown b/content/web-ui/hub_administration/regenerate-self-signed-cert.markdown similarity index 97% rename from web-ui/hub_administration/regenerate-self-signed-cert.markdown rename to content/web-ui/hub_administration/regenerate-self-signed-cert.markdown index 50dbbd315..7a7b6c201 100644 --- a/web-ui/hub_administration/regenerate-self-signed-cert.markdown +++ b/content/web-ui/hub_administration/regenerate-self-signed-cert.markdown @@ -1,7 +1,6 @@ --- layout: default title: Regenerate self signed SSL certificate -published: true --- When first installed a self-signed ssl certificate is automatically generated diff --git a/web-ui/hub_administration/reinstall.markdown b/content/web-ui/hub_administration/reinstall.markdown similarity index 98% rename from web-ui/hub_administration/reinstall.markdown rename to content/web-ui/hub_administration/reinstall.markdown index 20ee13f6e..60c2019d6 100644 --- a/web-ui/hub_administration/reinstall.markdown +++ b/content/web-ui/hub_administration/reinstall.markdown @@ -1,7 +1,6 @@ --- layout: default title: Re-installing Enterprise hub -published: true --- Sometimes it is useful to re-install the hub while still preserving existing diff --git a/web-ui/hub_administration/reset-admin-creds.markdown b/content/web-ui/hub_administration/reset-admin-creds.markdown similarity index 99% rename from web-ui/hub_administration/reset-admin-creds.markdown rename to content/web-ui/hub_administration/reset-admin-creds.markdown index fd87675cb..88e71be90 100644 --- a/web-ui/hub_administration/reset-admin-creds.markdown +++ b/content/web-ui/hub_administration/reset-admin-creds.markdown @@ -1,7 +1,6 @@ --- layout: default title: Reset administrative credentials -published: true --- The default `admin` user can be reset to defaults using the following SQL. diff --git a/web-ui/hub_administration/settings-menu.png b/content/web-ui/hub_administration/settings-menu.png similarity index 100% rename from web-ui/hub_administration/settings-menu.png rename to content/web-ui/hub_administration/settings-menu.png diff --git a/web-ui/hub_administration/settings-vcs.png b/content/web-ui/hub_administration/settings-vcs.png similarity index 100% rename from web-ui/hub_administration/settings-vcs.png rename to content/web-ui/hub_administration/settings-vcs.png diff --git a/web-ui/inventory_filter.gif b/content/web-ui/inventory_filter.gif similarity index 100% rename from web-ui/inventory_filter.gif rename to content/web-ui/inventory_filter.gif diff --git a/web-ui/license-info.png b/content/web-ui/license-info.png similarity index 100% rename from web-ui/license-info.png rename to content/web-ui/license-info.png diff --git a/web-ui/license-status-report.png b/content/web-ui/license-status-report.png similarity index 100% rename from web-ui/license-status-report.png rename to content/web-ui/license-status-report.png diff --git a/web-ui/license.markdown b/content/web-ui/license.markdown similarity index 96% rename from web-ui/license.markdown rename to content/web-ui/license.markdown index 0edab3df5..5aef6bb3a 100644 --- a/web-ui/license.markdown +++ b/content/web-ui/license.markdown @@ -1,7 +1,6 @@ --- layout: default title: License -published: true --- ## License information diff --git a/web-ui/mail-settings.png b/content/web-ui/mail-settings.png similarity index 100% rename from web-ui/mail-settings.png rename to content/web-ui/mail-settings.png diff --git a/web-ui/measurements.markdown b/content/web-ui/measurements.markdown similarity index 98% rename from web-ui/measurements.markdown rename to content/web-ui/measurements.markdown index 339d8b5ad..8ce52e6c9 100644 --- a/web-ui/measurements.markdown +++ b/content/web-ui/measurements.markdown @@ -3,7 +3,6 @@ layout: default title: Measurements app alias: Measurements sorting: 70 -published: true --- Measurements allows you to get an overview of specific metrics on your hosts over time. diff --git a/web-ui/mp-settings-custom-notification-add.png b/content/web-ui/mp-settings-custom-notification-add.png similarity index 100% rename from web-ui/mp-settings-custom-notification-add.png rename to content/web-ui/mp-settings-custom-notification-add.png diff --git a/web-ui/mp-settings-custom-notification.png b/content/web-ui/mp-settings-custom-notification.png similarity index 100% rename from web-ui/mp-settings-custom-notification.png rename to content/web-ui/mp-settings-custom-notification.png diff --git a/web-ui/pause_alerts.gif b/content/web-ui/pause_alerts.gif similarity index 100% rename from web-ui/pause_alerts.gif rename to content/web-ui/pause_alerts.gif diff --git a/web-ui/role_based_access_control_settings.png b/content/web-ui/role_based_access_control_settings.png similarity index 100% rename from web-ui/role_based_access_control_settings.png rename to content/web-ui/role_based_access_control_settings.png diff --git a/web-ui/roles-list.png b/content/web-ui/roles-list.png similarity index 100% rename from web-ui/roles-list.png rename to content/web-ui/roles-list.png diff --git a/web-ui/settings-export-import-3.18.0.png b/content/web-ui/settings-export-import-3.18.0.png similarity index 100% rename from web-ui/settings-export-import-3.18.0.png rename to content/web-ui/settings-export-import-3.18.0.png diff --git a/content/web-ui/settings-vcs.png b/content/web-ui/settings-vcs.png new file mode 100644 index 000000000..eefa7220a Binary files /dev/null and b/content/web-ui/settings-vcs.png differ diff --git a/web-ui/settings.markdown b/content/web-ui/settings.markdown similarity index 99% rename from web-ui/settings.markdown rename to content/web-ui/settings.markdown index 766a4f89b..076e263c2 100644 --- a/web-ui/settings.markdown +++ b/content/web-ui/settings.markdown @@ -2,7 +2,6 @@ layout: default title: Settings sorting: 10 -published: true --- A variety of CFEngine and system properties can be changed in the settings view. diff --git a/web-ui/web-ui-event-log.png b/content/web-ui/web-ui-event-log.png similarity index 100% rename from web-ui/web-ui-event-log.png rename to content/web-ui/web-ui-event-log.png diff --git a/web-ui/web-ui-events-api-rbac-get-event-list-event-checked.png b/content/web-ui/web-ui-events-api-rbac-get-event-list-event-checked.png similarity index 100% rename from web-ui/web-ui-events-api-rbac-get-event-list-event-checked.png rename to content/web-ui/web-ui-events-api-rbac-get-event-list-event-checked.png diff --git a/web-ui/web-ui-mission-portal-api-view-whole-system-events-rbac.png b/content/web-ui/web-ui-mission-portal-api-view-whole-system-events-rbac.png similarity index 100% rename from web-ui/web-ui-mission-portal-api-view-whole-system-events-rbac.png rename to content/web-ui/web-ui-mission-portal-api-view-whole-system-events-rbac.png diff --git a/web-ui/welcome_2nd_screen.png b/content/web-ui/welcome_2nd_screen.png similarity index 100% rename from web-ui/welcome_2nd_screen.png rename to content/web-ui/welcome_2nd_screen.png diff --git a/web-ui/widget_1.gif b/content/web-ui/widget_1.gif similarity index 100% rename from web-ui/widget_1.gif rename to content/web-ui/widget_1.gif diff --git a/generator/.gitignore b/generator/.gitignore index f58df0670..ca3e2ba62 100644 --- a/generator/.gitignore +++ b/generator/.gitignore @@ -3,7 +3,6 @@ _cache/* _site/* _generated/* /nbproject/private/ -/pages/* *.pyc .DS_Store node_modules diff --git a/generator/README.org b/generator/README.org index 0d17e4025..c024dadeb 100644 --- a/generator/README.org +++ b/generator/README.org @@ -158,7 +158,7 @@ For example: ./_scripts/cfdoc_preprocess.py master || exit 4 - bash -x ./_scripts/_run_jekyll.sh master || exit 5 + bash -x ./_scripts/_run.sh master || exit 5 #+END_SRC @@ -174,7 +174,7 @@ Once the syntax map has been regenerated [[https://github.com/cfengine/documenta (whatever that means), resolving links, expanding our custom macros and creating printable (dead trees) versions of the documentation. -After pre-processing is complete [[https://github.com/cfengine/documentation/blob/master/generator/_scripts/_run_jekyll.sh][_run_jekyll.sh]] performs the =jekyll= build, +After pre-processing is complete [[https://github.com/cfengine/documentation/blob/master/generator/_scripts/_run.sh][_run.sh]] performs the =jekyll= build, post processes the build with [[https://github.com/cfengine/documentation/blob/master/generator/_scripts/cfdoc_postprocess.py][cfdoc_postprocess.py]] *** Publishing diff --git a/generator/_assets/css/.gitignore b/generator/_assets/css/.gitignore deleted file mode 100644 index e1bb9ab38..000000000 --- a/generator/_assets/css/.gitignore +++ /dev/null @@ -1 +0,0 @@ -styles.min.css \ No newline at end of file diff --git a/generator/_assets/css/hacks.css b/generator/_assets/css/hacks.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/generator/_assets/css/navigation.css b/generator/_assets/css/navigation.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/generator/_assets/css/style.css b/generator/_assets/css/style.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/generator/_assets/js/custom.js b/generator/_assets/js/custom.js deleted file mode 100755 index e6a8d215b..000000000 --- a/generator/_assets/js/custom.js +++ /dev/null @@ -1,467 +0,0 @@ -'use strict'; -import '../styles/cfengine.less'; - -var is_mobile = true; -$(document).ready(function() { - if ($(window).width() > 800) - { - is_mobile = false; - } - var scrollPos = 380; - /*show/hide moveTop link */ - var showMoveTop = false; - - if (is_mobile === false) - { - $("#moveTop a").click(function(e) { - $(window).scrollTop($('#nav_wrapper').offset().top); - showMoveTop = false; - $("#moveTop").hide(); - e.preventDefault(); - }); - - $(window).scroll(function() { - if ($(window).scrollTop() > scrollPos && showMoveTop===false) { - $("#moveTop").show(); - showMoveTop = true; - } else if($(window).scrollTop() < scrollPos && showMoveTop === true ) { - $("#moveTop").hide(); - showMoveTop = false; - } - }); - } - - if ($(window).scrollTop() > scrollPos && is_mobile === false) - { - $("#moveTop").show(); - showMoveTop = true; - } - - - var ToC_start = - ""; - - var newLine, el, title, link, elClass, url, ToC=''; - var usedIds = {}; - $(".article h2, .article h3, .article h4").each(function() { - el = $(this); - title = el.text() - var id = el.attr("id"); - var uniqueId = id; - if (usedIds[id]){ - uniqueId = id +'-' + usedIds[id]; - el.attr("id",uniqueId); - usedIds[id] += 1; - } else { - usedIds[id] = 1; - } - link = "#" + uniqueId; - elClass = "link_" + el.prop("tagName").toLowerCase() - url = window.location.pathname; - - // if header has data-behavior= exclude-from-toc - do not include it to the TOC list - if (el.children('center').attr('data-behavior') !=="exclude-from-toc") - { - newLine = - "
  • " + - "" + - title + - "" + - "
    • "; - ToC += newLine; - } - }); - - if (ToC.length) - { - if (is_mobile === false) - { - $("#TOCbox_wrapper").show(); - } - var result = ToC_start + ToC + ToC_End; - - $("#TOCbox_wrapper #TOCbox_list").html(''); - $("#print_TOC").html(''); - - $("#TOCbox_wrapper #TOCbox_list").append(result); - $("#print_TOC").append(result); - } else { - $("#TOCbox_wrapper").hide(); - } - - // detect print event, display TOC - var beforePrint = function() { - $("#print_TOC_wrapper").show(); - }; - var afterPrint = function() { - $("#print_TOC_wrapper").hide(); - }; - - if (window.matchMedia) { - var mediaQueryList = window.matchMedia('print'); - mediaQueryList.addListener(function(mql) { - if (mql.matches) { - beforePrint(); - } else { - afterPrint(); - } - }); - } - - window.onbeforeprint = beforePrint; - window.onafterprint = afterPrint; - - -}); - -document.querySelectorAll('pre').forEach(function (pre) { - var closest = pre.closest('div.highlight'); - if (closest) { - closest.innerHTML += ''; - } -}); - -document.querySelectorAll(".copy-to-clipboard").forEach(function (el) { - el.addEventListener("click", function (event) { - event.preventDefault(); - var target = event.target; - var copyText = target - .closest(event.target.dataset.closest) - .querySelector(event.target.dataset.copyfrom) - .innerText - .replace(/\n+$/, ""); // remove trailing newlines from the copied text - navigator.clipboard.writeText(copyText); - target.classList.remove('bi-clipboard'); - target.className += ' bi-check2 '; - setTimeout(function () { target.className = 'bi bi-clipboard copy-to-clipboard' }, 2000); - }) -}); - -var tableOfContents = document.querySelector('.table-of-contents .TOC'); -if (tableOfContents) { - window.onclick = function (e) { - if (!e.target.closest('.TOC') && !tableOfContents.querySelector('.closed')) { - tableOfContents.classList.add('closed'); - } - }; - tableOfContents.onclick = function () { - tableOfContents.classList.toggle('closed'); - }; -} - - -var menu = document.querySelector('.top_menu ul'); -var overlay = document.querySelector('#overlay'); -var openedClass = "opened"; - -window.openMenuHandler = function (collapseMenu) { - if (collapseMenu.className.indexOf(openedClass) == -1) { - collapseMenu.classList.add(openedClass); - menu.classList.add('d-b'); - overlay.style.display = "block"; - } else { - collapseMenu.classList.remove(openedClass); - menu.classList.remove('d-b'); - overlay.style.display = "none"; - } -} - -window.openNavigationHandler = function () { - document.querySelector('.left-menu').classList.add(openedClass); - overlay.style.display = "block"; -} - -document.querySelector('.left-menu .menu-close').onclick = function () { - document.querySelector('.left-menu').classList.remove(openedClass); - overlay.style.display = "none"; -} - -overlay.onclick = function () { - document.querySelector('.collapse').classList.remove(openedClass); - document.querySelector('.left-menu').classList.remove(openedClass); - menu.classList.remove('d-b'); - overlay.style.display = "none"; -} - -var topMenuVersions = document.querySelector('.top_menu-versions'); -topMenuVersions.onclick = function (event) { - topMenuVersions.classList.toggle('opened'); -} - -document.querySelector('.top_menu-versions-title > span > span').innerText = document.querySelector('.top_menu-versions-list a[selected="selected"], .top_menu-versions-list a').innerText; - -var mainMenuCopy = document.querySelector('.left-menu ul.mainMenu').cloneNode(true); -var clickedMenuHistory = [{href: './', name: 'Home'}]; - -var urlPaths = document.location.pathname.split('/'); -var url = urlPaths[urlPaths.length - 1]; // get last url part -var currentMenuItem = document.querySelector('.left-menu li[data-url="'+ url +'"]'); - -var renderNestedMenu = function (href) { - if (href == null) { - document.querySelector('.left-menu ul.mainMenu').replaceWith(mainMenuCopy); - } else { - var ul = mainMenuCopy.querySelector('li[data-url="'+ href +'"]').querySelector('ul').cloneNode(true); - ul.classList.add('mainMenu'); - document.querySelector('.left-menu ul.mainMenu').replaceWith(ul); - var selected = document.querySelector('li[data-url="'+ url +'"]'); - if (selected){ - selected.className += ' opened current'; - } - } - - applyOnclickToMenuItems(); -} -var menuItemClickFn = function (e) { - if (window.innerWidth < 1024) { // if the window width is less than 1024 then treat the menu as mobile one - if (e.target.closest('li').classList.contains('parent')) { - e.preventDefault(); - renderNestedMenu(e.target.getAttribute('href')); - clickedMenuHistory.push({href: e.target.getAttribute('href'), name: e.target.innerText}); - buildBreadcrumbs(clickedMenuHistory); - } - } -}; - -var applyOnclickToMenuItems = function () { - document - .querySelector('.left-menu') - .querySelectorAll('ul li.parent > a') - .forEach(function (item) { - item.onclick = menuItemClickFn - }); -} -applyOnclickToMenuItems(); - -var selectedMenu = document.querySelector('.selectedMenu'); -var leftMenuBreadcrumbs = document.querySelector('.left-menu-breadcrumbs'); -var buildBreadcrumbs = function (items) { - var html = ''; - if (items.length > 3) { - items = items.slice(-3); - html = '
  • ...
  • /
    • '; - } - items.forEach(function (item, index) { - if (index > 0) { - html += '
  • /
    • '; - } - html += '
  • '+ item.name +'
    • ' - }) - leftMenuBreadcrumbs.innerHTML = html; - var lastItem = items[items.length - 1]; - if (window.innerWidth < 1024){ - selectedMenu.innerHTML = lastItem.name !== 'Home' ? - ''+ lastItem.name +' ' : - ''; - } -} - -document.querySelector('.menu-back').onclick = function () { - if (clickedMenuHistory.length != 1) { - clickedMenuHistory.pop(); - var lastHistoryElement = clickedMenuHistory[clickedMenuHistory.length - 1]; - renderNestedMenu(lastHistoryElement['name'] !== 'Home' ? lastHistoryElement['href'] : null); - buildBreadcrumbs(clickedMenuHistory); - } -} - - - -if (currentMenuItem != null) { - currentMenuItem.className += ' opened current'; - var menuHistory = []; - var currentLink = currentMenuItem.querySelector('a'); - // if selected menu item is a parent we show children on mobile menu - if (currentLink && currentMenuItem.classList.contains('parent')){ - menuHistory.unshift({href: currentLink.getAttribute('href'), name: currentLink.innerText}); - } - var closest = currentMenuItem.closest('ul').closest('li'); - - while (true) { - if (!closest) break; - if (window.innerWidth > 1023) { // if the window width more than 1023 then treat the menu as desktop one - closest.classList.add('opened'); - } else { - // Restore history from html - var link = closest.querySelector('a'); - if (link){ - menuHistory.unshift({href: link.getAttribute('href'), name: link.innerText}); - } - } - closest = closest.closest('ul').closest('li'); - } - clickedMenuHistory = clickedMenuHistory.concat(menuHistory); -} -buildBreadcrumbs(clickedMenuHistory); - -if (window.innerWidth > 1023) { - document.querySelectorAll('.mainMenu li.parent > i').forEach(function (element) { - element.onclick = function (event) { - event.stopImmediatePropagation(); - var parent = element.closest('li.parent'); - parent.classList.toggle('opened'); - var openedSubmenus = parent.querySelectorAll('.' +openedClass); - openedSubmenus.forEach((subMenu)=>{ - subMenu.classList.remove(openedClass); - }) - } - }); -} else { - // Small screen - var lastHistoryElement = clickedMenuHistory[clickedMenuHistory.length - 1]; - renderNestedMenu(lastHistoryElement.href); -} - -function fillVersionWrapperSelect(url) { - var xmlhttp = new XMLHttpRequest(); - xmlhttp.open('GET', url, true); - xmlhttp.onreadystatechange = function () { - if (xmlhttp.readyState != 4 || xmlhttp.status != 200) { - return - } - var str = ''; //generated HTML - var data = JSON.parse(xmlhttp.responseText); - for (var i = 0; i < data.docs.length; i++) { - var branch = data.docs[i]; - var selected = ''; - if (location.pathname.indexOf(branch.Link) == 0) { - // this is version that we're currently looking at - selected = ' selected'; - window.currentVersionLink = branch.Link; - } - str += ''; - } - var top_version_wrapper = document.querySelector('#top_version_wrapper select'); - - if (top_version_wrapper) { - top_version_wrapper.innerHTML = str; - } - } - xmlhttp.send(null); -}; - -function selectVersion(value) { - if (value.indexOf('archive') == -1 && window.currentVersionLink) { - window.location = window.location.href.replace(window.currentVersionLink, value); - } else { - window.location = value; - } -}; -window.selectVersion = selectVersion; - -$(document).ready(function () { - fillVersionWrapperSelect('/docs/branches.json') - - const anchors = document.querySelectorAll( - ".article h1[id], .article h2[id], .article h3[id], .article h4[id]" - ); - - anchors.forEach(function(el){ - const url = new URL(window.location.href); - el.insertAdjacentHTML('beforeend', ''); - }); - - document.querySelectorAll('a.anchor').forEach(function (a) { - a.onclick = function (e) { - e.preventDefault(); - navigator.clipboard.writeText(a.href); - a.classList.add('url-copied'); - history.replaceState(null, null, a.href); - setTimeout(function () { a.classList.remove('url-copied') }, 2000); - } - }); - - /** - * Highlight the current TOC item when a user scrolls to the corresponding page section. - */ - (() => { - const tocLinks = document.querySelectorAll('#TOCbox_list li a'); - - if (!tocLinks || !anchors) { - return; - } - - // offsetTop returns offset to the offsetParent, which is main wrapper, we need to add 130px to get actual offset - const fetchOffsets = anchors => [...anchors].map(a => a.offsetTop + 130); - let anchorsOffsets; - let timeout = undefined; - const updateActiveTocItem = () => { - if (timeout) { - clearTimeout(timeout) - } - anchorsOffsets = fetchOffsets(anchors); - - // The current TOC menu item will be calculated in 100 ms after the user stops scrolling. - // Otherwise, there might be redundant calculations. - timeout = setTimeout( () => { - let scrollTop = window.scrollY; - tocLinks.forEach(link => link.classList.remove('current')); - - for (let i = anchorsOffsets.length - 1; i >= 0; i--) { - if (scrollTop > anchorsOffsets[i]) { - setActiveLink(anchors[i].id, i); - break; - } - } - }, 50); // 0.05s threshold - - } - - const setActiveLink = (id, n) => { - const activeLink = document.querySelector(`#TOCbox_list li a[href$="#${id}"]`); - if (activeLink) { - activeLink.classList.add('current'); - } - const tocWrapper = document.getElementById('TOCbox_wrapper'); - const TOC_TOP_OFFSET = 42; - let i = 0; - const offsetArr = [...tocLinks].map((el,)=>{ - const li = el.parentElement; - i+=li.clientHeight + parseInt(window.getComputedStyle(li).getPropertyValue('margin-bottom')); - return i; - }) - const selectedOffset = window.innerHeight-TOC_TOP_OFFSET - (offsetArr[Math.min(offsetArr.length -1 , n + 1)]); - tocWrapper.style.top = (selectedOffset < 0 ? 12 + selectedOffset : 12) + 'px'; - - } - if (window.location.hash){ - const id = window.location.hash.slice(1); - const n = [...anchors].findIndex(a => a.id === id); - setActiveLink(id, n); - } - - - window.addEventListener('scroll', updateActiveTocItem); - window.addEventListener("resize", () => { - // anchors position change when the window is resized - anchorsOffsets = fetchOffsets(anchors); - }); - })(); - - /** - * Display scroll to top button when the scroll reaches 350px - * from the top and window width less than 1280px - */ - (() => { - const scrollToTopBtn = document.getElementById('scrollToTopBtn'); - const showClass = 'show'; - - if (!scrollToTopBtn) { - return; - } - - const handleScrollToTopVisibility = () => { - if (window.scrollY > 350 && window.innerWidth <= 1280) { - scrollToTopBtn.classList.add(showClass); - } else { - scrollToTopBtn.classList.remove(showClass); - } - } - - window.addEventListener('scroll', handleScrollToTopVisibility); - })(); -}); diff --git a/generator/_assets/js/dropdown.js b/generator/_assets/js/dropdown.js deleted file mode 100644 index ac906c823..000000000 --- a/generator/_assets/js/dropdown.js +++ /dev/null @@ -1,23 +0,0 @@ -window.onclick = function (e) { - if (!e.target.closest('.dropdown-select') || e.target.parentElement.classList.contains('dropdown-select_options')) { - document.querySelectorAll('.dropdown-select').forEach(function (item) { - item.classList.remove('opened') - }); - } -}; - -document.querySelectorAll('.dropdown-select span').forEach(function (item) { - item.onclick = function () { - item.closest('.dropdown-select').classList.toggle('opened'); - } -}); - -document.querySelectorAll('.dropdown-select').forEach(function (item) { - var selected_version = item.querySelector('a[selected="selected"]'); - // select first version in dropdown if no selected version - // this happens on build previews, because branch name isn't master there - if (!selected_version) { - selected_version = item.querySelector('a'); - } - item.querySelector('span div').textContent = selected_version.textContent; -}); diff --git a/generator/_assets/js/google_analytics_search.js b/generator/_assets/js/google_analytics_search.js deleted file mode 100644 index 5d55e5022..000000000 --- a/generator/_assets/js/google_analytics_search.js +++ /dev/null @@ -1,28 +0,0 @@ -//google search -(function() { - - var cx = '96c0f638b03564284'; - var gcse = document.createElement('script'); - gcse.type = 'text/javascript'; - gcse.async = true; - gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') + - '//www.google.com/cse/cse.js?cx=' + cx; - var s = document.getElementsByTagName('script')[0]; - s.parentNode.insertBefore(gcse, s); - -})(); - -//google analytics -var _gaq = _gaq || []; -_gaq.push(['_setAccount', 'UA-2576171-2']); -_gaq.push(['_setDomainName', 'cfengine.com']); -_gaq.push(['_trackPageview']); - -(function() { - var ga = document.createElement('script'); - ga.type = 'text/javascript'; - ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; - s.parentNode.insertBefore(ga, s); -})(); diff --git a/generator/_assets/js/jquery-1.9.1.min.js b/generator/_assets/js/jquery-1.9.1.min.js deleted file mode 100644 index 006e95310..000000000 --- a/generator/_assets/js/jquery-1.9.1.min.js +++ /dev/null @@ -1,5 +0,0 @@ -/*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license -//@ sourceMappingURL=jquery.min.map -*/(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="1.9.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:function(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:v&&!v.call("\ufeff\u00a0")?function(e){return null==e?"":v.call(e)}:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?b.merge(n,"string"==typeof e?[e]:e):d.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(g)return g.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return f.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),b.isFunction(e)?(r=h.call(arguments,2),i=function(){return e.apply(n||this,r.concat(h.call(arguments)))},i.guid=e.guid=e.guid||b.guid++,i):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===b.type(r)){o=!0;for(u in r)b.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,b.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(b(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),b.ready.promise=function(t){if(!n)if(n=b.Deferred(),"complete"===o.readyState)setTimeout(b.ready);else if(o.addEventListener)o.addEventListener("DOMContentLoaded",H,!1),e.addEventListener("load",H,!1);else{o.attachEvent("onreadystatechange",H),e.attachEvent("onload",H);var r=!1;try{r=null==e.frameElement&&o.documentElement}catch(i){}r&&r.doScroll&&function a(){if(!b.isReady){try{r.doScroll("left")}catch(e){return setTimeout(a,50)}q(),b.ready()}}()}return n.promise(t)},b.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=b.type(e);return b.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=b(o);var _={};function F(e){var t=_[e]={};return b.each(e.match(w)||[],function(e,n){t[n]=!0}),t}b.Callbacks=function(e){e="string"==typeof e?_[e]||F(e):b.extend({},e);var n,r,i,o,a,s,u=[],l=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=u.length,n=!0;u&&o>a;a++)if(u[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,u&&(l?l.length&&c(l.shift()):r?u=[]:p.disable())},p={add:function(){if(u){var t=u.length;(function i(t){b.each(t,function(t,n){var r=b.type(n);"function"===r?e.unique&&p.has(n)||u.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=u.length:r&&(s=t,c(r))}return this},remove:function(){return u&&b.each(arguments,function(e,t){var r;while((r=b.inArray(t,u,r))>-1)u.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?b.inArray(e,u)>-1:!(!u||!u.length)},empty:function(){return u=[],this},disable:function(){return u=l=r=t,this},disabled:function(){return!u},lock:function(){return l=t,r||p.disable(),this},locked:function(){return!l},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!u||i&&!l||(n?l.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},b.extend({Deferred:function(e){var t=[["resolve","done",b.Callbacks("once memory"),"resolved"],["reject","fail",b.Callbacks("once memory"),"rejected"],["notify","progress",b.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return b.Deferred(function(n){b.each(t,function(t,o){var a=o[0],s=b.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&b.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?b.extend(e,r):r}},i={};return r.pipe=r.then,b.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=h.call(arguments),r=n.length,i=1!==r||e&&b.isFunction(e.promise)?r:0,o=1===i?e:b.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?h.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,u,l;if(r>1)for(s=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&b.isFunction(n[t].promise)?n[t].promise().done(a(t,l,n)).fail(o.reject).progress(a(t,u,s)):--i;return i||o.resolveWith(l,n),o.promise()}}),b.support=function(){var t,n,r,a,s,u,l,c,p,f,d=o.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="
    a",n=d.getElementsByTagName("*"),r=d.getElementsByTagName("a")[0],!n||!r||!n.length)return{};s=o.createElement("select"),l=s.appendChild(o.createElement("option")),a=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={getSetAttribute:"t"!==d.className,leadingWhitespace:3===d.firstChild.nodeType,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:"/a"===r.getAttribute("href"),opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:!!a.value,optSelected:l.selected,enctype:!!o.createElement("form").enctype,html5Clone:"<:nav>"!==o.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===o.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},a.checked=!0,t.noCloneChecked=a.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!l.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}a=o.createElement("input"),a.setAttribute("value",""),t.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),t.radioValue="t"===a.value,a.setAttribute("checked","t"),a.setAttribute("name","t"),u=o.createDocumentFragment(),u.appendChild(a),t.appendChecked=a.checked,t.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;return d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip,b(function(){var n,r,a,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",u=o.getElementsByTagName("body")[0];u&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",u.appendChild(n).appendChild(d),d.innerHTML="
    t
    ",a=d.getElementsByTagName("td"),a[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===a[0].offsetHeight,a[0].style.display="",a[1].style.display="none",t.reliableHiddenOffsets=p&&0===a[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=4===d.offsetWidth,t.doesNotIncludeMarginInBodyOffset=1!==u.offsetTop,e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(o.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="
    ",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(u.style.zoom=1)),u.removeChild(n),n=d=a=r=null)}),n=s=u=l=r=a=null,t}();var O=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,B=/([A-Z])/g;function P(e,n,r,i){if(b.acceptData(e)){var o,a,s=b.expando,u="string"==typeof n,l=e.nodeType,p=l?b.cache:e,f=l?e[s]:e[s]&&s;if(f&&p[f]&&(i||p[f].data)||!u||r!==t)return f||(l?e[s]=f=c.pop()||b.guid++:f=s),p[f]||(p[f]={},l||(p[f].toJSON=b.noop)),("object"==typeof n||"function"==typeof n)&&(i?p[f]=b.extend(p[f],n):p[f].data=b.extend(p[f].data,n)),o=p[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[b.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[b.camelCase(n)])):a=o,a}}function R(e,t,n){if(b.acceptData(e)){var r,i,o,a=e.nodeType,s=a?b.cache:e,u=a?e[b.expando]:b.expando;if(s[u]){if(t&&(o=n?s[u]:s[u].data)){b.isArray(t)?t=t.concat(b.map(t,b.camelCase)):t in o?t=[t]:(t=b.camelCase(t),t=t in o?[t]:t.split(" "));for(r=0,i=t.length;i>r;r++)delete o[t[r]];if(!(n?$:b.isEmptyObject)(o))return}(n||(delete s[u].data,$(s[u])))&&(a?b.cleanData([e],!0):b.support.deleteExpando||s!=s.window?delete s[u]:s[u]=null)}}}b.extend({cache:{},expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?b.cache[e[b.expando]]:e[b.expando],!!e&&!$(e)},data:function(e,t,n){return P(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return P(e,t,n,!0)},_removeData:function(e,t){return R(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&b.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),b.fn.extend({data:function(e,n){var r,i,o=this[0],a=0,s=null;if(e===t){if(this.length&&(s=b.data(o),1===o.nodeType&&!b._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>a;a++)i=r[a].name,i.indexOf("data-")||(i=b.camelCase(i.slice(5)),W(o,i,s[i]));b._data(o,"parsedAttrs",!0)}return s}return"object"==typeof e?this.each(function(){b.data(this,e)}):b.access(this,function(n){return n===t?o?W(o,e,b.data(o,e)):null:(this.each(function(){b.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){b.removeData(this,e)})}});function W(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(B,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:O.test(r)?b.parseJSON(r):r}catch(o){}b.data(e,n,r)}else r=t}return r}function $(e){var t;for(t in e)if(("data"!==t||!b.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}b.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=b._data(e,n),r&&(!i||b.isArray(r)?i=b._data(e,n,b.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=b.queue(e,t),r=n.length,i=n.shift(),o=b._queueHooks(e,t),a=function(){b.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return b._data(e,n)||b._data(e,n,{empty:b.Callbacks("once memory").add(function(){b._removeData(e,t+"queue"),b._removeData(e,n)})})}}),b.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?b.queue(this[0],e):n===t?this:this.each(function(){var t=b.queue(this,e,n);b._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&b.dequeue(this,e)})},dequeue:function(e){return this.each(function(){b.dequeue(this,e)})},delay:function(e,t){return e=b.fx?b.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=b.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=b._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var I,z,X=/[\t\r\n]/g,U=/\r/g,V=/^(?:input|select|textarea|button|object)$/i,Y=/^(?:a|area)$/i,J=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,G=/^(?:checked|selected)$/i,Q=b.support.getSetAttribute,K=b.support.input;b.fn.extend({attr:function(e,t){return b.access(this,b.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){b.removeAttr(this,e)})},prop:function(e,t){return b.access(this,b.prop,e,t,arguments.length>1)},removeProp:function(e){return e=b.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=b.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?b.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return b.isFunction(e)?this.each(function(n){b(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=b(this),u=t,l=e.match(w)||[];while(o=l[a++])u=r?u:!s.hasClass(o),s[u?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&b._data(this,"__className__",this.className),this.className=this.className||e===!1?"":b._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(X," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=b.isFunction(e),this.each(function(n){var o,a=b(this);1===this.nodeType&&(o=i?e.call(this,n,a.val()):e,null==o?o="":"number"==typeof o?o+="":b.isArray(o)&&(o=b.map(o,function(e){return null==e?"":e+""})),r=b.valHooks[this.type]||b.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=b.valHooks[o.type]||b.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(U,""):null==n?"":n)}}}),b.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;for(;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(b.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&b.nodeName(n.parentNode,"optgroup"))){if(t=b(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=b.makeArray(t);return b(e).find("option").each(function(){this.selected=b.inArray(b(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var o,a,s,u=e.nodeType;if(e&&3!==u&&8!==u&&2!==u)return typeof e.getAttribute===i?b.prop(e,n,r):(a=1!==u||!b.isXMLDoc(e),a&&(n=n.toLowerCase(),o=b.attrHooks[n]||(J.test(n)?z:I)),r===t?o&&a&&"get"in o&&null!==(s=o.get(e,n))?s:(typeof e.getAttribute!==i&&(s=e.getAttribute(n)),null==s?t:s):null!==r?o&&a&&"set"in o&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r):(b.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=b.propFix[n]||n,J.test(n)?!Q&&G.test(n)?e[b.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:b.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!b.support.radioValue&&"radio"===t&&b.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!b.isXMLDoc(e),a&&(n=b.propFix[n]||n,o=b.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):V.test(e.nodeName)||Y.test(e.nodeName)&&e.href?0:t}}}}),z={get:function(e,n){var r=b.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?K&&Q?null!=i:G.test(n)?e[b.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?b.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&b.propFix[n]||n,n):e[b.camelCase("default-"+n)]=e[n]=!0,n}},K&&Q||(b.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return b.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t},set:function(e,n,r){return b.nodeName(e,"input")?(e.defaultValue=n,t):I&&I.set(e,n,r)}}),Q||(I=b.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},b.attrHooks.contenteditable={get:I.get,set:function(e,t,n){I.set(e,""===t?!1:t,n)}},b.each(["width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),b.support.hrefNormalized||(b.each(["href","src","width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),b.each(["href","src"],function(e,t){b.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),b.support.style||(b.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),b.support.optSelected||(b.propHooks.selected=b.extend(b.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),b.support.enctype||(b.propFix.enctype="encoding"),b.support.checkOn||b.each(["radio","checkbox"],function(){b.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),b.each(["radio","checkbox"],function(){b.valHooks[this]=b.extend(b.valHooks[this],{set:function(e,n){return b.isArray(n)?e.checked=b.inArray(b(e).val(),n)>=0:t}})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}b.event={global:{},add:function(e,n,r,o,a){var s,u,l,c,p,f,d,h,g,m,y,v=b._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=b.guid++),(u=v.events)||(u=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof b===i||e&&b.event.triggered===e.type?t:b.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(w)||[""],l=n.length;while(l--)s=rt.exec(n[l])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),p=b.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=b.event.special[g]||{},d=b.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&b.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=u[g])||(h=u[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),b.event.global[g]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,p,f,d,h,g,m=b.hasData(e)&&b._data(e);if(m&&(c=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(s=rt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=b.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));u&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||b.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)b.event.remove(e,d+t[l],n,r,!0);b.isEmptyObject(c)&&(delete m.handle,b._removeData(e,"events"))}},trigger:function(n,r,i,a){var s,u,l,c,p,f,d,h=[i||o],g=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];if(l=f=i=i||o,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+b.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),u=0>g.indexOf(":")&&"on"+g,n=n[b.expando]?n:new b.Event(g,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:b.makeArray(r,[n]),p=b.event.special[g]||{},a||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!a&&!p.noBubble&&!b.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(l=l.parentNode);l;l=l.parentNode)h.push(l),f=l;f===(i.ownerDocument||o)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((l=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(b._data(l,"events")||{})[n.type]&&b._data(l,"handle"),s&&s.apply(l,r),s=u&&l[u],s&&b.acceptData(l)&&s.apply&&s.apply(l,r)===!1&&n.preventDefault();if(n.type=g,!(a||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===g&&b.nodeName(i,"a")||!b.acceptData(i)||!u||!i[g]||b.isWindow(i))){f=i[u],f&&(i[u]=null),b.event.triggered=g;try{i[g]()}catch(v){}b.event.triggered=t,f&&(i[u]=f)}return n.result}},dispatch:function(e){e=b.event.fix(e);var n,r,i,o,a,s=[],u=h.call(arguments),l=(b._data(this,"events")||{})[e.type]||[],c=b.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=b.event.handlers.call(this,e,l),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((b.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,u),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(1===l.nodeType&&(l.disabled!==!0||"click"!==e.type)){for(o=[],a=0;u>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?b(r,this).index(l)>=0:b.find(r,this,null,[l]).length),o[r]&&o.push(i);o.length&&s.push({elem:l,handlers:o})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[b.expando])return e;var t,n,r,i=e.type,a=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new b.Event(a),t=r.length;while(t--)n=r[t],e[n]=a[n];return e.target||(e.target=a.srcElement||o),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,a):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,a,s=n.button,u=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||o,a=i.documentElement,r=i.body,e.pageX=n.clientX+(a&&a.scrollLeft||r&&r.scrollLeft||0)-(a&&a.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(a&&a.scrollTop||r&&r.scrollTop||0)-(a&&a.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&u&&(e.relatedTarget=u===e.target?n.toElement:u),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return b.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==o.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===o.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=b.extend(new b.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?b.event.trigger(i,null,t):b.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},b.removeEvent=o.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},b.Event=function(e,n){return this instanceof b.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&b.extend(this,n),this.timeStamp=e&&e.timeStamp||b.now(),this[b.expando]=!0,t):new b.Event(e,n)},b.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},b.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){b.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj; -return(!i||i!==r&&!b.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),b.support.submitBubbles||(b.event.special.submit={setup:function(){return b.nodeName(this,"form")?!1:(b.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=b.nodeName(n,"input")||b.nodeName(n,"button")?n.form:t;r&&!b._data(r,"submitBubbles")&&(b.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),b._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&b.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return b.nodeName(this,"form")?!1:(b.event.remove(this,"._submit"),t)}}),b.support.changeBubbles||(b.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(b.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),b.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),b.event.simulate("change",this,e,!0)})),!1):(b.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!b._data(t,"changeBubbles")&&(b.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||b.event.simulate("change",this.parentNode,e,!0)}),b._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return b.event.remove(this,"._change"),!Z.test(this.nodeName)}}),b.support.focusinBubbles||b.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){b.event.simulate(t,e.target,b.event.fix(e),!0)};b.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),b.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return b().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=b.guid++)),this.each(function(){b.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,b(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){b.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){b.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?b.event.trigger(e,n,r,!0):t}}),function(e,t){var n,r,i,o,a,s,u,l,c,p,f,d,h,g,m,y,v,x="sizzle"+-new Date,w=e.document,T={},N=0,C=0,k=it(),E=it(),S=it(),A=typeof t,j=1<<31,D=[],L=D.pop,H=D.push,q=D.slice,M=D.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},_="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=F.replace("w","w#"),B="([*^$|!~]?=)",P="\\["+_+"*("+F+")"+_+"*(?:"+B+_+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+O+")|)|)"+_+"*\\]",R=":("+F+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+P.replace(3,8)+")*)|.*)\\)|)",W=RegExp("^"+_+"+|((?:^|[^\\\\])(?:\\\\.)*)"+_+"+$","g"),$=RegExp("^"+_+"*,"+_+"*"),I=RegExp("^"+_+"*([\\x20\\t\\r\\n\\f>+~])"+_+"*"),z=RegExp(R),X=RegExp("^"+O+"$"),U={ID:RegExp("^#("+F+")"),CLASS:RegExp("^\\.("+F+")"),NAME:RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:RegExp("^("+F.replace("w","w*")+")"),ATTR:RegExp("^"+P),PSEUDO:RegExp("^"+R),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+_+"*(even|odd|(([+-]|)(\\d*)n|)"+_+"*(?:([+-]|)"+_+"*(\\d+)|))"+_+"*\\)|)","i"),needsContext:RegExp("^"+_+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+_+"*((?:-\\d)?\\d*)"+_+"*\\)|)(?=[^-]|$)","i")},V=/[\x20\t\r\n\f]*[+~]/,Y=/^[^{]+\{\s*\[native code/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,G=/^(?:input|select|textarea|button)$/i,Q=/^h\d$/i,K=/'|\\/g,Z=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,et=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{q.call(w.documentElement.childNodes,0)[0].nodeType}catch(nt){q=function(e){var t,n=[];while(t=this[e++])n.push(t);return n}}function rt(e){return Y.test(e+"")}function it(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>i.cacheLength&&delete e[t.shift()],e[n]=r}}function ot(e){return e[x]=!0,e}function at(e){var t=p.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function st(e,t,n,r){var i,o,a,s,u,l,f,g,m,v;if((t?t.ownerDocument||t:w)!==p&&c(t),t=t||p,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!d&&!r){if(i=J.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&y(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return H.apply(n,q.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&T.getByClassName&&t.getElementsByClassName)return H.apply(n,q.call(t.getElementsByClassName(a),0)),n}if(T.qsa&&!h.test(e)){if(f=!0,g=x,m=t,v=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){l=ft(e),(f=t.getAttribute("id"))?g=f.replace(K,"\\$&"):t.setAttribute("id",g),g="[id='"+g+"'] ",u=l.length;while(u--)l[u]=g+dt(l[u]);m=V.test(e)&&t.parentNode||t,v=l.join(",")}if(v)try{return H.apply(n,q.call(m.querySelectorAll(v),0)),n}catch(b){}finally{f||t.removeAttribute("id")}}}return wt(e.replace(W,"$1"),t,n,r)}a=st.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},c=st.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==p&&9===n.nodeType&&n.documentElement?(p=n,f=n.documentElement,d=a(n),T.tagNameNoComments=at(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),T.attributes=at(function(e){e.innerHTML="";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),T.getByClassName=at(function(e){return e.innerHTML="",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),T.getByName=at(function(e){e.id=x+0,e.innerHTML="
    ",f.insertBefore(e,f.firstChild);var t=n.getElementsByName&&n.getElementsByName(x).length===2+n.getElementsByName(x+0).length;return T.getIdNotName=!n.getElementById(x),f.removeChild(e),t}),i.attrHandle=at(function(e){return e.innerHTML="",e.firstChild&&typeof e.firstChild.getAttribute!==A&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},T.getIdNotName?(i.find.ID=function(e,t){if(typeof t.getElementById!==A&&!d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){return e.getAttribute("id")===t}}):(i.find.ID=function(e,n){if(typeof n.getElementById!==A&&!d){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==A&&r.getAttributeNode("id").value===e?[r]:t:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=T.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==A?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.NAME=T.getByName&&function(e,n){return typeof n.getElementsByName!==A?n.getElementsByName(name):t},i.find.CLASS=T.getByClassName&&function(e,n){return typeof n.getElementsByClassName===A||d?t:n.getElementsByClassName(e)},g=[],h=[":focus"],(T.qsa=rt(n.querySelectorAll))&&(at(function(e){e.innerHTML="",e.querySelectorAll("[selected]").length||h.push("\\["+_+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||h.push(":checked")}),at(function(e){e.innerHTML="",e.querySelectorAll("[i^='']").length&&h.push("[*^$]="+_+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||h.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),h.push(",.*:")})),(T.matchesSelector=rt(m=f.matchesSelector||f.mozMatchesSelector||f.webkitMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&at(function(e){T.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",R)}),h=RegExp(h.join("|")),g=RegExp(g.join("|")),y=rt(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},v=f.compareDocumentPosition?function(e,t){var r;return e===t?(u=!0,0):(r=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&r||e.parentNode&&11===e.parentNode.nodeType?e===n||y(w,e)?-1:t===n||y(w,t)?1:0:4&r?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return u=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:0;if(o===a)return ut(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?ut(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},u=!1,[0,0].sort(v),T.detectDuplicates=u,p):p},st.matches=function(e,t){return st(e,null,null,t)},st.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Z,"='$1']"),!(!T.matchesSelector||d||g&&g.test(t)||h.test(t)))try{var n=m.call(e,t);if(n||T.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return st(t,p,null,[e]).length>0},st.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},st.attr=function(e,t){var n;return(e.ownerDocument||e)!==p&&c(e),d||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):d||T.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},st.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},st.uniqueSort=function(e){var t,n=[],r=1,i=0;if(u=!T.detectDuplicates,e.sort(v),u){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e};function ut(e,t){var n=t&&e,r=n&&(~t.sourceIndex||j)-(~e.sourceIndex||j);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function lt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ct(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function pt(e){return ot(function(t){return t=+t,ot(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}o=st.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=st.selectors={cacheLength:50,createPseudo:ot,match:U,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(et,tt),e[3]=(e[4]||e[5]||"").replace(et,tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||st.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&st.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return U.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&z.test(n)&&(t=ft(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(et,tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[e+" "];return t||(t=RegExp("(^|"+_+")"+e+"("+_+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=st.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[x]||(m[x]={}),l=c[e]||[],d=l[0]===N&&l[1],f=l[0]===N&&l[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[N,d,f];break}}else if(v&&(l=(t[x]||(t[x]={}))[e])&&l[0]===N)f=l[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[x]||(p[x]={}))[e]=[N,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||st.error("unsupported pseudo: "+e);return r[x]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?ot(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=M.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ot(function(e){var t=[],n=[],r=s(e.replace(W,"$1"));return r[x]?ot(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ot(function(e){return function(t){return st(e,t).length>0}}),contains:ot(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:ot(function(e){return X.test(e||"")||st.error("unsupported lang: "+e),e=e.replace(et,tt).toLowerCase(),function(t){var n;do if(n=d?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return Q.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:pt(function(){return[0]}),last:pt(function(e,t){return[t-1]}),eq:pt(function(e,t,n){return[0>n?n+t:n]}),even:pt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:pt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:pt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:pt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[n]=lt(n);for(n in{submit:!0,reset:!0})i.pseudos[n]=ct(n);function ft(e,t){var n,r,o,a,s,u,l,c=E[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=i.preFilter;while(s){(!n||(r=$.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(o=[])),n=!1,(r=I.exec(s))&&(n=r.shift(),o.push({value:n,type:r[0].replace(W," ")}),s=s.slice(n.length));for(a in i.filter)!(r=U[a].exec(s))||l[a]&&!(r=l[a](r))||(n=r.shift(),o.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?st.error(e):E(e,u).slice(0)}function dt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function ht(e,t,n){var i=t.dir,o=n&&"parentNode"===i,a=C++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,s){var u,l,c,p=N+" "+a;if(s){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[x]||(t[x]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,s)||r,l[1]===!0)return!0}}function gt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function mt(e,t,n,r,i){var o,a=[],s=0,u=e.length,l=null!=t;for(;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function yt(e,t,n,r,i,o){return r&&!r[x]&&(r=yt(r)),i&&!i[x]&&(i=yt(i,o)),ot(function(o,a,s,u){var l,c,p,f=[],d=[],h=a.length,g=o||xt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:mt(g,f,e,s,u),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,u),r){l=mt(y,d),r(l,[],s,u),c=l.length;while(c--)(p=l[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?M.call(o,p):f[c])>-1&&(o[l]=!(a[l]=p))}}else y=mt(y===a?y.splice(h,y.length):y),i?i(null,a,y,u):H.apply(a,y)})}function vt(e){var t,n,r,o=e.length,a=i.relative[e[0].type],s=a||i.relative[" "],u=a?1:0,c=ht(function(e){return e===t},s,!0),p=ht(function(e){return M.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>u;u++)if(n=i.relative[e[u].type])f=[ht(gt(f),n)];else{if(n=i.filter[e[u].type].apply(null,e[u].matches),n[x]){for(r=++u;o>r;r++)if(i.relative[e[r].type])break;return yt(u>1&>(f),u>1&&dt(e.slice(0,u-1)).replace(W,"$1"),n,r>u&&vt(e.slice(u,r)),o>r&&vt(e=e.slice(r)),o>r&&dt(e))}f.push(n)}return gt(f)}function bt(e,t){var n=0,o=t.length>0,a=e.length>0,s=function(s,u,c,f,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,T=l,C=s||a&&i.find.TAG("*",d&&u.parentNode||u),k=N+=null==T?1:Math.random()||.1;for(w&&(l=u!==p&&u,r=n);null!=(h=C[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,u,c)){f.push(h);break}w&&(N=k,r=++n)}o&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,o&&b!==v){g=0;while(m=t[g++])m(x,y,u,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=L.call(f));y=mt(y)}H.apply(f,y),w&&!s&&y.length>0&&v+t.length>1&&st.uniqueSort(f)}return w&&(N=k,l=T),x};return o?ot(s):s}s=st.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=ft(e)),n=t.length;while(n--)o=vt(t[n]),o[x]?r.push(o):i.push(o);o=S(e,bt(i,r))}return o};function xt(e,t,n){var r=0,i=t.length;for(;i>r;r++)st(e,t[r],n);return n}function wt(e,t,n,r){var o,a,u,l,c,p=ft(e);if(!r&&1===p.length){if(a=p[0]=p[0].slice(0),a.length>2&&"ID"===(u=a[0]).type&&9===t.nodeType&&!d&&i.relative[a[1].type]){if(t=i.find.ID(u.matches[0].replace(et,tt),t)[0],!t)return n;e=e.slice(a.shift().value.length)}o=U.needsContext.test(e)?0:a.length;while(o--){if(u=a[o],i.relative[l=u.type])break;if((c=i.find[l])&&(r=c(u.matches[0].replace(et,tt),V.test(a[0].type)&&t.parentNode||t))){if(a.splice(o,1),e=r.length&&dt(a),!e)return H.apply(n,q.call(r,0)),n;break}}}return s(e,p)(r,t,d,n,V.test(e)),n}i.pseudos.nth=i.pseudos.eq;function Tt(){}i.filters=Tt.prototype=i.pseudos,i.setFilters=new Tt,c(),st.attr=b.attr,b.find=st,b.expr=st.selectors,b.expr[":"]=b.expr.pseudos,b.unique=st.uniqueSort,b.text=st.getText,b.isXMLDoc=st.isXML,b.contains=st.contains}(e);var at=/Until$/,st=/^(?:parents|prev(?:Until|All))/,ut=/^.[^:#\[\.,]*$/,lt=b.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};b.fn.extend({find:function(e){var t,n,r,i=this.length;if("string"!=typeof e)return r=this,this.pushStack(b(e).filter(function(){for(t=0;i>t;t++)if(b.contains(r[t],this))return!0}));for(n=[],t=0;i>t;t++)b.find(e,this[t],n);return n=this.pushStack(i>1?b.unique(n):n),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=b(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(b.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1))},filter:function(e){return this.pushStack(ft(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?lt.test(e)?b(e,this.context).index(this[0])>=0:b.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,o=[],a=lt.test(e)||"string"!=typeof e?b(e,t||this.context):0;for(;i>r;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&11!==n.nodeType){if(a?a.index(n)>-1:b.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}}return this.pushStack(o.length>1?b.unique(o):o)},index:function(e){return e?"string"==typeof e?b.inArray(this[0],b(e)):b.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?b(e,t):b.makeArray(e&&e.nodeType?[e]:e),r=b.merge(this.get(),n);return this.pushStack(b.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),b.fn.andSelf=b.fn.addBack;function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}b.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return b.dir(e,"parentNode")},parentsUntil:function(e,t,n){return b.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return b.dir(e,"nextSibling")},prevAll:function(e){return b.dir(e,"previousSibling")},nextUntil:function(e,t,n){return b.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return b.dir(e,"previousSibling",n)},siblings:function(e){return b.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return b.sibling(e.firstChild)},contents:function(e){return b.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:b.merge([],e.childNodes)}},function(e,t){b.fn[e]=function(n,r){var i=b.map(this,t,n);return at.test(e)||(r=n),r&&"string"==typeof r&&(i=b.filter(r,i)),i=this.length>1&&!ct[e]?b.unique(i):i,this.length>1&&st.test(e)&&(i=i.reverse()),this.pushStack(i)}}),b.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?b.find.matchesSelector(t[0],e)?[t[0]]:[]:b.find.matches(e,t)},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!b(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(t=t||0,b.isFunction(t))return b.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return b.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=b.grep(e,function(e){return 1===e.nodeType});if(ut.test(t))return b.filter(t,r,!n);t=b.filter(t,r)}return b.grep(e,function(e){return b.inArray(e,t)>=0===n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/\s*$/g,At={option:[1,""],legend:[1,"
    ","
    "],area:[1,"",""],param:[1,"",""],thead:[1,"","
    "],tr:[2,"","
    "],col:[2,"","
    "],td:[3,"","
    "],_default:b.support.htmlSerialize?[0,"",""]:[1,"X
    ","
    "]},jt=dt(o),Dt=jt.appendChild(o.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,b.fn.extend({text:function(e){return b.access(this,function(e){return e===t?b.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(b.isFunction(e))return this.each(function(t){b(this).wrapAll(e.call(this,t))});if(this[0]){var t=b(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return b.isFunction(e)?this.each(function(t){b(this).wrapInner(e.call(this,t))}):this.each(function(){var t=b(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=b.isFunction(e);return this.each(function(n){b(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){b.nodeName(this,"body")||b(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=0;for(;null!=(n=this[r]);r++)(!e||b.filter(e,[n]).length>0)&&(t||1!==n.nodeType||b.cleanData(Ot(n)),n.parentNode&&(t&&b.contains(n.ownerDocument,n)&&Mt(Ot(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&b.cleanData(Ot(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&b.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return b.clone(this,e,t)})},html:function(e){return b.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!b.support.htmlSerialize&&mt.test(e)||!b.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(b.cleanData(Ot(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=b.isFunction(e);return t||"string"==typeof e||(e=b(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;n&&(b(this).remove(),n.insertBefore(e,t))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=f.apply([],e);var i,o,a,s,u,l,c=0,p=this.length,d=this,h=p-1,g=e[0],m=b.isFunction(g);if(m||!(1>=p||"string"!=typeof g||b.support.checkClone)&&Ct.test(g))return this.each(function(i){var o=d.eq(i);m&&(e[0]=g.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(p&&(l=b.buildFragment(e,this[0].ownerDocument,!1,this),i=l.firstChild,1===l.childNodes.length&&(l=i),i)){for(n=n&&b.nodeName(i,"tr"),s=b.map(Ot(l,"script"),Ht),a=s.length;p>c;c++)o=l,c!==h&&(o=b.clone(o,!0,!0),a&&b.merge(s,Ot(o,"script"))),r.call(n&&b.nodeName(this[c],"table")?Lt(this[c],"tbody"):this[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,b.map(s,qt),c=0;a>c;c++)o=s[c],kt.test(o.type||"")&&!b._data(o,"globalEval")&&b.contains(u,o)&&(o.src?b.ajax({url:o.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):b.globalEval((o.text||o.textContent||o.innerHTML||"").replace(St,"")));l=i=null}return this}});function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function Ht(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Mt(e,t){var n,r=0;for(;null!=(n=e[r]);r++)b._data(n,"globalEval",!t||b._data(t[r],"globalEval"))}function _t(e,t){if(1===t.nodeType&&b.hasData(e)){var n,r,i,o=b._data(e),a=b._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)b.event.add(t,n,s[n][r])}a.data&&(a.data=b.extend({},a.data))}}function Ft(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!b.support.noCloneEvent&&t[b.expando]){i=b._data(t);for(r in i.events)b.removeEvent(t,r,i.handle);t.removeAttribute(b.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),b.support.html5Clone&&e.innerHTML&&!b.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Nt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}b.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){b.fn[e]=function(e){var n,r=0,i=[],o=b(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),b(o[r])[t](n),d.apply(i,n.get());return this.pushStack(i)}});function Ot(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||b.nodeName(o,n)?s.push(o):b.merge(s,Ot(o,n));return n===t||n&&b.nodeName(e,n)?b.merge([e],s):s}function Bt(e){Nt.test(e.type)&&(e.defaultChecked=e.checked)}b.extend({clone:function(e,t,n){var r,i,o,a,s,u=b.contains(e.ownerDocument,e);if(b.support.html5Clone||b.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(b.support.noCloneEvent&&b.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||b.isXMLDoc(e)))for(r=Ot(o),s=Ot(e),a=0;null!=(i=s[a]);++a)r[a]&&Ft(i,r[a]);if(t)if(n)for(s=s||Ot(e),r=r||Ot(o),a=0;null!=(i=s[a]);a++)_t(i,r[a]);else _t(e,o);return r=Ot(o,"script"),r.length>0&&Mt(r,!u&&Ot(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,u,l,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===b.type(o))b.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),u=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[u]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!b.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!b.support.tbody){o="table"!==u||xt.test(o)?""!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)b.nodeName(l=o.childNodes[i],"tbody")&&!l.childNodes.length&&o.removeChild(l) -}b.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),b.support.appendChecked||b.grep(Ot(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===b.inArray(o,r))&&(a=b.contains(o.ownerDocument,o),s=Ot(f.appendChild(o),"script"),a&&Mt(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,u=b.expando,l=b.cache,p=b.support.deleteExpando,f=b.event.special;for(;null!=(n=e[s]);s++)if((t||b.acceptData(n))&&(o=n[u],a=o&&l[o])){if(a.events)for(r in a.events)f[r]?b.event.remove(n,r):b.removeEvent(n,r,a.handle);l[o]&&(delete l[o],p?delete n[u]:typeof n.removeAttribute!==i?n.removeAttribute(u):n[u]=null,c.push(o))}}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+x+")(.*)$","i"),Yt=RegExp("^("+x+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+x+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===b.css(e,"display")||!b.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=b._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=b._data(r,"olddisplay",un(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&b._data(r,"olddisplay",i?n:b.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}b.fn.extend({css:function(e,n){return b.access(this,function(e,n,r){var i,o,a={},s=0;if(b.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=b.css(e,n[s],!1,o);return a}return r!==t?b.style(e,n,r):b.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?b(this).show():b(this).hide()})}}),b.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":b.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=b.camelCase(n),l=e.style;if(n=b.cssProps[u]||(b.cssProps[u]=tn(l,u)),s=b.cssHooks[n]||b.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(b.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||b.cssNumber[u]||(r+="px"),b.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=b.camelCase(n);return n=b.cssProps[u]||(b.cssProps[u]=tn(e.style,u)),s=b.cssHooks[n]||b.cssHooks[u],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||b.isNumeric(o)?o||0:a):a},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||b.contains(e.ownerDocument,e)||(u=b.style(e,n)),Yt.test(u)&&Ut.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):o.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),Yt.test(u)&&!zt.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=b.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=b.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=b.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=b.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=b.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(b.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function un(e){var t=o,n=Gt[e];return n||(n=ln(e,t),"none"!==n&&n||(Pt=(Pt||b("