Permalink
Browse files

Merge branch 'master' into html_abstract

  • Loading branch information...
2 parents e6d6c36 + f6b6658 commit 05d9af23984b8253b11ea734d86a921f931cf2ad @napcs committed Aug 28, 2011
Showing with 20 additions and 12 deletions.
  1. +15 −7 README.rdoc
  2. +1 −1 Rakefile
  3. +2 −2 docbook.iss
  4. +1 −1 readme_files/Rakefile
  5. BIN readme_files/docbook.pdf
  6. +1 −1 version.rb
View
@@ -2,7 +2,9 @@
This package gives you all the tools you need to author books and articles with the open-source Docbook toolchain.
-Contained in this package are the Docbook XSLT stylesheets, a validation package, XML-FO to PDF translation, and a project generator with build scripts. This uses the dookbook-xsl-ns stylesheets.
+Contained in this package are the Docbook XSLT stylesheets,
+ a validation package, XML-FO to PDF translation, and a project
+ generator with build scripts. This uses the dookbook-xsl-ns stylesheets.
== Installation and Usage
@@ -15,9 +17,10 @@ Finally, you need Rubygems and Rake.
=== Basic installation for (Potential) Authors and Writers
-This repository is for technical people who want to get the latest bleeding-edge version of this toolchain so they can
-customize it to fit their neeeds. Authors and other end users should download the re-distributable packages available at http://www.napcs.com/products/docbook
-which are more stable.
+This repository is for technical people who want to get the latest bleeding-edge version of
+this toolchain so they can customize it to fit their neeeds. Authors and other end
+users should download the re-distributable packages available at
+http://www.napcs.com/products/docbook which are more stable.
=== Developers and Integrators
If you're interested in creating a more customized toolchain as part of a continous build process, etc, you should clone the repository
@@ -28,11 +31,14 @@ Then run
rake install
-This copies only the necessary files to c:/docbook on windows or ~/docbook on Linux and Mac OS. If you want to install elsewhere, specify a path
+This copies only the necessary files to c:/docbook on windows
+or ~/docbook on Linux and Mac OS. If you want to install elsewhere,
+specify a path
sudo rake install DIR=/opt/docbook
-You'll be prompted to add the install directory to your path. Also add the SHORT_ATTENTION_SPAN_DOCBOOK environment variable to the installation directory to make it easier to run the generators and find everything.
+You'll be prompted to add the install directory to your path.
+Also add the SHORT_ATTENTION_SPAN_DOCBOOK environment variable to the installation directory to make it easier to run the generators and find everything.
=== Staying on the Bleeding Edge
@@ -111,7 +117,7 @@ Due to changes in the way things worked, your best bet is to generate a new proj
Remember - to build your books, you now use
rake book.pdf
- rake book.pdf VALIOATE=false
+ rake book.pdf VALIDATE=false
== Patches
@@ -120,6 +126,8 @@ Please fork and pull. Don't update the changelog. Make small patches I can pull
== Changes
+2011-08-28 - v1.4.1.1
+ * Fixed install script's documentation rake task that was aborting improperly.
2011-04-19 -v1.4.1
* Fixed the validation code. You'll find out if you have a bad doc much quicker now.
2011-03-22 -v1.4.0
View
@@ -5,7 +5,7 @@ files = %w{make.rb version.rb README.txt hhc.exe jars lib xsl readme_files Rakef
desc "create documentation"
task :doc do
- `cd readme_files && rake docbook.pdf && cd ..`
+ `cd readme_files && rake docbook.pdf SHORT_ATTENTION_SPAN_DOCBOOK_PATH="../" && cd ..`
FileUtils.cp "README.rdoc","README.txt"
end
View
@@ -7,15 +7,15 @@
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{0A22D345-DFA9-45B8-AC92-57F2E933BA7D})
AppName=Short Attention Span Docbook
-AppVerName=Short Attention Span Docbook 1.4.0
+AppVerName=Short Attention Span Docbook 1.4.1.1
AppPublisher=New Auburn Personal Computer Services LLC
AppPublisherURL=http://www.napcs.com
AppSupportURL=http://www.napcs.com
AppUpdatesURL=http://www.napcs.com/products/docbook
DefaultDirName=c:\docbook
DefaultGroupName=Short Attention Span Docbook
AllowNoIcons=yes
-OutputBaseFilename=docbook_setup-1_4_1
+OutputBaseFilename=docbook_setup-1_4_1_1
Compression=lzma
SolidCompression=yes
ChangesEnvironment=yes
View
@@ -7,6 +7,6 @@
#=================== Set path to DOCBOOK files =======
-DOCBOOK_ROOT = ENV['SHORT_ATTENTION_SPAN_DOCBOOK_PATH'] || "/Users/brianhogan/git/docbook"
+DOCBOOK_ROOT = ENV['SHORT_ATTENTION_SPAN_DOCBOOK_PATH']
require "#{DOCBOOK_ROOT}/make"
View
Binary file not shown.
View
@@ -1,5 +1,5 @@
class DocbookVersion
- @@version = "1.4.1"
+ @@version = "1.4.1.1"
@@xsl_version = "1.76.1"
def self.version
@@version

0 comments on commit 05d9af2

Please sign in to comment.