You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2018/07/15 08:14:48 UTC

[sling-site] 01/02: Merge branch 'master' into feature/upgrade-to-jbake-261

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch feature/upgrade-to-jbake-261
in repository https://gitbox.apache.org/repos/asf/sling-site.git

commit 00d517b76725e168606697da201624cb9ea22c9b
Merge: bc8128f 4ded2c0
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Sun Jul 15 10:11:09 2018 +0200

    Merge branch 'master' into feature/upgrade-to-jbake-261

 ...g-filesystem-resources-extensions-fsresource.md |  2 +-
 .../apache-sling-eventing-and-job-handling.md      |  2 +-
 .../bundles/file-installer-provider.md             |  2 +-
 .../bundles/internationalization-support-i18n.md   |  2 +-
 ...anaging-permissions-jackrabbit-accessmanager.md |  2 +-
 ...g-content-the-slingpostservlet-servlets-post.md | 28 +++++++++++-----------
 .../bundles/scripting/scripting-htl.md             | 18 +++++++-------
 .../bundles/scripting/scripting-jsp.md             |  2 +-
 .../bundles/sling-pipes/execution-monitoring.md    | 12 +++++-----
 .../sling-settings-org-apache-sling-settings.md    |  2 +-
 .../bundles/web-console-extensions.md              |  2 +-
 .../jbake/content/documentation/configuration.md   |  8 +++----
 .../development/client-request-logging.md          |  8 +++----
 .../development/dependency-management.md           |  2 +-
 .../documentation/development/embedding-sling.md   | 12 +++++-----
 .../documentation/development/ide-tooling.md       |  2 +-
 .../documentation/development/issue-tracker.md     |  6 ++---
 .../content/documentation/development/logging.md   |  8 +++----
 .../development/maven-launchpad-plugin.md          |  2 +-
 .../documentation/development/version-policy.md    |  4 ++--
 .../jbake/content/documentation/legacy/logging.md  |  8 +++----
 .../authentication-authenticationhandler.md        |  4 ++--
 .../form-based-authenticationhandler.md            |  6 ++---
 .../openid-authenticationhandler.md                |  6 ++---
 .../authentication/authentication-framework.md     |  6 ++---
 .../the-sling-engine/dispatching-requests.md       |  2 +-
 .../documentation/the-sling-engine/featureflags.md |  2 +-
 .../documentation/the-sling-engine/filters.md      |  4 ++--
 .../mappings-for-resource-resolution.md            |  2 +-
 .../the-sling-engine/request-listeners.md          |  2 +-
 .../the-sling-engine/request-parameters.md         |  6 ++---
 .../documentation/the-sling-engine/resources.md    |  4 ++--
 .../the-sling-engine/the-sling-launchpad.md        |  6 ++---
 .../the-sling-engine/url-decomposition.md          |  2 +-
 .../jbake/content/old-stuff/request-processing.md  |  2 +-
 .../jbake/content/old-stuff/servlet-resolution.md  |  2 +-
 src/main/jbake/content/old-stuff/sling-api.md      |  6 ++---
 src/main/jbake/content/project-information.md      |  2 +-
 .../content/project-information/project-team.md    |  4 ++--
 src/main/jbake/templates/downloads.tpl             |  2 +-
 40 files changed, 102 insertions(+), 102 deletions(-)