[DRE-commits] [SCM] rails.git branch, master, updated. debian/2%2.3.14.2-10-gc642b7e

[Ondřej Surý]

The following commit has been merged in the master branch:
commit 1b985e20ab9d9f20f88ab05404a8155e1e8e609f
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Mar 21 15:56:48 2013 +0100

    rails is already provided by ruby-railties-3.2

diff --git a/debian/rails.install b/debian/rails.install
index 265db5a..6a4e0cc 100644
--- a/debian/rails.install
+++ b/debian/rails.install
@@ -1,2 +1 @@
-rails /usr/bin
 rails.1 /usr/share/man/man1/
diff --git a/rails b/rails
deleted file mode 100644
index 95a8cab..0000000
--- a/rails
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec ruby /usr/lib/ruby/vendor_ruby/railties/bin/rails "$@"
diff --git a/rails.1 b/rails.1
index bd4289d..c9f2dac 100644
--- a/rails.1
+++ b/rails.1
@@ -1,51 +1,98 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH RAILS 1 "February  12, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
+.TH RAILS "1" "March 2013" "Rails 3.2.13" "User Commands"
 .SH NAME
 rails \- Ruby on Rails deployment script
-.SH SYNOPSIS
-.B rails
-.RI [ options ] " destination(s)"  ...
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
+.SH USAGE
+.IP
+rails new APP_PATH [options]
 .SH OPTIONS
 .TP
-.B \-d, \-\-no\-docs
-Deploys rails without any documentation.
+\fB\-r\fR, [\-\-ruby=PATH]
+Path to the Ruby binary of your choice (Default: /usr/bin/ruby1.9.1)
 .TP
-.B \-C, \-\-copy
-Deploys rails by copying instead of linking vendor libraries.
+\fB\-b\fR, [\-\-builder=BUILDER]
+Path to a application builder (can be a filesystem path or URL)
 .TP
-.B \-F, \-\-force\-overwrite
-Overwrites all previously deployed files, if any.
+\fB\-m\fR, [\-\-template=TEMPLATE]
+Path to an application template (can be a filesystem path or URL)
 .TP
-.B \-D, \-\-database
-Specify the database to be used. Supported values are mysql, oracle, postgresql, sqlite3, 
-frontbase and ibm_db
+[\-\-skip\-gemfile]
+Don't create a Gemfile
 .TP
-.B \-I, \-\-internal
-Options to be passed to the upstream rails script.
+[\-\-skip\-bundle]
+Don't run bundle install
+.TP
+\fB\-G\fR, [\-\-skip\-git]
+Skip Git ignores and keeps
+.TP
+\fB\-O\fR, [\-\-skip\-active\-record]
+Skip Active Record files
+.TP
+\fB\-S\fR, [\-\-skip\-sprockets]
+Skip Sprockets files
+.TP
+\fB\-d\fR, [\-\-database=DATABASE]
+Preconfigure for selected database (Default: sqlite3)
+(Options: mysql/postgresql/sqlite3/...)
+.TP
+\fB\-j\fR, [\-\-javascript=JAVASCRIPT]
+Preconfigure for selected JavaScript library (Default: jquery)
+.TP
+\fB\-J\fR, [\-\-skip\-javascript]
+Skip JavaScript files
+.TP
+[\-\-dev]
+Setup the application with Gemfile pointing to your Rails checkout
+.TP
+[\-\-edge]
+Setup the application with Gemfile pointing to Rails repository
+.TP
+\fB\-T\fR, [\-\-skip\-test\-unit]
+Skip Test::Unit files
+.TP
+[\-\-old\-style\-hash]
+Force using old style hash (:foo => 'bar') on Ruby >= 1.9
+.SH RUNTIME OPTIONS
+.TP
+\fB\-f\fR, [\-\-force]
+Overwrite files that already exist
+.TP
+\fB\-p\fR, [\-\-pretend]
+Run but do not make any changes
+.TP
+\fB\-q\fR, [\-\-quiet]
+Suppress status output
+.TP
+\fB\-s\fR, [\-\-skip]
+Skip files that already exist
+.SH RAILS OPTIONS
+.TP
+\fB\-h\fR, [\-\-help]
+Show this help message and quit
+.TP
+\fB\-v\fR, [\-\-version]
+Show Rails version number and quit
+.SH DESCRIPTION
+.IP
+The 'rails new' command creates a new Rails application with a default
+directory structure and configuration at the path you specify.
+.IP
+You can specify extra command\-line arguments to be used every time
+\&'rails new' runs in the .railsrc configuration file in your home directory.
+.IP
+Note that the arguments specified in the .railsrc file don't affect
+the defaults values shown above in this help message.
+.SH EXAMPLE
+.IP
+rails new ~/Code/Ruby/weblog
+.IP
+This generates a skeletal Rails installation in ~/Code/Ruby/weblog.
+See the README in the newly created application to get going.
 .SH SEE ALSO
 Full documentation of rails are available after Ruby On Rails is
-deployed. For getting started instructions, see /usr/share/doc/rails/README.Debian
-
+deployed. For getting started instructions, see
+/usr/share/doc/rails/README.Debian
 .SH AUTHOR
 The upstream author of Ruby On Rails is David Heinemeier Hansson
-<david at loudthinking.com>. This manual page was written by Adam Majer <adamm at zombino.com>,
-for the Debian project (but may be used by others).
+<david at loudthinking.com>.  This manual page was created by help2man by
+Ondřej Surý <ondrej at debian.org.

-- 
rails.git