From 9f9fcecd6102705508ce8217bd2345f2a798b71d Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Sat, 12 Sep 2015 21:54:40 +0200
Subject: [PATCH] configuration: synchronize with man page

---
 doc/ncmpcpp.1         | 11 ++++++++++-
 src/configuration.cpp |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/doc/ncmpcpp.1 b/doc/ncmpcpp.1
index d22f83f0..17840ee0 100644
--- a/doc/ncmpcpp.1
+++ b/doc/ncmpcpp.1
@@ -15,8 +15,17 @@ Connect to server at host [localhost]
 .B \-p, \-\-port
 Connect to server at port [6600]
 .TP
+.B \-\-current-song
+Print current song using given format and exit
+.TP
 .B \-c, \-\-config
-Use alternative configuration file
+Specify configuration file(s)
+.TP
+.B \-\-ignore-config-errors
+Ignore unknown and invalid options in configuration files
+.TP
+.B \-c, \-\-bindings
+Specify bindings file
 .TP
 .B \-s, \-\-screen <name>
 Specify the startup screen (<name> may be: help, playlist, browser, search_engine, media_library, playlist_editor, tag_editor, outputs, visualizer, clock)
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 60026c35..c8fa609e 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -81,8 +81,8 @@ bool configure(int argc, char **argv)
 		("config,c", po::value<std::vector<std::string>>(&config_paths)->default_value(default_config_paths, join<std::string>(default_config_paths, " AND ")), "specify configuration file(s)")
 		("ignore-config-errors", "ignore unknown and invalid options in configuration files")
 		("bindings,b", po::value<std::string>(&bindings_path)->default_value("~/.ncmpcpp/bindings"), "specify bindings file")
-		("screen,s", po::value<std::string>(), "specify initial screen")
-		("slave-screen,S", po::value<std::string>(), "specify initial slave screen")
+		("screen,s", po::value<std::string>(), "specify the startup screen")
+		("slave-screen,S", po::value<std::string>(), "specify the startup slave screen")
 		("help,?", "show help message")
 		("version,v", "display version information")
 	;