merge with master branch

fprijate · Jun 14, 2013 · 6575b2a · 6575b2a
2 parents ce4451b + 00633ae
commit 6575b2a
Show file tree

Hide file tree

Showing 12 changed files with 1,647 additions and 1,257 deletions.
diff --git a/README.md b/README.md
@@ -156,7 +156,9 @@ HTML Beautifier Options:
   -c, --indent-char             Indentation character [" "]
   -b, --brace-style             [collapse|expand|end-expand] ["collapse"]
   -S, --indent-scripts          [keep|separate|normal] ["normal"]
-  -W, --max-char                Maximum characters per line (0 disables) [250]
+  -w, --wrap-line-length        Maximum characters per line (0 disables) [250]
+  -p, --preserve-newlines       Preserve existing line-breaks (--no-preserve-newlines disables)
+  -m, --max-preserve-newlines   Maximum number of line-breaks to be preserved in one chunk [10]
   -U, --unformatted             List of tags (defaults to inline) that should not be reformatted
 ```