Merge tag 'upstream/7.0.1'

Upstream version 7.0.1

1 files changed, 7 insertions, 16 deletions

diff --git a/docs/man/nikola.1 b/docs/man/nikola.1
index 214a924..0379d29 100644
--- a/docs/man/nikola.1
+++ b/docs/man/nikola.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
-.TH NIKOLA "1" "March 2014" "nikola 6.4.0" "User Commands"
+.TH NIKOLA "1" "June 2014" "nikola 7.0.1" "User Commands"
 .SH NAME
-nikola \- manual page for nikola 6.4.0
+nikola \- manual page for nikola 7.0.1
 .SH DESCRIPTION
 Nikola is a tool to create static websites and blogs. For full documentation and more information, please visit http://getnikola.com/
 .SS "Available commands:"
@@ -36,36 +36,27 @@ dump dependency DB
 nikola forget
 clear successful run status from internal DB
 .TP
+nikola github_deploy
+deploy the site to GitHub pages
+.TP
 nikola help
 show help
 .TP
 nikola ignore
 ignore task (skip) on subsequent runs
 .TP
-nikola import_blogger
-import a blogger dump
-.TP
-nikola import_feed
-import a RSS/Atom dump
-.TP
 nikola import_wordpress
 import a WordPress dump
 .TP
 nikola init
 create a Nikola site in the specified folder
 .TP
-nikola install_plugin
-install plugin into current site
-.TP
 nikola install_theme
 install theme into current site
 .TP
 nikola list
 list tasks from dodo file
 .TP
-nikola mincss
-apply mincss to the generated site
-.TP
 nikola new_page
 create a new page in the site
 .TP
@@ -75,8 +66,8 @@ create a new blog post or site page
 nikola orphans
 list all orphans
 .TP
-nikola run
-run tasks
+nikola plugin
+manage plugins
 .TP
 nikola serve
 start the test webserver