Index: openacs-4/packages/acs-admin/www/install/install.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-admin/www/install/install.tcl 7 Aug 2017 23:47:45 -0000 1.9 +++ openacs-4/packages/acs-admin/www/install/install.tcl 27 Mar 2018 11:17:59 -0000 1.10 @@ -88,7 +88,7 @@ # - package is deprecated # - package is not supported by the installed database # - don't offer "-portlet" alone (currently only useful in connection with DotLRN) - # - dont't offer packages of HEAD, when these are included in the current channel + # - don't offer packages of HEAD, when these are included in the current channel # if {[dict get $version maturity] < $maturity || [dict get $version maturity] == 4 Index: openacs-4/packages/acs-bootstrap-installer/db-init-checks-postgresql.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/db-init-checks-postgresql.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/acs-bootstrap-installer/db-init-checks-postgresql.tcl 7 Aug 2017 23:47:46 -0000 1.15 +++ openacs-4/packages/acs-bootstrap-installer/db-init-checks-postgresql.tcl 27 Mar 2018 11:17:59 -0000 1.16 @@ -55,7 +55,7 @@ append my_errors "
\n" set my_error_p 1 } elseif { [catch { ns_db dml $db "drop function __test__();" } errmsg] } { - append my_errors "createlang plpgsql your_database_name
\n" + append my_errors "$errmsg
\n" set my_error_p 1 } Index: openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl,v diff -u -r1.48 -r1.49 --- openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 24 Mar 2018 16:10:23 -0000 1.48 +++ openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 27 Mar 2018 11:17:59 -0000 1.49 @@ -823,7 +823,7 @@ so passing arrays to a callback can be done normally via$errmsg
upvar arrayname $arrayref
- The return codes returned from the implmentation are treated + The return codes returned from the implementation are treated as follows:
@@ -254,10 +254,10 @@
Index: openacs-4/packages/acs-content-repository/www/doc/api/type.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/api/type.html,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-content-repository/www/doc/api/type.html 7 Aug 2017 23:47:47 -0000 1.2 +++ openacs-4/packages/acs-content-repository/www/doc/api/type.html 27 Mar 2018 11:17:59 -0000 1.3 @@ -373,13 +373,13 @@
A mininum of two calls are required to perform any action +
A minimum of two calls are required to perform any action related to a task. In this case we are simply notifying the workflow engine that someone has started the task. You may specify NULL for the journal message if the user does not wish to comment Index: openacs-4/packages/acs-content-repository/www/doc/guide/workflow.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/workflow.html,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-content-repository/www/doc/guide/workflow.html 7 Aug 2017 23:47:47 -0000 1.2 +++ openacs-4/packages/acs-content-repository/www/doc/guide/workflow.html 27 Mar 2018 11:17:59 -0000 1.3 @@ -113,7 +113,7 @@ / -
A mininum of two calls are required to perform any action related +
A minimum of two calls are required to perform any action related to a task. In this case we are simply notifying the workflow engine that someone has started the task. You may specify NULL for the journal message if the user does not wish to comment on the check out.
Index: openacs-4/packages/acs-core-docs/www/cvs-guidelines.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/cvs-guidelines.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-core-docs/www/cvs-guidelines.adp 8 Nov 2017 09:42:10 -0000 1.3 +++ openacs-4/packages/acs-core-docs/www/cvs-guidelines.adp 27 Mar 2018 11:17:59 -0000 1.4 @@ -448,7 +448,7 @@ Additional Resources for CVSThe OpenACS cvs web browser is a useful tools in understanding what is happening with the code.
There is general information about CVS at nongnu.org .
- merging 2 file heirarchies with cvs + merging 2 file hierarchies with cvs
@@ -153,4 +153,4 @@ service" homeLink="index" homeLabel="Home" upLink="maintenance-web" upLabel="Up"> - \ No newline at end of file + Index: openacs-4/packages/acs-core-docs/www/maintenance-deploy.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/maintenance-deploy.html,v diff -u -r1.26 -r1.27 --- openacs-4/packages/acs-core-docs/www/maintenance-deploy.html 8 Nov 2017 09:42:11 -0000 1.26 +++ openacs-4/packages/acs-core-docs/www/maintenance-deploy.html 27 Mar 2018 11:18:00 -0000 1.27 @@ -26,7 +26,7 @@ installation, and follow the instructions for committing your files to CVS. We'll assume in this example that you set up the production server (service0). To set up the developmental instance, - you then follow the intall guide again, this time creating a new + you then follow the install guide again, this time creating a new user (service0-dev) that you'll use for the new installation. To get the files for service0-dev, you check them out from cvs (check out service0). Index: openacs-4/packages/acs-core-docs/www/programming-with-aolserver.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/programming-with-aolserver.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-core-docs/www/programming-with-aolserver.adp 8 Nov 2017 09:42:11 -0000 1.3 +++ openacs-4/packages/acs-core-docs/www/programming-with-aolserver.adp 27 Mar 2018 11:18:00 -0000 1.4 @@ -138,7 +138,7 @@ and you'd use pass-by-reference.The transformation of the array into a list and back to an array takes, in our test environment, approximately 10 microseconds per entry of 100 character's -length. Thus you can process about 100 entries per milisecond. The +length. Thus you can process about 100 entries per millisecond. The time depends almost completely on the number of entries, and almost not at all on the size of the entries.
You implement pass-by-reference in Tcl by taking the name of an array as an argument and
upvar
@@ -238,4 +238,4 @@ forms dynamically" homeLink="index" homeLabel="Home" upLink="dev-guide" upLabel="Up"> - \ No newline at end of file + Index: openacs-4/packages/acs-core-docs/www/programming-with-aolserver.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/programming-with-aolserver.html,v diff -u -r1.51 -r1.52 --- openacs-4/packages/acs-core-docs/www/programming-with-aolserver.html 8 Nov 2017 09:42:11 -0000 1.51 +++ openacs-4/packages/acs-core-docs/www/programming-with-aolserver.html 27 Mar 2018 11:18:00 -0000 1.52 @@ -182,7 +182,7 @@The transformation of the array into a list and back to an array takes, in our test environment, approximately 10 microseconds per entry of 100 character's length. Thus you can process about 100 entries per -milisecond. The time depends almost completely on the number of entries, and +millisecond. The time depends almost completely on the number of entries, and almost not at all on the size of the entries.
Index: openacs-4/packages/acs-core-docs/www/xml/engineering-standards/cvs.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/engineering-standards/cvs.xml,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-core-docs/www/xml/engineering-standards/cvs.xml 7 Aug 2017 23:47:54 -0000 1.7 +++ openacs-4/packages/acs-core-docs/www/xml/engineering-standards/cvs.xml 27 Mar 2018 11:18:00 -0000 1.8 @@ -804,7 +804,7 @@
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/maintenance.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/maintenance.xml,v diff -u -r1.31 -r1.32 --- openacs-4/packages/acs-core-docs/www/xml/install-guide/maintenance.xml 7 Aug 2017 23:47:55 -0000 1.31 +++ openacs-4/packages/acs-core-docs/www/xml/install-guide/maintenance.xml 27 Mar 2018 11:18:00 -0000 1.32 @@ -404,7 +404,7 @@ installation, and follow the instructions for committing your files to CVS. We'll assume in this example that you set up the production server (service0). To set up the developmental instance, - you then follow the intall guide again, this time creating a new + you then follow the install guide again, this time creating a new user (service0-dev) that you'll use for the new installation. To get the files for service0-dev, you check them out from cvs (check out service0). Index: openacs-4/packages/acs-lang/www/doc/i18n-design.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/doc/i18n-design.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-lang/www/doc/i18n-design.adp 7 Aug 2017 23:47:57 -0000 1.2 +++ openacs-4/packages/acs-lang/www/doc/i18n-design.adp 27 Mar 2018 11:18:00 -0000 1.3 @@ -485,7 +485,7 @@ can get a performance improvement if we can cache the message lookups at template compile time. - merging 2 file heirarchies with cvs +merging 2 file hierarchies with cvs The <TRN> tag is a call to lang_message_lookup that can be -used inside of an ADP file. Here is the documention:
+used inside of an ADP file. Here is the documentation:Procedure that gets called when the <trn> tag is encountered on an ADP page. The purpose of the procedure is to register the text string enclosed within a pair of <trn> tags Index: openacs-4/packages/acs-lang/www/doc/i18n-design.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/doc/i18n-design.html,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-lang/www/doc/i18n-design.html 7 Aug 2017 23:47:57 -0000 1.4 +++ openacs-4/packages/acs-lang/www/doc/i18n-design.html 27 Mar 2018 11:18:00 -0000 1.5 @@ -632,7 +632,7 @@The <TRN> tag is a call to lang_message_lookup that can be used inside -of an ADP file. Here is the documention: +of an ADP file. Here is the documentation:
Procedure that gets called when the <trn> tag is encountered on an ADP page. Index: openacs-4/packages/acs-mail-lite/sql/postgresql/acs-mail-lite-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/sql/postgresql/acs-mail-lite-create.sql,v diff -u -r1.16 -r1.17 --- openacs-4/packages/acs-mail-lite/sql/postgresql/acs-mail-lite-create.sql 24 Mar 2018 00:14:57 -0000 1.16 +++ openacs-4/packages/acs-mail-lite/sql/postgresql/acs-mail-lite-create.sql 27 Mar 2018 11:18:00 -0000 1.17 @@ -157,7 +157,7 @@ -- Also, test, for example, if new message count is less than -- prior total, there's more of a chance that they are new messages; -- Maybe check for one or two duplicates. --- If new message count is over the total prior messsage count, flag a problem. +-- If new message count is over the total prior message count, flag a problem. -- rfc3501 2.3.1.1. ..A client can only assume.. at the time -- that it obtains the next unique identifier value.. that -- messages arriving after that time will have a UID greater Index: openacs-4/packages/acs-mail-lite/sql/postgresql/upgrade/upgrade-5.10.0d1-5.10.0d2.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/sql/postgresql/upgrade/upgrade-5.10.0d1-5.10.0d2.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-mail-lite/sql/postgresql/upgrade/upgrade-5.10.0d1-5.10.0d2.sql 24 Mar 2018 00:14:57 -0000 1.2 +++ openacs-4/packages/acs-mail-lite/sql/postgresql/upgrade/upgrade-5.10.0d1-5.10.0d2.sql 27 Mar 2018 11:18:00 -0000 1.3 @@ -90,7 +90,7 @@ -- Also, test, for example, if new message count is less than -- prior total, there's more of a chance that they are new messages; -- Maybe check for one or two duplicates. --- If new message count is over the total prior messsage count, flag a problem. +-- If new message count is over the total prior message count, flag a problem. -- rfc3501 2.3.1.1. ..A client can only assume.. at the time -- that it obtains the next unique identifier value.. that -- messages arriving after that time will have a UID greater Index: openacs-4/packages/acs-mail-lite/tcl/email-inbound-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/email-inbound-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-mail-lite/tcl/email-inbound-procs.tcl 20 Feb 2018 09:07:27 -0000 1.6 +++ openacs-4/packages/acs-mail-lite/tcl/email-inbound-procs.tcl 27 Mar 2018 11:18:00 -0000 1.7 @@ -583,8 +583,8 @@ } if { $headers ne "" && [array size h_arr] < 1 } { - # To remove subject from headers to search, - # incase topic uses a reserved word, + # To remove subject from headers to search, + # in case topic uses a reserved word, # we rebuild the semblence of array returned by ns_imap headers. # Split strategy from qss_txt_table_stats set linebreaks "\n\r\f\v" Index: openacs-4/packages/acs-service-contract/tcl/contract-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/contract-procs.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/acs-service-contract/tcl/contract-procs.tcl 31 Jan 2018 20:57:02 -0000 1.8 +++ openacs-4/packages/acs-service-contract/tcl/contract-procs.tcl 27 Mar 2018 11:18:00 -0000 1.9 @@ -161,7 +161,7 @@ set msg_types [list] db_foreach select_operations {} { - # Put them on list of mesage types and operations to delete + # Put them on list of message types and operations to delete lappend msg_types $operation_inputtype_id lappend msg_types $operation_outputtype_id lappend operations $operation_id Index: openacs-4/packages/acs-service-contract/www/doc/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/doc/index.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-service-contract/www/doc/index.adp 31 Jan 2018 20:57:02 -0000 1.4 +++ openacs-4/packages/acs-service-contract/www/doc/index.adp 27 Mar 2018 11:18:00 -0000 1.5 @@ -96,7 +96,7 @@Discovery
+implementation.
- (tcl) acs_sc_binding_exists_p (contract, impl): returns boolean whether a binding exists between a given contract name and -implmentation.
Dispatching
Index: openacs-4/packages/acs-service-contract/www/doc/index.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/doc/index.html,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-service-contract/www/doc/index.html 31 Jan 2018 20:57:02 -0000 1.5 +++ openacs-4/packages/acs-service-contract/www/doc/index.html 27 Mar 2018 11:18:00 -0000 1.6 @@ -85,7 +85,7 @@
- (tcl) acs_sc::invoke (contract, operation, [arguments, impl]): calls an operation
- (tcl) acs_sc_binding_exists_p (contract, impl): returns boolean whether a binding exists between - a given contract name and implmentation.
+ a given contract name and implementation.Dispatching
Index: openacs-4/packages/acs-service-contract/www/doc/index.stx =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/doc/index.stx,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-service-contract/www/doc/index.stx 31 Jan 2018 20:57:02 -0000 1.4 +++ openacs-4/packages/acs-service-contract/www/doc/index.stx 27 Mar 2018 11:18:00 -0000 1.5 @@ -130,7 +130,7 @@ - (tcl) acs_sc_binding_exists_p (contract, impl): returns boolean whether a binding exists between - a given contract name and implmentation. + a given contract name and implementation. Dispatching Index: openacs-4/packages/acs-service-contract/www/doc/index.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/doc/index.xml,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-service-contract/www/doc/index.xml 31 Jan 2018 20:57:02 -0000 1.4 +++ openacs-4/packages/acs-service-contract/www/doc/index.xml 27 Mar 2018 11:18:00 -0000 1.5 @@ -225,7 +225,7 @@
+ a given contract name and implementation. Index: openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl,v diff -u -r1.16 -r1.17 --- openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl 1 Oct 2017 12:16:05 -0000 1.16 +++ openacs-4/packages/acs-subsite/tcl/email-image-procs.tcl 27 Mar 2018 11:18:00 -0000 1.17 @@ -40,12 +40,12 @@ {-bgcolor "" } {-transparent "" } } { - Returns the email in differnet different ways (text level 4, image or text and image level 3, link level 2, ...) + Returns the email in different ways (text level 4, image or text and image level 3, link level 2, ...) according to the priv_email field in the users table. To create an image the ImageMagick software is required, if ImageMagick is not present then the @ symbol in the email will be shown as an image. When creating an image you can choose the background color (In this format \#xxxxxx). Also you can make the background color transparent (1 or 0). - + @param return_url The url to return when the email is shown as a link @param bgcolor The Background color of the image. Default to \#ffffff @param transparent If the bgcolor is transparent. Default to 1 Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v diff -u -r1.49 -r1.50 --- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 24 Mar 2018 08:20:10 -0000 1.49 +++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 27 Mar 2018 11:18:00 -0000 1.50 @@ -1160,16 +1160,16 @@ } { Returns the url stub for the specified subsite. - If -absolute is supplied then this function will generate absolute urls. + If -absolute is supplied then this function will generate absolute urls. - If the site is currently being accessed via a host node mapping or - -force_host_node_map is also supplied then URLs will ommit the + If the site is currently being accessed via a host node mapping or + -force_host_node_map is also supplied then URLs will omit the corresponding subsite url stub. The host name will be used - for any appropriate subsite when absolute urls are generated. + for any appropriate subsite when absolute urls are generated. @param node_id the subsite's node_id (defaults to nearest subsite node). @param absolute_p whether to include the host in the returned url. - @param force_host_node_map_p whether to produce host node mapped urls + @param force_host_node_map_p whether to produce host node mapped urls regardless of the current connection state } { if {[ad_conn isconnected]} { Index: openacs-4/packages/acs-subsite/www/members/member-state-change.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/member-state-change.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/members/member-state-change.tcl 17 Sep 2017 16:14:18 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/members/member-state-change.tcl 27 Mar 2018 11:18:00 -0000 1.5 @@ -25,7 +25,7 @@ if {$send_notification_mail} { # - # Compose a mail to notifiy the user about the new state + # Compose a mail to notify the user about the new state # set action [group::get_member_state_pretty -component action \ -member_state $member_state \ Index: openacs-4/packages/acs-subsite/www/shared/community-member.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.tcl,v diff -u -r1.22 -r1.23 --- openacs-4/packages/acs-subsite/www/shared/community-member.tcl 7 Aug 2017 23:47:59 -0000 1.22 +++ openacs-4/packages/acs-subsite/www/shared/community-member.tcl 27 Mar 2018 11:18:00 -0000 1.23 @@ -49,7 +49,7 @@ } # -# See if this page has been overrided by a parameter in kernel +# See if this page has been overridden by a parameter in kernel # set community_member_url [parameter::get \ -package_id [ad_acs_kernel_id] \ Index: openacs-4/packages/acs-tcl/acs-tcl.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v diff -u -r1.77 -r1.78 --- openacs-4/packages/acs-tcl/acs-tcl.info 1 Feb 2018 10:35:04 -0000 1.77 +++ openacs-4/packages/acs-tcl/acs-tcl.info 27 Mar 2018 11:18:00 -0000 1.78 @@ -29,7 +29,7 @@ (tcl) acs_sc_binding_exists_p (contract, impl): returns boolean whether a binding exists between - a given contract name and implmentation. - Test Message"} errmsg] aa_log err=$errmsg aa_false "Package require mime package found" \ Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v diff -u -r1.70 -r1.71 --- openacs-4/packages/acs-templating/tcl/list-procs.tcl 16 Feb 2018 16:51:14 -0000 1.70 +++ openacs-4/packages/acs-templating/tcl/list-procs.tcl 27 Mar 2018 11:18:00 -0000 1.71 @@ -55,7 +55,7 @@ {-filter_form 0} {-bulk_action_click_function "acs_ListBulkActionClick"} } { - Defines a list to be diplayed in a template. The list works in conjunction with a multirow, which contains the data for the list. + Defines a list to be displayed in a template. The list works in conjunction with a multirow, which contains the data for the list. The list is output using the <listtemplate> and <listfilters> templating tags, with the help of <listelement> and <listrow>. Index: openacs-4/packages/acs-templating/www/doc/guide/composite.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/guide/composite.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-templating/www/doc/guide/composite.adp 7 Aug 2017 23:48:03 -0000 1.3 +++ openacs-4/packages/acs-templating/www/doc/guide/composite.adp 27 Mar 2018 11:18:00 -0000 1.4 @@ -59,13 +59,13 @@
Any (sub)page can have 0 or 1 master and 0 or more included pages. Each page has its own separate scope for variables. Arguments can be passed to dependent pages as attributes to -
<inlcude>
, or as properties to +<include>
, or as properties to<master>
. The directed graph of pages will often be be acyclic, as in the example, but this is not required.Evaluation Order
Sometimes it is of interest in which order the different parts are evaluated. The "code" always runs first, followed by -the template. The
<inlcude>
tag causes the +the template. The<include>
tag causes the subpage to be evaluated at this point of the template, and the rest of the including template is evaluated after that's done. This is like a procedure call. In contrast, the @@ -151,4 +151,4 @@It is an error to omit both parts; this is a special case intended to speed up debugging.
- \ No newline at end of file + Index: openacs-4/packages/acs-templating/www/doc/guide/composite.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/guide/composite.html,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-templating/www/doc/guide/composite.html 7 Aug 2017 23:48:03 -0000 1.4 +++ openacs-4/packages/acs-templating/www/doc/guide/composite.html 27 Mar 2018 11:18:00 -0000 1.5 @@ -167,7 +167,7 @@ Any (sub)page can have 0 or 1 master and 0 or more included pages. Each page has its own separate scope for variables. Arguments can be passed to dependent pages as - attributes to<inlcude>
, or as properties to + attributes to<include>
, or as properties to<master>
. The directed graph of pages will often be be acyclic, as in the example, but this is not required. @@ -178,7 +178,7 @@Sometimes it is of interest in which order the different parts are evaluated. The "code" always runs first, followed by - the template. The
<inlcude>
tag causes the + the template. The<include>
tag causes the subpage to be evaluated at this point of the template, and the rest of the including template is evaluated after that's done. This is like a procedure call. In contrast, the