diff --git a/basis/furnace/auth/auth-docs.factor b/basis/furnace/auth/auth-docs.factor index f1f68c975d..3f1bcb6085 100644 --- a/basis/furnace/auth/auth-docs.factor +++ b/basis/furnace/auth/auth-docs.factor @@ -105,9 +105,8 @@ ARTICLE: "furnace.auth.realm-config" "Authentication realm configuration" "Instances of subclasses of " { $link realm } " have the following slots which may be set:" { $table { { $slot "name" } "A string identifying the realm for user interface purposes" } - { { $slot "users" } { "An authentication provider (see " { $link "furnace.auth.providers" } ". By default, the " { $link users-in-db } " provider is used." } } + { { $slot "users" } { "An authentication provider (see " { $link "furnace.auth.providers" } "). By default, the " { $link users-in-db } " provider is used." } } { { $slot "checksum" } { "An implementation of the checksum protocol used for verifying passwords (see " { $link "checksums" } "). The " { $link sha-256 } " checksum is used by default." } } - { { $slot "users" } { "An authentication provider (see " { $link "furnace.auth.providers" } } } { { $slot "secure" } { "A boolean, that when set to a true value, forces the client to access the authentication realm via HTTPS. An attempt to access the realm via HTTP results in a redirect to the corresponding HTTPS URL. On by default." } } } ; diff --git a/basis/html/templates/chloe/chloe.factor b/basis/html/templates/chloe/chloe.factor index 47c7934c83..e5b40fcfaa 100644 --- a/basis/html/templates/chloe/chloe.factor +++ b/basis/html/templates/chloe/chloe.factor @@ -16,7 +16,6 @@ html.templates.chloe.components html.templates.chloe.syntax ; IN: html.templates.chloe -! Chloe is Ed's favorite web designer TUPLE: chloe path ; C: chloe diff --git a/basis/html/templates/chloe/compiler/compiler.factor b/basis/html/templates/chloe/compiler/compiler.factor index 4034b67d45..7180e8cdbc 100644 --- a/basis/html/templates/chloe/compiler/compiler.factor +++ b/basis/html/templates/chloe/compiler/compiler.factor @@ -73,8 +73,8 @@ DEFER: compile-element [ compile-start-tag ] [ compile-children ] [ compile-end-tag ] - [ drop tag-stack get pop* ] - } cleave ; + } cleave + tag-stack get pop* ; ERROR: unknown-chloe-tag tag ; @@ -116,7 +116,7 @@ ERROR: unknown-chloe-tag tag ; [ [ compile-children ] compile-quot ] [ % ] bi* ; inline : compile-children>string ( tag -- ) - [ with-string-writer ] process-children ; + [ with-string-writer ] process-children ; : compile-with-scope ( quot -- ) compile-quot [ with-scope ] [code] ; inline diff --git a/basis/html/templates/chloe/components/components.factor b/basis/html/templates/chloe/components/components.factor index 3041120d43..19f2019266 100644 --- a/basis/html/templates/chloe/components/components.factor +++ b/basis/html/templates/chloe/components/components.factor @@ -21,7 +21,8 @@ M: singleton-class component-tag ( tag class -- ) bi ; M: tuple-class component-tag ( tag class -- ) - [ drop "name" required-attr compile-attr ] [ compile-component-attrs ] 2bi + [ drop "name" required-attr compile-attr ] + [ compile-component-attrs ] 2bi [ render ] [code] ; : COMPONENT: diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor index 302967969f..3e53a51d54 100644 --- a/extra/websites/concatenative/concatenative.factor +++ b/extra/websites/concatenative/concatenative.factor @@ -55,8 +55,6 @@ TUPLE: factor-website < dispatcher ; : ( -- responder ) factor-website new-dispatcher - "wiki" add-responder - "user-admin" add-responder URL" /wiki/view/Front Page" "" add-responder ; SYMBOL: key-password @@ -76,8 +74,10 @@ SYMBOL: dh-file "password" key-password set-global common-configuration - "pastebin" add-responder - "planet" add-responder + "wiki" add-responder + "user-admin" add-responder + "pastebin" add-responder + "planet" add-responder "/tmp/docs/" "docs" add-responder test-db main-responder set-global ; @@ -90,7 +90,7 @@ SYMBOL: dh-file : init-production ( -- ) common-configuration - test-db "concatenative.org" add-responder + test-db "concatenative.org" add-responder test-db "paste.factorcode.org" add-responder test-db "planet.factorcode.org" add-responder home "docs" append-path test-db "docs.factorcode.org" add-responder