<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -40,7 +40,9 @@ Sunspot is currently under active development and is not feature-complete.
 
 In order to start the packaged Solr installation, run:
 
-  sunspot-solr start -- -d /path/to/data/directory [-p port]
+  sunspot-solr start -- [-d /path/to/data/directory] [-p port]
+
+If you don't specify a data directory, your Solr index will be stored in your operating system's temporary directory.
 
 You can also run your own instance of Solr wherever you'd like; just copy the solr/config/schema.xml file out of the gem's solr into your installation.
 You can change the URL at which Sunspot accesses Solr with:</diff>
      <filename>README.rdoc</filename>
    </modified>
    <modified>
      <diff>@@ -3,6 +3,7 @@ require 'rubygems'
 gem 'daemons', '~&gt; 1.0'
 gem 'optiflag', '~&gt; 0.6.5'
 require 'fileutils'
+require 'tmpdir'
 require 'daemons'
 require 'optiflag'
 
@@ -15,7 +16,7 @@ module SolrFlags extend OptiFlagSet
     long_form 'port'
   end
 
-  flag 'd' do
+  optional_flag 'd' do
     description 'Solr data directory'
   end
 
@@ -23,7 +24,7 @@ module SolrFlags extend OptiFlagSet
 end
 
 port = ARGV.flags.p || '8983'
-data_dir = File.expand_path(ARGV.flags.d) if ARGV.flags.d
+data_dir = File.expand_path(ARGV.flags.d || File.join(Dir.tmpdir, 'solr_data'))
 
 Daemons.run_proc('sunspot-solr') do
   FileUtils.cd(working_directory) do</diff>
      <filename>bin/sunspot-solr</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>f86f117f94e8e85f5510dd79339ccfba84c8b4ce</id>
    </parent>
  </parents>
  <author>
    <name>Mat Brown</name>
    <email>mat@patch.com</email>
  </author>
  <url>http://github.com/outoftime/sunspot/commit/ec85b95c38aa2855f041fa951f9a734f75826769</url>
  <id>ec85b95c38aa2855f041fa951f9a734f75826769</id>
  <committed-date>2009-02-14T13:24:40-08:00</committed-date>
  <authored-date>2009-02-14T13:24:40-08:00</authored-date>
  <message>sunspot-solr by default stores index in /tmp</message>
  <tree>9b7b877385edbf8ac1fa4500db0654e0517e7f92</tree>
  <committer>
    <name>Mat Brown</name>
    <email>mat@patch.com</email>
  </committer>
</commit>
