Index: openacs-4/packages/general-comments/tcl/general-comments-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/tcl/general-comments-callback-procs.tcl,v diff -u -r1.1.10.1 -r1.1.10.2 --- openacs-4/packages/general-comments/tcl/general-comments-callback-procs.tcl 12 Sep 2015 11:06:33 -0000 1.1.10.1 +++ openacs-4/packages/general-comments/tcl/general-comments-callback-procs.tcl 21 Apr 2017 20:11:53 -0000 1.1.10.2 @@ -17,7 +17,7 @@ @param object_id Object ID of the object to which the comment was added @param title Title given with the comment @param comment Comment that was provided. This is HTML. - @param object_type Object Type of the object id. This is useful to quickly say in the package implementations wether you want to deal with the comment or not. + @param object_type Object Type of the object id. This is useful to quickly say in the package implementations whether you want to deal with the comment or not. } - # Local variables: Index: openacs-4/packages/general-comments/www/delete-attachment-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete-attachment-2.tcl,v diff -u -r1.7.2.2 -r1.7.2.3 --- openacs-4/packages/general-comments/www/delete-attachment-2.tcl 21 May 2016 10:15:38 -0000 1.7.2.2 +++ openacs-4/packages/general-comments/www/delete-attachment-2.tcl 21 Apr 2017 20:11:53 -0000 1.7.2.3 @@ -25,7 +25,7 @@ # a single content_item.delete after the bug fix # is released -#Commented out during i18n convertion, Steffen +#Commented out during i18n conversion, Steffen #if { $submit eq "Proceed" } { Index: openacs-4/packages/general-comments/www/doc/design.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/doc/design.adp,v diff -u -r1.1.2.6 -r1.1.2.7 --- openacs-4/packages/general-comments/www/doc/design.adp 18 Jul 2016 11:45:37 -0000 1.1.2.6 +++ openacs-4/packages/general-comments/www/doc/design.adp 21 Apr 2017 20:11:53 -0000 1.1.2.7 @@ -38,21 +38,21 @@

1.2.3. Historical Considerations

General Comments in ACS 4.0 differs from previous versions by utilizing the ACS Object system, introduced in 4.0. The data-model -has been changed to accomodate this adoption.

In ACS 3.x, general comments did not have revisioning. Let's +has been changed to accommodate this adoption.

In ACS 3.x, general comments did not have revisioning. Let's assume that in an ACS 3.x installation, the policy for comments was set to "closed", meaning comments must be approved by an administrator before it goes live. The following unwanted scenario could occur:

General Comments implements the revisioning feature provided by the Content Repository. Users are able to view all of their revisions for a comment, along with an indication of which revision is live. This allows the contents of an older revision to be seen -by the public while a newer revision is awaiting adminstrative +by the public while a newer revision is awaiting administrative approval.

1.2.4. Competitive Analysis

not available

@@ -127,7 +127,7 @@

1.2.8. User Interface

General Comments provides two similar sets of UIs for -adminstrators and normal users. The adminstrator UI allows +administrators and normal users. The administrator UI allows approval/unapproval of comments as well as deletion of comments. The normal user UI presents to users all of their created comments, with links to editing and creating attachments.

Index: openacs-4/packages/general-comments/www/doc/design.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/doc/design.html,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/general-comments/www/doc/design.html 18 Jul 2016 11:45:37 -0000 1.2.2.1 +++ openacs-4/packages/general-comments/www/doc/design.html 21 Apr 2017 20:11:53 -0000 1.2.2.2 @@ -199,7 +199,7 @@ >

General Comments in ACS 4.0 differs from previous versions by utilizing the ACS Object system, introduced in 4.0. The data-model - has been changed to accomodate this adoption.

In ACS 3.x, general comments did not have revisioning. Let's assume that in an ACS 3.x installation, the policy for comments was @@ -222,7 +222,7 @@ >

  • From the time of the user's correction to the time the - adminstrator re-approves the comment, other users will not be able + administrator re-approves the comment, other users will not be able to read the comment, since the new data replaced the old one.

    • General Comments provides two similar sets of UIs for - adminstrators and normal users. The adminstrator UI allows + administrators and normal users. The administrator UI allows approval/unapproval of comments as well as deletion of comments. The normal user UI presents to users all of their created comments, with links to editing and creating attachments.

    General Comments in ACS 4.0 differs from previous versions by utilizing the ACS Object system, introduced in 4.0. The data-model - has been changed to accomodate this adoption. + has been changed to accommodate this adoption. In ACS 3.x, general comments did not have revisioning. Let's assume that in an ACS 3.x installation, the policy for comments was @@ -81,15 +81,15 @@ change to the posted comment. From the time of the user's correction to the time the - adminstrator re-approves the comment, other users will not be able + administrator re-approves the comment, other users will not be able to read the comment, since the new data replaced the old one. General Comments implements the revisioning feature provided by the Content Repository. Users are able to view all of their revisions for a comment, along with an indication of which revision is live. This allows the contents of an older revision to be seen - by the public while a newer revision is awaiting adminstrative + by the public while a newer revision is awaiting administrative approval. @@ -220,7 +220,7 @@ User Interface General Comments provides two similar sets of UIs for - adminstrators and normal users. The adminstrator UI allows + administrators and normal users. The administrator UI allows approval/unapproval of comments as well as deletion of comments. The normal user UI presents to users all of their created comments, with links to editing and creating attachments. Index: openacs-4/packages/general-comments/www/doc/dev-guide.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/doc/dev-guide.adp,v diff -u -r1.1.2.5 -r1.1.2.6 --- openacs-4/packages/general-comments/www/doc/dev-guide.adp 5 Jul 2016 16:52:02 -0000 1.1.2.5 +++ openacs-4/packages/general-comments/www/doc/dev-guide.adp 21 Apr 2017 20:11:53 -0000 1.1.2.6 @@ -30,7 +30,7 @@ in ACS 4.0, which gives you the benefits of the Permission System. Comments are stored as ACS Messages.

    When a user creates a comment, General Comments stores the comment as an ACS Message and associates the comment to the object -commented on. The value set by the adminstrator on whether comments +commented on. The value set by the administrator on whether comments go live immediately or needs approval first is stored along with the comment during this phase. After this, the user is presented with a page that displays contents of the comment along with @@ -54,7 +54,7 @@ submits his changes. Since comments are moderated, others will only see his older incorrect version until his changes are approved. George eagerly awaits for his changes to be approved so that he -won't be ridiculed by his colleagues for his mistakes.

    An adminstrator moderating:

    Adam Admin is looking over all recently unnapproved changes to +won't be ridiculed by his colleagues for his mistakes.

    An administrator moderating:

    Adam Admin is looking over all recently unnapproved changes to comments. Adam sees that George Genius has made a correction to the earthquake prediction formula in which he helped write. He believes that the their original formaula is correct, so Adam does not @@ -111,7 +111,7 @@ attached images.

    30.50 Allow download of attached files.

    The Administrator's -Interface

    The user interface for adminstrative members is a set of HTML +Interface

    The user interface for administrative members is a set of HTML pages that allows deletion and approval of comments.

    40.0 Customized presentation.

    40.0.10 Show all created Index: openacs-4/packages/general-comments/www/doc/dev-guide.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/doc/dev-guide.html,v diff -u -r1.1.1.1 -r1.1.1.1.28.1 --- openacs-4/packages/general-comments/www/doc/dev-guide.html 20 Apr 2001 20:51:11 -0000 1.1.1.1 +++ openacs-4/packages/general-comments/www/doc/dev-guide.html 21 Apr 2017 20:11:53 -0000 1.1.1.1.28.1 @@ -127,7 +127,7 @@ >

    When a user creates a comment, General Comments stores the comment as an ACS Message and associates the comment to the object - commented on. The value set by the adminstrator on whether comments + commented on. The value set by the administrator on whether comments go live immediately or needs approval first is stored along with the comment during this phase. After this, the user is presented with a page that displays contents of the comment along with @@ -180,7 +180,7 @@ >

    An adminstrator moderating:An administrator moderating:

    Adam Admin is looking over all recently unnapproved changes to @@ -353,7 +353,7 @@ >The Administrator's Interface

    The user interface for adminstrative members is a set of HTML pages +>The user interface for administrative members is a set of HTML pages that allows deletion and approval of comments.

    When a user creates a comment, General Comments stores the comment as an ACS Message and associates the comment to the object - commented on. The value set by the adminstrator on whether comments + commented on. The value set by the administrator on whether comments go live immediately or needs approval first is stored along with the comment during this phase. After this, the user is presented with a page that displays contents of the comment along with @@ -70,7 +70,7 @@ George eagerly awaits for his changes to be approved so that he won't be ridiculed by his colleagues for his mistakes. - An adminstrator moderating: + An administrator moderating: Adam Admin is looking over all recently unnapproved changes to comments. Adam sees that George Genius has made a correction to the earthquake prediction formula in which he helped write. He believes @@ -145,7 +145,7 @@ 30.50 Allow download of attached files. The Administrator's Interface - The user interface for adminstrative members is a set of HTML pages + The user interface for administrative members is a set of HTML pages that allows deletion and approval of comments. 40.0 Customized presentation. Index: openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl,v diff -u -r1.43.2.17 -r1.43.2.18 --- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 28 Feb 2017 17:42:00 -0000 1.43.2.17 +++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 21 Apr 2017 20:13:52 -0000 1.43.2.18 @@ -91,7 +91,7 @@ # # A class to keep simple statistics # - Class create ThrottleStat -parameter { type requestor timestamp ip_adress url } + Class create ThrottleStat -parameter { type requestor timestamp ip_address url } # # class for throtteling eager requestors or to block duplicate requests @@ -111,14 +111,14 @@ next } - Throttle instproc add_statistics { type requestor ip_adress url query } { + Throttle instproc add_statistics { type requestor ip_address url query } { #set furl [expr {$query ne "" ? "$url?$query" : $url}] incr :${type}s # :log "++++ add_statistics -type $type -user_id $requestor " set entry [ThrottleStat new -childof [self]::stats \ -type $type -requestor $requestor \ -timestamp [clock seconds] \ - -ip_adress $ip_adress -url $url] + -ip_address $ip_address -url $url] } Throttle instproc url_statistics {{-flush 0}} { @@ -131,7 +131,7 @@ } else { foreach stat $data { lappend output [list [$stat type] [$stat requestor] \ - [$stat timestamp] [$stat ip_adress] [$stat url]] + [$stat timestamp] [$stat ip_address] [$stat url]] } return $output } @@ -965,7 +965,7 @@ # Check, if the peer address changed. This might be some # indication, that multiple users are working under the same # user_id, or that the identity was highjacked. Therefore, we - # note such occurences. + # note such occurrences. # if {[$class set pa($key)] ne $pa} { if {[catch {$class incr switches($key)}]} { Index: openacs-4/packages/xotcl-request-monitor/www/ip-info.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/ip-info.adp,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/xotcl-request-monitor/www/ip-info.adp 3 Jul 2015 09:57:44 -0000 1.4 +++ openacs-4/packages/xotcl-request-monitor/www/ip-info.adp 21 Apr 2017 20:13:52 -0000 1.4.2.1 @@ -1,7 +1,7 @@ -Infomation about IP Address @ip@ +Information about IP Address @ip@ -

    Infomation about IP Address @ip@

    +

    Information about IP Address @ip@