Skip to content

Commit

Permalink
fix conflict w. version
Browse files Browse the repository at this point in the history
  • Loading branch information
practicingruby committed Dec 16, 2008
2 parents b95f208 + e5e1e09 commit 669e624
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
6 changes: 3 additions & 3 deletions HACKING
Expand Up @@ -2,7 +2,7 @@

A stub file that'll eventually get bigger

== NOTES ==
== NOTES

Install test-spec, pdf-reader, and mocha from RubyGems

Expand All @@ -15,7 +15,7 @@ If you are running on Ruby 1.9.1, you will need Test::Unit 1.2.3

gem install test-unit -v 1.2.3

== Patch process ==
== Patch process

1. File a ticket in Lighthouse describing your feature with 'request'
2. Fork Prawn on Github, make your changes
Expand All @@ -30,7 +30,7 @@ If you are running on Ruby 1.9.1, you will need Test::Unit 1.2.3
All bug reports should have a reproducible example in bugs/ and preferably,
some specs.

== Support ==
== Support

Find us in #prawn on irc.freenode.net
<sandal> - Gregory Brown
Expand Down
3 changes: 2 additions & 1 deletion Rakefile
Expand Up @@ -26,7 +26,8 @@ desc "genrates documentation"
Rake::RDocTask.new do |rdoc|
rdoc.rdoc_files.include( "README",
"COPYING",
"LICENSE", "lib/" )
"LICENSE",
"HACKING", "lib/" )
rdoc.main = "README"
rdoc.rdoc_dir = "doc/html"
rdoc.title = "Prawn Documentation"
Expand Down
4 changes: 2 additions & 2 deletions lib/prawn/document/text.rb
Expand Up @@ -41,7 +41,7 @@ module Text
#
# === Text Positioning Details:
#
# When using the +:at+ parameter, Prawn will position your text by its
# When using the :at parameter, Prawn will position your text by its
# baseline, and flow along a single line.
#
# When using automatic text flow, Prawn currently does a bunch of nasty
Expand All @@ -60,7 +60,7 @@ module Text
# differently.
#
# The moral of the story is that if you want reliable font positioning
# for your advanced needs, use +:at+, otherwise, just let Prawn do its
# for your advanced needs, use :at, otherwise, just let Prawn do its
# positioning magic for you, or investigate and help us get rid of this
# ugly issue.
#
Expand Down
4 changes: 2 additions & 2 deletions lib/prawn/name_tree.rb
Expand Up @@ -10,7 +10,7 @@
require 'prawn/reference'

module Prawn
module NameTree
module NameTree #:nodoc:
class Node #:nodoc:
attr_reader :children
attr_reader :limit
Expand Down Expand Up @@ -139,7 +139,7 @@ def insertion_point(value)
end
end

class Value
class Value #:nodoc:
include Comparable

attr_reader :name
Expand Down

0 comments on commit 669e624

Please sign in to comment.