taskjuggler 3.5.0 → 3.6.0

data/lib/taskjuggler/reports/TableReportColumn.rb

@@ -3,8 +3,8 @@
 #
 # = TableReportColumn.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/TagFile.rb

@@ -3,8 +3,8 @@
 #
 # = TagFile.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/TaskListRE.rb

@@ -3,8 +3,8 @@
 #
 # = TaskListRE.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/TextReport.rb

@@ -3,8 +3,8 @@
 #
 # = TextReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/TimeSheetReport.rb

@@ -3,8 +3,8 @@
 #
 # = TimeSheetReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/TjpExportRE.rb

@@ -3,8 +3,8 @@
 #
 # = TjpExportRE.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/TraceReport.rb

@@ -3,8 +3,8 @@
 #
 # = TraceReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -86,7 +86,7 @@ class TaskJuggler
                 generatePropertyListHeader(taskList, query)
 
       discontinuedColumns = 0
-      if File.exists?(@fileName)
+      if File.exist?(@fileName)
         begin
           @table = CSVFile.new(nil, nil).read(@fileName)
         rescue

data/lib/tj3.rb

@@ -3,8 +3,8 @@
 #
 # = tj3.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/tj3client.rb

@@ -3,8 +3,8 @@
 #
 # = tj3client.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/tj3d.rb

@@ -3,8 +3,8 @@
 #
 # = tj3d.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/tj3man.rb

@@ -3,8 +3,8 @@
 #
 # = tj3man.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/tj3ss_receiver.rb

@@ -3,8 +3,8 @@
 #
 # = tj3ss_receiver.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/tj3ss_sender.rb

@@ -3,8 +3,8 @@
 #
 # = tj3ss_sender.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/tj3ts_receiver.rb

@@ -3,8 +3,8 @@
 #
 # = tj3ts_receiver.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/tj3ts_sender.rb

@@ -3,8 +3,8 @@
 #
 # = tj3ts_sender.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/tj3ts_summary.rb

@@ -3,8 +3,8 @@
 #
 # = tj3ts_summary.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/tj3webd.rb

@@ -3,8 +3,8 @@
 #
 # = tj3webd.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/manual/Day_To_Day_Juggling

@@ -257,7 +257,7 @@ as HTML pages from a web server.
 
 === Implementing the status tracking system ===
 
-==== Prerequesites ====
+==== Prerequisites ====
 
 The .tjp and .tji files of your project plan should be managed by a
 revision control system. TaskJuggler does not require a particular
@@ -285,7 +285,7 @@ For the email based communication you need to provide email addresses
 for all project contributors. This is done in the project plan in the
 resource definition by using the [[email]] attribute.
 
- resource joe "Joe Avergage" {
+ resource joe "Joe Average" {
    email "joe@your_company.com
  }
 
@@ -372,7 +372,7 @@ To test the command without sending out actual emails you can use the
 directories. A copy of the generated templates will be stored in
 ''''TimeSheetTemplates/<date>/'''' under
 ''''<resource_id>-date.tji''''. ''''<date>'''' is replaced with the
-end date of the reporting interval and ''''<resoruce_id>'''' is the ID
+end date of the reporting interval and ''''<resource_id>'''' is the ID
 of the resource.
 
 If you re-run the command existing templates will not be regenerated
@@ -380,7 +380,7 @@ nor will they be sent out again. You can use the ''''-f''''
 command line option to force them to be generated and sent out again.
 
 The ''''tj3ts_sender'''' command will also add the reporting interval
-to a file called ''''TimeSheetTemplates/acceptable_invervals''''.
+to a file called ''''TimeSheetTemplates/acceptable_intervals''''.
 We'll cover this file later on when we deal with the time sheet
 receiver.
 
@@ -490,7 +490,7 @@ the taskjuggler home directory, you need to create it now.
 This procmail configuration will cause incoming emails that are
 addressed to timesheets@taskjuggler.your_company.com to be forwarded
 to the ''''tj3ts_receiver'''' program. Of course you need to replace
-''your_comany.com'' with whatever domain you are using.
+''your_company.com'' with whatever domain you are using.
 
 The received emails are then checked for syntactical and logical
 errors. If such are found, an email is sent back with an appropriate
@@ -751,7 +751,7 @@ used. It will use the ''''tj3client'''' program to do retrieve the
 necessary data from the TaskJuggler server.
 
 Before the program can be used, a new section must be added to the
-TaskJuggelr configuration file.
+TaskJuggler configuration file.
 
  _statussheets:
    projectId: prj
@@ -764,7 +764,7 @@ can hardcode that like in the example above. For multiple level of
 management you need to specify which group of managers should the
 report templates be generated for and pass that information on the
 command line. Use the ''''--hideresource'''' option to specify a
-logicalexpression to filter away the resources you don't want
+logical expression to filter away the resources you don't want
 templates to be generated for. The easiest way to achieve this is by
 using unique flags for each management level. In the example above we
 assume you have assigned the flag ''''manager'''' to each first-level

data/manual/Getting_Started

@@ -47,8 +47,8 @@ reports. Each project must have at least one task defined and should
 have at least one report.  Properties don't have to be listed in a
 particular order, but may have interdependencies that require such an
 order. If you want to assign a resource to work on a task, this
-resource needs to be defined first. It is therefor recommended to
-define them in the following sequence.
+resource needs to be defined first. It is therefore recommended to
+define them in the following sequence:
 
 * [[macro|macros]]
 * [[flags]]

data/manual/Installation

@@ -42,13 +42,13 @@ recommended Ruby version to make full use of TaskJuggler is Ruby 2.0.
 Ruby 1.9.1 contains some bugs that prevent the multi-core support to
 work. For users that are not interested in multi-core support, the web
 server,  the time sheet infrastructure and daemon Ruby 1.8.7 is still
-ok to use. On Windows you need at least Ruby 1.9.2. If you want to
+OK to use. On Windows you need at least Ruby 1.9.2. If you want to
 use non-ASCII characters, Ruby 1.9.2 or later is required as well.
 
 You must have configured your system locale to be UTF-8 to work
 properly with non-ASCII characters.
 
-See below for instructions on how to use the latest and greates Ruby
+See below for instructions on how to use the latest and greatest Ruby
 version in parallel with your distribution Ruby.
 
 * '''RubyGems:''' If it did not come with your OS or the Ruby
@@ -67,7 +67,7 @@ been tested.
 
 ===== System Wide Installation =====
 
-TaskJuggler is a commandline tool. It does not (yet) have a graphical
+TaskJuggler is a command line tool. It does not (yet) have a graphical
 user interface. To use it, you need to know how to open a command
 or terminal window. In this manual, we refer to it as your shell. The
 following paragraphs describe the commands you need to type into your
@@ -185,7 +185,7 @@ have [http://www.kernel.org/pub/software/scm/git/docs/ git] installed.
 
 Then checkout the source code with the following command
 
- git clone git@github.com:taskjuggler/TaskJuggler.git
+ git clone git@github.com/taskjuggler/TaskJuggler.git
 
 Make sure, you have removed all previously installed instances of
 TaskJuggler from your system before doing so. It is a common mistake

data/manual/Intro

@@ -34,7 +34,7 @@ and other reports, but it takes some effort to master its power. For
 those that are willing to invest a few hours to get started with the
 software it will become a companion you don't want to miss anymore.
 
-TaskJuggler is a commandline tool that you use from a
+TaskJuggler is a command line tool that you use from a
 [http://en.wikipedia.org/wiki/Shell_(computing) shell]. This means
 that to enter your project data you will use one of the most
 versatile and powerful tools there is: your favorite

data/manual/List_Attributes

@@ -0,0 +1,45 @@
+=== List Attributes ===
+
+All properties have some optional attributes. Which attributes can be
+used depends on the type of the property. Attributes can either be
+single value attributes or they can have multiple values. In the
+latter case, we call them list attributes.
+
+All list attributes are marked as such in the syntax reference. When
+using an attribute inside a property context, it is important to
+understand whether it is a list attribute or not. In many cases, the
+attribute name already indicates that the attribute may have a list
+of values. E. g. [[flags.task|flags]] or [[limits.task|limits]].
+
+The multiple values of the list attributes can either be specified as
+a comma separated list or by using multiple attribute statements in
+the same context. In this example, the task has the flags ''''f1'''',
+''''f2'''' and ''''f3'''' assigned. The second ''''flags''''
+attribute does not override the first value. It will append the new
+ones to the old list.
+
+<[example file="ListAttributes" tag="define"]>
+
+Special care needs to be taken when list attributes are inherited by
+the enclosing property or by the parent scenario.
+
+<[example file="ListAttributes" tag="inherit"]>
+
+In this example, task ''''T3'''' has the flags ''''f1'''' and
+''''f2'''' assigned.
+
+The same works for scenarios as well. Even though the syntax may not
+look like inheritance is at play the scenario ''''s2'''' inherits all
+values from ''''s1''''.
+
+<[example file="ListAttributes" tag="scenario"]>
+
+In scenario ''''s2'''' the task ''''T4'''' has the flags ''''f1''''
+and ''''f2'''' assigned.
+
+Sometimes this inheritance is not desired. In these cases, you can
+explicitly purge the attribute list before assigning new values.
+Here, task ''''T6'''' only has the flag ''''f2'''' assigned.
+
+<[example file="ListAttributes" tag="purge"]>
+

data/manual/Rich_Text_Attributes

@@ -50,7 +50,7 @@ as pre-formatted text. The formatting will be preserved by using a
 fixed-width font and by not interpreting any markup characters within
 the text.
 
-  Preformatted text start with
+  Pre-formatted text start with
   a single space at the start of 
   each line.
 
@@ -64,7 +64,7 @@ start at the start of the line.
  This is a ''''monospaced'''' word.
  This is a '''''italic and bold''''' word.
 
-The monospace format is not part of the original MediaWiki markup, but
+The monospaced format is not part of the original MediaWiki markup, but
 we found it useful to have for this manual.
 
 Text can be colored when enclosed in ''''fcol'''' tags.
@@ -163,7 +163,7 @@ The navigator generator inserts the referenced navigator.
 ----
 '''Block Generator''' ''''report''''
 
-Paramters:
+Parameters:
 
 * ''''id'''' : ID of a defined report
 
@@ -173,7 +173,7 @@ report period and the property set from the referencing report.
 ----
 '''Inline Generator''' ''''reportlink''''
 
-Paramters:
+Parameters:
 
 * ''''id'''' : ID of a defined report
 
@@ -205,7 +205,7 @@ The report link generator inserts a link to the referenced report.
 ----
 '''Inline Generator''' ''''query''''
 
-Paramters:
+Parameters:
 
 * ''''family'''' : Specifies whether a ''''task'''' or a ''''resource''''
 should be queried.

data/manual/Software

@@ -115,7 +115,7 @@ settings.
 All taskjuggler components can use the same TaskJuggler configuration
 file. The format is a simple plain text format that follows the
 [http://www.yaml.org/ YAML specification]. The file should be called
-''''.taskjuglerrc'''' or ''''taskjuggler.rc''''. The settings are
+''''.taskjugglerrc'''' or ''''taskjuggler.rc''''. The settings are
 structured by sections. Section names always start with an underscore.
 
  _global:

data/manual/TaskJuggler_2x_Migration

@@ -28,7 +28,7 @@ renamed to ''''shifts'''' to allow support for multiple shifts.
 * The global ''''limits'''' attribute has been removed. Since both
 tasks and resources have a ''''limits'''' attribute, a global
 attribute was inconsistent as only resources inherited this
-attribute. Use a parent resource to emulate the old behaviour.
+attribute. Use a parent resource to emulate the old behavior.
 
 * Shifts and limits for allocations have been deprecated. The concept
 was bogus and not compatible with bookings. The functionality is
@@ -107,7 +107,7 @@ The resulting ''''FullProject.tjp'''' file is a valid self-contained
 project file that can be read with TaskJuggler 2.x or TaskJuggler
 3.x. The file does not contain any report definitions. To generate
 reports with TaskJuggler 3.x you need to create an additional file
-that contains the TaskJugler 3.x report definitions.
+that contains the TaskJuggler 3.x report definitions.
 
 Let's assume the file is called ''''tj3reports.tji''''. Start
 TaskJuggler 3.x with the following command:

data/manual/html/Day_To_Day_Juggling.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- This file has been generated by tj3man v3.5.0 -->
+<!-- This file has been generated by tj3man v3.6.0 -->
 <html lang="en" xml:lang="en">
  <head>
   <title>Day_To_Day_Juggling</title>
@@ -130,12 +130,12 @@
     </ol>
     <p class="manual">In addition to the plain text versions of the time sheet summaries and the dashboards, TaskJuggler provides support for publishing them as HTML pages from a web server.</p>
     <h2 class="manual" id="Implementing_the_status_tracking_system">7.6 Implementing the status tracking system</h2>
-    <h3 class="manual" id="Prerequesites">7.6.1 Prerequesites</h3>
+    <h3 class="manual" id="Prerequisites">7.6.1 Prerequisites</h3>
     <p class="manual">The .tjp and .tji files of your project plan should be managed by a revision control system. TaskJuggler does not require a particular software, but for this manual we illustrate the implementation with <a href="http://subversion.apache.org" target="_top">Subversion</a>. It should be obvious how to do this with other software though.</p>
     <p class="manual">All communication of time sheets and status sheets is done via email. TaskJuggler has built-in support for sending emails. To receive emails and to feed them to the correct program, TaskJuggler needs support from a mail transfer agent (MTA) and a mail processor. In this documentation we describe the setup with <a href="http://www.postfix.org/" target="_top">postfix</a> as MTA and <a href="http://www.procmail.org/" target="_top">procmail</a> as mail processor. These are standard parts of any Linux distribution and should be easy to setup. It's certainly possible to use other MTAs and mail processors, but this is not the scope of this manual.</p>
     <p class="manual">Finally, you need a web server to publish your reports. This can really be any web server. The generated reports are static HTML pages that can simply be put into a directory that the web server is serving.</p>
     <p class="manual">For the email based communication you need to provide email addresses for all project contributors. This is done in the project plan in the resource definition by using the <a href="email.html">email</a> attribute.</p>
-    <div class="manual" codesection="1"><pre class="manual" codesection="1">resource joe "Joe Avergage" {
+    <div class="manual" codesection="1"><pre class="manual" codesection="1">resource joe "Joe Average" {
   email "joe@your_company.com
 }
 </pre></div>
@@ -165,9 +165,9 @@ _timesheets:
     <p class="manual">The hideResource option works similarly to the <a href="hideresource.html">hideresource</a> attribute in the report definitions of the project plan. It allows you to restrict the sending of time sheet templates to a subset of your defined resources. In this example, we only want to send templates to individual resources and not the teams you might have defined.</p>
     <p class="manual">By default the time sheets will cover the week from Monday morning 0:00 to Sunday night 24:00. When called without the <code class="manual">-e</code> option, <code class="manual">tj3ts_sender</code> will send out templates for the current week.</p>
     <p class="manual">To call the <code class="manual">tj3ts_sender</code> command you either need to be in the <code class="manual">/home/taskjuggler/projects/prj</code> directory or use the <code class="manual">-c</code> command line option to point it to the configuration file to use. In the latter case you also need to call it with the <code class="manual">-d</code> option to change the output directory to your project directory.</p>
-    <p class="manual">To test the command without sending out actual emails you can use the <code class="manual">--dryrun</code> option on the command line. To do its job, <code class="manual">tj3ts_sender</code> needs to generate a number of files and directories. A copy of the generated templates will be stored in <code class="manual">TimeSheetTemplates/&lt;date&gt;/</code> under <code class="manual">&lt;resource_id&gt;-date.tji</code>. <code class="manual">&lt;date&gt;</code> is replaced with the end date of the reporting interval and <code class="manual">&lt;resoruce_id&gt;</code> is the ID of the resource.</p>
+    <p class="manual">To test the command without sending out actual emails you can use the <code class="manual">--dryrun</code> option on the command line. To do its job, <code class="manual">tj3ts_sender</code> needs to generate a number of files and directories. A copy of the generated templates will be stored in <code class="manual">TimeSheetTemplates/&lt;date&gt;/</code> under <code class="manual">&lt;resource_id&gt;-date.tji</code>. <code class="manual">&lt;date&gt;</code> is replaced with the end date of the reporting interval and <code class="manual">&lt;resource_id&gt;</code> is the ID of the resource.</p>
     <p class="manual">If you re-run the command existing templates will not be regenerated nor will they be sent out again. You can use the <code class="manual">-f</code> command line option to force them to be generated and sent out again.</p>
-    <p class="manual">The <code class="manual">tj3ts_sender</code> command will also add the reporting interval to a file called <code class="manual">TimeSheetTemplates/acceptable_invervals</code>. We'll cover this file later on when we deal with the time sheet receiver.</p>
+    <p class="manual">The <code class="manual">tj3ts_sender</code> command will also add the reporting interval to a file called <code class="manual">TimeSheetTemplates/acceptable_intervals</code>. We'll cover this file later on when we deal with the time sheet receiver.</p>
     <h3 class="manual" id="The_Time_Sheet_Receiver">7.6.3 The Time Sheet Receiver</h3>
     <p class="manual">To receive the filled-out time sheets and to process them automatically you need to create a special user. TaskJuggler requires a number of email addresses to be setup to receive emails. We recommend to use the following setup. Create a special user called <code class="manual">taskjuggler</code> on a dedicated Linux machine. Then create the following email aliases for this user.</p>
     <div class="manual" codesection="1"><pre class="manual" codesection="1">timesheets
@@ -237,7 +237,7 @@ all
 :0
 /dev/null
 </pre></div>
-    <p class="manual">This procmail configuration will cause incoming emails that are addressed to timesheets@taskjuggler.your_company.com to be forwarded to the <code class="manual">tj3ts_receiver</code> program. Of course you need to replace <i>your_comany.com</i> with whatever domain you are using.</p>
+    <p class="manual">This procmail configuration will cause incoming emails that are addressed to timesheets@taskjuggler.your_company.com to be forwarded to the <code class="manual">tj3ts_receiver</code> program. Of course you need to replace <i>your_company.com</i> with whatever domain you are using.</p>
     <p class="manual">The received emails are then checked for syntactical and logical errors. If such are found, an email is sent back with an appropriate error message. The time sheet contains the resource ID of the reporting resource. As soon as this has been detected, all email communication will be sent to the email address in the project plan. Only when the resource ID could not be identified, the sender of the email will get the answer. This was implemented as a security measure so other users cannot easily retrieve project related information from other users.</p>
     <p class="manual">Correct time sheets are archived in the <code class="manual">TimeSheets/&lt;date&gt;/</code> directory where <code class="manual">&lt;date&gt;</code> is the end date of the reporting period. If the directory does not exist yet, it will be created. The file will be called <code class="manual">&lt;resource_id&gt;-&lt;date&gt;.tji</code>. If a SCM command was specified, the file will be automatically put under revision control. Subsequent submission of the same time sheet will simply overwrite the earlier submissions. The file name will also be added to a file called <code class="manual">all.tji</code> which consists of include statements of all time sheet files in the directory. There also is an automatically maintained file <code class="manual">all.tji</code> in the <code class="manual">TimeSheets</code> directory that includes all the <code class="manual">&lt;date&gt;/all.tji</code> files. To add all the submitted time sheets to your project plan, simply include the top-level <code class="manual">all.tji</code>.</p>
     <p class="manual">
@@ -324,14 +324,14 @@ include</a> this file at the end of your project header section.</p>
     <p class="manual">The status sheet template is designed to perform all three actions in a simple manner. The original reports are commented out. To remove a report, it needs to be uncommented and the headline must be set to an empty string. To change a report, the text must be edited after the comment marks have been removed. To create a summary report for a group of tasks, a new report for the common parent task must be created.</p>
     <h3 class="manual" id="The_Status_Sheet_Template_Sender">7.7.2 The Status Sheet Template Sender</h3>
     <p class="manual">To send out the time sheets, the command <code class="manual">tj3ts_sender</code> must be used. It will use the <code class="manual">tj3client</code> program to do retrieve the necessary data from the TaskJuggler server.</p>
-    <p class="manual">Before the program can be used, a new section must be added to the TaskJuggelr configuration file.</p>
+    <p class="manual">Before the program can be used, a new section must be added to the TaskJuggler configuration file.</p>
     <div class="manual" codesection="1"><pre class="manual" codesection="1">_statussheets:
   projectId: prj
   _sender:
     senderEmail: 'TaskJuggler &lt;statussheets@taskjuggler.amd.com&gt;'
     hideResource: '~(isleaf()  &amp; manager)'
 </pre></div>
-    <p class="manual">If you are using status sheets for only one level of management you can hardcode that like in the example above. For multiple level of management you need to specify which group of managers should the report templates be generated for and pass that information on the command line. Use the <code class="manual">--hideresource</code> option to specify a logicalexpression to filter away the resources you don't want templates to be generated for. The easiest way to achieve this is by using unique flags for each management level. In the example above we assume you have assigned the flag <code class="manual">manager</code> to each first-level manager.</p>
+    <p class="manual">If you are using status sheets for only one level of management you can hardcode that like in the example above. For multiple level of management you need to specify which group of managers should the report templates be generated for and pass that information on the command line. Use the <code class="manual">--hideresource</code> option to specify a logical expression to filter away the resources you don't want templates to be generated for. The easiest way to achieve this is by using unique flags for each management level. In the example above we assume you have assigned the flag <code class="manual">manager</code> to each first-level manager.</p>
     <p class="manual">For the override mechanism to work, the manager reports must always have a newer date than the original report. So, the end date of the first-level manager status sheets must be after the time sheet interval. The second-level mangers must use a later date than the first-level managers and so on.</p>
     <p class="manual">By default <code class="manual">tj3ss_sender</code> will use the next Wednesday as end date. If you need a different date, you must use the <code class="manual">-e</code> option to specify that date.</p>
     <p class="manual">Let's say you have two levels of managers that use status sheets. The time sheets are due midnight on Sunday. The project managers can work in the deltas and new tasks on Monday. After that you generate the reports for the first level managers with and end date of Wednesday. This implies a submission deadline of midnight on Tuesday. The second level manager templates will be sent out right after this deadline with an end date of Thursday. That would be the deadline for the second-level managers. The final report can than be generated by TaskJuggler automatically right after that deadline.</p>
@@ -360,6 +360,6 @@ include</a> this file at the end of your project header section.</p>
    </tr></table>
   <hr/>
   <br/>
-  <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Chris Schlaeger &lt;chris@linux.com&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
+  <div align="center" style="font-size:10px;">Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 by Chris Schlaeger &lt;cs@taskjuggler.org&gt;.<a href="http://www.taskjuggler.org">TaskJuggler</a> is a trademark of Chris Schlaeger.</div>
  </body>
 </html>