Merge branch 'master' of github.com:sysprv/Alecto

sysprv · Sep 3, 2012 · fbce2eb · fbce2eb
2 parents 0aa33bb + d77f2fc
commit fbce2eb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-*~
-*.bck
-.*.swp
-*.log
+*~
+*.bck
+.*.swp
+jetty*.request.log
diff --git a/doc/rules.markdown b/doc/rules.markdown
@@ -88,7 +88,7 @@ appended to the `service` URI.
 # Other Instructions
 
 ## path\_info
-`path_info` is can be used when constructing proxy rules (delegating
+`path_info` is used when constructing proxy rules (delegating
 to a `service`) or to bind a a rule to a particular URI path.
 
 Each `service` rule must have `path_info` element defined. The URI

diff --git a/log/.pneuma b/log/.pneuma
diff --git a/run.cmd b/run.cmd
@@ -0,0 +1,5 @@
+@echo off
+set CLASSPATH=".;lib\*"
+
+echo Starting...
+java -cp %CLASSPATH% -Xms256m -Xmx256m -noverify -client -Dorg.eclipse.jetty.http.LEVEL=DEBUG org.jruby.Main _main.rb