diff --git a/builders/html/templates/category.cfm b/builders/html/templates/category.cfm index cab6315bd..0237cdd4a 100644 --- a/builders/html/templates/category.cfm +++ b/builders/html/templates/category.cfm @@ -8,13 +8,24 @@ local.pages = args.docTree.sortPagesByType( local.pages ); local.currentPageType = ""; - local.pageTypeTitles = { - "function" = "Functions", - "_method" = "Methods", - "_object" = "Objects", - "tag" = "Tags", - "category" = "Categories", - }; + // this enforces the sub category order + local.pageTypeTitles = [ + "function" = { title="Functions", pages=0 }, + "tag" = { title="Tags", pages=0 }, + "_method" = { title="Methods", pages=0 }, + "_object" = { title="Objects", pages=0 }, + "category" = { title="Categories", pages=0 }, + "page" = { title="Guides",pages=0 } + ]; + + local.missingPageTypes = {}; + loop array="#local.pages#" index="local.i" item="local.page" { + if ( !structKeyExists(local.pageTypeTitles, local.page.getPageType() ) ) { + request.logger (text="Unknown page type: [ #local.page.getPageType()# ] page [#local.page.getSourceFile()#] defaulting to [page.md]", type="WARN"); + local.page.setPageType("page"); + } + local.pageTypeTitles[local.page.getPageType()].pages++; + } @@ -25,18 +36,17 @@

There are no pages tagged with this category.

- - - - - - -

#( local.pageTypeTitles[ local.page.getPageType() ] ?: "Guides" )#

+ + +

#( local.pageType.title )#

    + + +
  • [[#htmleditformat(local.page.getId())#]] #htmleditformat( getMetaDescription(local.page, local.page.getBody()) )#
    • +     +     +
- -
  • [[#htmleditformat(local.page.getId())#]] #htmleditformat( getMetaDescription(local.page, local.page.getBody()) )#
    •  -     \ No newline at end of file diff --git a/docs/04.guides/02.installing-lucee/10.lucee-server-adminstration-windows/08.Configuring-SES-url-on-windows/page.md b/docs/04.guides/02.installing-lucee/10.lucee-server-adminstration-windows/08.Configuring-SES-url-on-windows/page.md index dbb2356d7..6f79f1dd3 100644 --- a/docs/04.guides/02.installing-lucee/10.lucee-server-adminstration-windows/08.Configuring-SES-url-on-windows/page.md +++ b/docs/04.guides/02.installing-lucee/10.lucee-server-adminstration-windows/08.Configuring-SES-url-on-windows/page.md @@ -31,7 +31,7 @@ If your site doesn't have something in the URL to key off of, then you're going /*=ajp13 -However, at this point IIS will be pretty useless. The only thing it will be doing is handing off requests to Tomcat. You may want to consider removing IIS and just [[utilizing-tomcat-built-in-web-server]]. +However, at this point IIS will be pretty useless. The only thing it will be doing is handing off requests to Tomcat. You may want to consider removing IIS and just [[windows-utilizing-tomcat-built-in-web-server]]. ### Configuring Tomcat ### diff --git a/docs/04.guides/04.cookbooks/24.Query-Handling/page.md b/docs/04.guides/04.cookbooks/24.Query-Handling/page.md index 0078bd7f2..c2f21a7bf 100644 --- a/docs/04.guides/04.cookbooks/24.Query-Handling/page.md +++ b/docs/04.guides/04.cookbooks/24.Query-Handling/page.md @@ -44,7 +44,7 @@ Passing values with [[tag-QueryParam]] has two advantages: ### Params ### -Here we use params as part of [[tag-cfquery]] tag, used to pass the value with SQL statement. +Here we use params as part of [[tag-query]] tag, used to pass the value with SQL statement. Pass the params value with struct diff --git a/docs/05.categories/090.esapi/category.md b/docs/05.categories/090.esapi/category.md index 455c7764f..17683a51f 100644 --- a/docs/05.categories/090.esapi/category.md +++ b/docs/05.categories/090.esapi/category.md @@ -1,7 +1,8 @@ --- title: Encode/Decode id: category-esapi -related: +categories: +- category-core --- -Enterprise Security API +Used to prevent XSS, these functions use the ESAPI (Enterprise Security API) library to safely handle user input. diff --git a/docs/recipes/ai-for-documentation.md b/docs/recipes/ai-for-documentation.md index ec55f9a20..06985dcf8 100644 --- a/docs/recipes/ai-for-documentation.md +++ b/docs/recipes/ai-for-documentation.md @@ -38,6 +38,7 @@ To enable AI in the Documentation tab of the Monitor, set up a compatible AI con Below are example configurations to enable AI functionality in the Documentation tab, important here is the `default` setting. **OpenAI (ChatGPT) Configuration Example:** + ```json "ai": { "docChatGPT": { diff --git a/docs/recipes/ai.md b/docs/recipes/ai.md index a677d20e2..25a776aff 100644 --- a/docs/recipes/ai.md +++ b/docs/recipes/ai.md @@ -19,6 +19,7 @@ Lucee 6.2 includes experimental support for AI integration, which will be finali In Lucee 6.2, AI connections can be configured similarly to datasources or caches, either in the Lucee Administrator or directly in `.CFConfig.json`. Here are sample configurations: **OpenAI (ChatGPT) Example:** + ```json "ai": { "mychatgpt": { @@ -36,6 +37,7 @@ In Lucee 6.2, AI connections can be configured similarly to datasources or cache ``` **Google Gemini Example:** + ```json "ai": { "mygemini": { @@ -51,6 +53,7 @@ In Lucee 6.2, AI connections can be configured similarly to datasources or cache ``` **Ollama (Local) Example:** + ```json "ai": { "gemma2": { @@ -68,6 +71,7 @@ In Lucee 6.2, AI connections can be configured similarly to datasources or cache In these examples, ChatGPT from OpenAI, Gemini from Google, and Ollama for local use are set up. The `OpenAIEngine` allows configuration for `openai` or `ollama` types and can also connect to any service using the OpenAI REST interface by specifying a URL: **OpenAI REST Interface Example:** + ```json "ai": { "lucy": { @@ -110,6 +114,7 @@ You can interact with AI directly via Lucee functions and tags. At the moment, these functions use the prefix `Lucee` to avoid conflicts with existing functions in your code. With Lucee 7, we plan to remove the prefix (but still support it as an alias). **Direct Interaction Example:** + ```javascript // start a session with a specic AI endpoint slim = LuceeCreateAISession(name:'gemma2', systemMessage:"Answer as Slim Shady."); @@ -136,7 +141,7 @@ This feature is still a work in progress, and we are working to improve the qual ### Monitor Documentation Tab In the Monitor's Documentation tab, AI can answer questions about Lucee based on retrieval-augmented generation (RAG) with available documentation and links to related documents. -This feature is also in development for enhanced input quality (read more about Monitor Documentation here https://github.com/lucee/lucee-docs/blob/master/docs/recipes/monitoring-debugging.md). +This feature is also in development for enhanced input quality (read more about [https://github.com/lucee/lucee-docs/blob/master/docs/recipes/monitoring-debugging.md](Monitor Documentation) ). ## Future Development diff --git a/docs/recipes/breaking-changes-6-1.md b/docs/recipes/breaking-changes-6-1.md index 0246dcf2c..92a3784e8 100644 --- a/docs/recipes/breaking-changes-6-1.md +++ b/docs/recipes/breaking-changes-6-1.md @@ -1,5 +1,4 @@ -