Chris Radek [Tue, 30 Jun 2015 18:09:23 +0000 (13:09 -0500)]
Daniel simplified it more
Chris Radek [Tue, 30 Jun 2015 17:34:13 +0000 (12:34 -0500)]
For bug 424 reproduction
Sebastian Kuzminsky [Tue, 30 Jun 2015 05:14:00 +0000 (23:14 -0600)]
Merge remote-tracking branch 'origin/2.6' into 2.7
Sebastian Kuzminsky [Tue, 30 Jun 2015 05:10:09 +0000 (23:10 -0600)]
docs: update encoder.9 manpage
The encoder comp has no parameters, and the min-velocity-estimate pin
is really called min-speed-estimate (because it's direction-insensitive).
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
Sebastian Kuzminsky [Tue, 30 Jun 2015 05:05:18 +0000 (23:05 -0600)]
docs: rebrand the launcher program in hal/components.txt
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
Sebastian Kuzminsky [Mon, 29 Jun 2015 15:12:09 +0000 (09:12 -0600)]
docs: un-fancify "the argspec parameter" anchor name
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
John Thornton [Mon, 29 Jun 2015 22:23:43 +0000 (17:23 -0500)]
Docs: restate warning to be more precise
Signed-off-by: John Thornton <bjt128@gmail.com>
Moses McKnight [Mon, 29 Jun 2015 20:58:09 +0000 (15:58 -0500)]
EMC_ToggleAction_Run needed extra check on file load.
Signed-off-by: Moses McKnight <moses@texband.net>
John Thornton [Sat, 27 Jun 2015 11:50:06 +0000 (06:50 -0500)]
Docs: make anchors and index entries have consistent locations
and remove some extra empty lines
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Fri, 26 Jun 2015 12:37:45 +0000 (07:37 -0500)]
Docs: make anchors and index entries have consistent locations
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Fri, 26 Jun 2015 10:49:40 +0000 (05:49 -0500)]
Docs: correct typo
Signed-off-by: John Thornton <bjt128@gmail.com>
Jeff Epler [Thu, 25 Jun 2015 21:44:04 +0000 (16:44 -0500)]
Merge branch 'jepler/hm2-encoder-dpll' into 2.7
Jeff Epler [Wed, 24 Jun 2015 11:58:17 +0000 (06:58 -0500)]
hm2: encoder: enable dpll when supported by firmware
Signed-off-by: Jeff Epler <jepler@unpythonic.net>
Jeff Epler [Wed, 24 Jun 2015 11:56:37 +0000 (06:56 -0500)]
hm2: dpll: fix calculation of period_us
Use float division so that e.g., period 333333 -> period_us 333.333
and not period_us = 333.
This fixes the calculated base-freq-khz from 3.003003 to 3.00003,
eliminating a 1% phase error.
Signed-off-by: Jeff Epler <jepler@unpythonic.net>
Jeff Epler [Wed, 24 Jun 2015 11:54:50 +0000 (06:54 -0500)]
hm2: dpll: rename variable to reflect units
If period is in ns, then (period / 1000) is in us, not ms.
Signed-off-by: Jeff Epler <jepler@unpythonic.net>
Jeff Epler [Wed, 24 Jun 2015 11:35:46 +0000 (06:35 -0500)]
hm2: improve documentation of timers
Signed-off-by: Jeff Epler <jepler@unpythonic.net>
Sebastian Kuzminsky [Thu, 25 Jun 2015 20:56:30 +0000 (14:56 -0600)]
docs: fix a markup typo in gladevcp docs
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
John Thornton [Wed, 24 Jun 2015 12:13:52 +0000 (07:13 -0500)]
Docs: add missing html directories to make clean
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sun, 21 Jun 2015 13:51:55 +0000 (08:51 -0500)]
Docs: combine both occurrences of the configuration launcher
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sun, 21 Jun 2015 12:17:09 +0000 (07:17 -0500)]
Docs: check index against list of docs and add missing files
Signed-off-by: John Thornton <bjt128@gmail.com>
Moses McKnight [Sun, 21 Jun 2015 02:51:04 +0000 (21:51 -0500)]
Added blt to runtime package dependencies
Signed-off-by: Moses McKnight <moses@texband.net>
Sebastian Kuzminsky [Wed, 25 Feb 2015 17:06:33 +0000 (10:06 -0700)]
rtapi: include unistd.h in uspace_common.h
unistd.h declares geteuid(), getuid(), sysconf(), and some other things
which are used by code in uspace_common.h.
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
Sebastian Kuzminsky [Thu, 5 Mar 2015 00:19:50 +0000 (17:19 -0700)]
Motion: indentation fixup
This moves a case statement to line up with all of its neighbors.
Whitespace only, no functional code change.
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
John Thornton [Sat, 20 Jun 2015 14:03:16 +0000 (09:03 -0500)]
Docs: add chips and tooltips
Signed-off-by: John Thornton <bjt128@gmail.com>
Sebastian Kuzminsky [Fri, 19 Jun 2015 23:30:34 +0000 (17:30 -0600)]
packaging: include the manpage pdf in linuxcnc-doc-en.deb
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
John Thornton [Fri, 19 Jun 2015 16:19:04 +0000 (11:19 -0500)]
Docs: fix a link and organize the index.tmpl
Signed-off-by: John Thornton <bjt128@gmail.com>
Sebastian Kuzminsky [Fri, 19 Jun 2015 04:35:06 +0000 (22:35 -0600)]
docs: make source-highlight build non-recursive
Convert the docs/src/source-highlight/Makefile to a Submakefile.
Tweak source-highlight/Submakefile so its local variables do not collide
with the variables used by the main build system.
The main source-highlight config file is
docs/src/source-highlight/local/lang.map, which is generated by the build
system from the system-wide lang.map (provided by the source-highlight
package) plus our local additions. Both docs/src/Submakefile and
docs/src/source-highlight/Makefile had targets for this lang.map, but
the dependencies were different. I opted to use the dependencies from
docs/src/Submakefile, since those seem correcter.
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
John Thornton [Wed, 17 Jun 2015 11:26:58 +0000 (06:26 -0500)]
Docs: restore guess as to what was causing the build warnings
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Tue, 16 Jun 2015 17:55:12 +0000 (12:55 -0500)]
Docs: fix build warnings
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Tue, 16 Jun 2015 11:12:16 +0000 (06:12 -0500)]
Docs: fix build warnings
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Tue, 16 Jun 2015 10:52:01 +0000 (05:52 -0500)]
Docs: fix build warnings
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Mon, 15 Jun 2015 15:41:59 +0000 (10:41 -0500)]
Docs: stop make clean from deleting the plus and minus png files
these are used to indicate the state of the branches in the html docs
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Mon, 15 Jun 2015 15:37:19 +0000 (10:37 -0500)]
Docs: fix self induced broken link
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Mon, 15 Jun 2015 11:11:42 +0000 (06:11 -0500)]
Docs: fix build errors and minor markup fixes
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Mon, 15 Jun 2015 10:54:42 +0000 (05:54 -0500)]
Docs: fix build errors and minor markup fixes
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Mon, 15 Jun 2015 10:39:58 +0000 (05:39 -0500)]
Docs: fix build errors and minor markup fixes
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sun, 14 Jun 2015 19:12:04 +0000 (14:12 -0500)]
Docs: fix build errors and minor markup fixes
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sun, 14 Jun 2015 19:11:34 +0000 (14:11 -0500)]
Docs: add info to markup doc
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sun, 14 Jun 2015 14:52:00 +0000 (09:52 -0500)]
Docs: fix build warning :missing section:
Level 3 causes a build warning and does not add to the toc so make them a bullet
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sun, 14 Jun 2015 14:48:03 +0000 (09:48 -0500)]
Docs: move pyvcp to gui subdirectory along with the rest of the gui like things
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sun, 14 Jun 2015 12:18:08 +0000 (07:18 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sun, 14 Jun 2015 12:08:38 +0000 (07:08 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sun, 14 Jun 2015 12:08:27 +0000 (07:08 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sun, 14 Jun 2015 12:08:13 +0000 (07:08 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
Dewey Garrett [Fri, 12 Jun 2015 22:55:10 +0000 (15:55 -0700)]
xhc-hb04.cc fix a mem leak
minor: remove dead fwd ref to cb_transfer_in()
Change identified by Hartley Sweeten, reviewed by Frederic Rible
Signed-off-by: Dewey Garrett <dgarrett@panix.com>
John Thornton [Sat, 13 Jun 2015 12:07:25 +0000 (07:07 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 13 Jun 2015 12:07:21 +0000 (07:07 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 13 Jun 2015 12:07:17 +0000 (07:07 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 13 Jun 2015 12:07:11 +0000 (07:07 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 13 Jun 2015 12:07:06 +0000 (07:07 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 13 Jun 2015 12:07:00 +0000 (07:07 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 13 Jun 2015 11:36:46 +0000 (06:36 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 13 Jun 2015 11:36:38 +0000 (06:36 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 13 Jun 2015 11:36:32 +0000 (06:36 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 13 Jun 2015 11:36:27 +0000 (06:36 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 13 Jun 2015 11:17:38 +0000 (06:17 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 13 Jun 2015 11:17:30 +0000 (06:17 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 13 Jun 2015 11:17:23 +0000 (06:17 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 13 Jun 2015 11:17:16 +0000 (06:17 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 13 Jun 2015 11:17:10 +0000 (06:17 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 13 Jun 2015 11:17:03 +0000 (06:17 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Fri, 12 Jun 2015 11:58:07 +0000 (06:58 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Fri, 12 Jun 2015 11:29:17 +0000 (06:29 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Fri, 12 Jun 2015 11:15:36 +0000 (06:15 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Fri, 12 Jun 2015 11:15:24 +0000 (06:15 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Thu, 11 Jun 2015 18:22:19 +0000 (13:22 -0500)]
Docs: change see x manual to a link to the section or chapter
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Thu, 11 Jun 2015 16:50:08 +0000 (11:50 -0500)]
Docs: change see x manual to a link to the section
when duplicate chapters were removed from the user and integrator
manuals the links no longer worked.
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Thu, 11 Jun 2015 11:59:03 +0000 (06:59 -0500)]
Merge branch '2.7_Docs' into 2.7
add expanding/collapsing toc to html
combine user, hal and integrator into one document
this allows links that previously would not work between the seperate pdf documents
Dewey Garrett [Thu, 11 Jun 2015 02:10:20 +0000 (19:10 -0700)]
xhc-hb04: README clarify mpg_accels units
thanks Russell Brown
Signed-off-by: Dewey Garrett <dgarrett@panix.com>
John Thornton [Fri, 5 Jun 2015 16:54:52 +0000 (11:54 -0500)]
Docs: move setup chapters to manual
Signed-off-by: John Thornton <bjt128@gmail.com>
Sebastian Kuzminsky [Thu, 4 Jun 2015 14:59:21 +0000 (08:59 -0600)]
docs: remove a stray tab in the middle of a word
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
Sebastian Kuzminsky [Wed, 3 Jun 2015 23:58:03 +0000 (17:58 -0600)]
Merge remote-tracking branch 'origin/2.6' into 2.7
Sebastian Kuzminsky [Wed, 3 Jun 2015 23:35:01 +0000 (17:35 -0600)]
io: initialize the tool-in-spindle info correctly
IO reports the tool number of the tool currently in the spindle in two
ways: by the hal pin iocontrol.0.tool-number, and by the emcioStatus
field tool.toolInSpindle.
Before this commit, these two variables were not initialized correctly
at startup (they were updated at the first tool change, and correct
there after). This commit fixes the initialization these variables.
On machines with nonrandom tool changers, LinuxCNC assumes it starts up
with the spindle empty, indicated by tool number 0 in this config.
On machines with random tool changers, LinuxCNC normally starts up with
a tool in the spindle (possibly T0 which is commonly used to denote
"no tool"). In the situation where the tool table does not indicate a
tool in the spindle, the "error" tool number -1 is reported.
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
Sebastian Kuzminsky [Wed, 3 Jun 2015 23:31:48 +0000 (17:31 -0600)]
tests: add a test of io startup tool-in-spindle
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
Sebastian Kuzminsky [Wed, 3 Jun 2015 03:57:09 +0000 (21:57 -0600)]
docs: minor layout cleanup
Signed-off-by: Sebastian Kuzminsky <seb@highlab.com>
Moses McKnight [Tue, 2 Jun 2015 14:09:02 +0000 (09:09 -0500)]
Add function to select gcode color scheme in gladevcp gcode widget
Signed-off-by: Moses McKnight <moses@texband.net>
Moses McKnight [Tue, 2 Jun 2015 00:57:49 +0000 (19:57 -0500)]
EMC_Sourceview.set_language() was broken if no path passed in.
Signed-off-by: Moses McKnight <moses@texband.net>
John Thornton [Wed, 27 May 2015 13:14:16 +0000 (08:14 -0500)]
fix broken image
seems the image:: tag only works if there is something after it
Signed-off-by: John Thornton <bjt128@gmail.com>
Moses McKnight [Tue, 26 May 2015 02:45:52 +0000 (21:45 -0500)]
Combined some distributions in debian/configure
Signed-off-by: Moses McKnight <moses@texband.net>
Moses McKnight [Tue, 26 May 2015 02:38:21 +0000 (21:38 -0500)]
Remove libgnomeprintui2.2-dev as dependency in Ubuntu 14.04
Ubuntu 14.04 does not have libgnomeprintui2.2-dev, and removing it
only disables printing from classicladder. It had to be deleted
from debian/control.in and added to all the distributions that
support it in debian/configure
Signed-off-by: Moses McKnight <moses@texband.net>
Moses McKnight [Tue, 26 May 2015 02:31:33 +0000 (21:31 -0500)]
Removed redundant dependencies from debian/configure
texlive-lang-french, texlive-lang-spanish, texlive-lang-german
are already in debian/control.in and are common to all supported
distributions; so did not need to be in EXTRA_BUILD here.
Signed-off-by: Moses McKnight <moses@texband.net>
Chris Morley [Wed, 27 May 2015 00:24:10 +0000 (17:24 -0700)]
Merge branch '2.6' into 2.7
John Thornton [Tue, 26 May 2015 14:32:15 +0000 (09:32 -0500)]
correct pin name
Signed-off-by: John Thornton <bjt128@gmail.com>
Moses McKnight [Mon, 25 May 2015 18:19:13 +0000 (13:19 -0500)]
Merge branch '2.6' into 2.7
Moses McKnight [Mon, 25 May 2015 18:17:52 +0000 (13:17 -0500)]
Added to the haltcl docs
Signed-off-by: Moses McKnight <moses@texband.net>
Dewey Garrett [Tue, 19 May 2015 16:00:31 +0000 (09:00 -0700)]
halrmt.c report thread .time pin value
Signed-off-by: Dewey Garrett <dgarrett@panix.com>
Dewey Garrett [Tue, 19 May 2015 15:55:57 +0000 (08:55 -0700)]
halrmt.c fix readClient() incorrect goto finished
Signed-off-by: Dewey Garrett <dgarrett@panix.com>
Dewey Garrett [Mon, 18 May 2015 13:54:53 +0000 (06:54 -0700)]
hal_lib: new pin,param for thread time,tmax
A 'pseudo' Hal component is created in order to make:
threadname.time pin (output only for halscope, hal-histogram, etc)
threadname.tmax param (rw so it can be reset)
The pseudo component name is identified by the prefix:
HAL_PSEUDO_COMP_PREFIX = "__"
Example:
$ halcmd show comp __
Loaded HAL Components:
ID Type Name PID State
17 RT __servo-thread ready
16 RT __base-thread ready
$ halcmd show pin \*thread\*
Component Pins:
Owner Type Dir Value Name
22 s32 OUT 26040 servo-thread.time ==> hhs-0
$ halcmd show param \*thread\*
Parameters:
Owner Type Dir Value Name
22 s32 RW 147280 servo-thread.tmax
Note:
removed two #if 0 sections for comments about adding this functionality
tested on
ubuntu lucid rtai
debian wheezy uspace
Alternate to using a coded prefix for a 'pseudo' component:
Consider changing the hal_comp_t struct type field from an
int to an enum and modifying hal_init() to accept an arg
for special comp types. As hal_init() is used many places,
this method is probably too pervasive for upcoming 2.7 release.
Signed-off-by: Dewey Garrett <dgarrett@panix.com>
Chris Morley [Mon, 18 May 2015 06:25:15 +0000 (23:25 -0700)]
stepconf -fix invert of signals on pp2 during axis test
They were ignored completely
Signed-off-by: Chris Morley <chrisinnanaimo@hotmail.com>
Chris Morley [Mon, 18 May 2015 05:54:51 +0000 (22:54 -0700)]
stepconf -fix multiple picked outputs in axis test being ignored
If one picked (eg) 'enable' more then once, only the first would
be set properly in the axis tests
Signed-off-by: Chris Morley <chrisinnanaimo@hotmail.com>
Chris Radek [Sat, 23 May 2015 23:07:32 +0000 (18:07 -0500)]
Fix touchy's Set Tool/Origin defaults on lathes
On mills (unchanged):
Set Origin defaults to X
Set Tool defaults to Z
On lathes:
Set Origin defaults to Z (formerly X)
Set Tool defaults to X (formerly Q)
Signed-off-by: Chris Radek <chris@timeguy.com>
John Thornton [Wed, 20 May 2015 12:46:13 +0000 (07:46 -0500)]
add collapsing/expanding lists to html docs
Signed-off-by: John Thornton <bjt128@gmail.com>
Daniel Rogge [Tue, 19 May 2015 20:50:37 +0000 (15:50 -0500)]
Trajectory planner: pausing during G95 fix
Change check for spindle synch flag on pause command so that G95 pause is
instantaneous, G33.1/G76 pause waits till end of move.
Signed-off-by: Chris Radek <chris@timeguy.com>
Norbert Schechner [Tue, 19 May 2015 17:08:45 +0000 (19:08 +0200)]
Merge branch '2.6' into 2.7
Norbert Schechner [Tue, 19 May 2015 17:07:32 +0000 (19:07 +0200)]
gmoccapy_1_5_5 - several new keyboard shortcuts
ver. 1.5.5
- gmoccapy will take notice of the settings
"DISPLAY", "POSITION_FEEDBACK" in the INI File and
set the DRO accordingly (Code basis from Steffen)
- Added keyboard shortcut F3 to change to manual mode
- Added keyboard shortcut F5 to change to MDI Mode
- Added keyboard shortcut "Enter" for MDI Mode to
submit the selected command
- Added keyboard shortcut "i" and "I" to switch
jog increments forward and backwards like in axis
Signed-off-by: Norbert Schechner <nieson@web.de>
John Thornton [Sun, 17 May 2015 18:02:24 +0000 (13:02 -0500)]
remove unused reference to the user manual
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sun, 17 May 2015 18:01:45 +0000 (13:01 -0500)]
create desktop shortcut file with the correct name
the file manager does not show you the file name so you have to open
it up in an editor to see the name and change it.
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sun, 17 May 2015 15:41:19 +0000 (10:41 -0500)]
remove desktop packages not used
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 16 May 2015 18:52:42 +0000 (13:52 -0500)]
fix spelling error that prevented building the pdf
Signed-off-by: John Thornton <bjt128@gmail.com>
John Thornton [Sat, 16 May 2015 18:42:16 +0000 (13:42 -0500)]
remove duplicate copy and paste error
Signed-off-by: John Thornton <bjt128@gmail.com>