Rename nncp-newnode to nncp-newcfg for convenience and short name

diff --git a/common.mk b/common.mk
index 0f7345e4f6b965fbbe68cda35b1739317ca1fc8d..c13ba525be999b6f2026a9ba0e57fd180667f3e2 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -26,7 +26,7 @@ ALL = \
        nncp-freq \
        nncp-log \
        nncp-mincfg \
-       nncp-newnode \
+       nncp-newcfg \
        nncp-pkt \
        nncp-stat \
        nncp-toss \
@@ -61,8 +61,8 @@ nncp-mail:
 nncp-mincfg:
        GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/nncp/cmd/nncp-mincfg
 
-nncp-newnode:
-       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/nncp/cmd/nncp-newnode
+nncp-newcfg:
+       GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/nncp/cmd/nncp-newcfg
 
 nncp-pkt:
        GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/nncp/cmd/nncp-pkt

diff --git a/doc/cmds.texi b/doc/cmds.texi
index 2751006bd6c65684301f50698d3d8d3b43709bf1..42197da77401e95616e094f0da28d9539d434e8d 100644 (file)
--- a/doc/cmds.texi
+++ b/doc/cmds.texi
@@ -178,15 +178,16 @@ spool}, path to log file, neighbours public keys are stayed. This is
 useful mainly for usage with @ref{nncp-xfer} that has to know only
 neighbours, without private keys involving.
 
-@node nncp-newnode
-@section nncp-newnode
+@node nncp-newcfg
+@section nncp-newcfg
 
 @verbatim
-% nncp-newnode [options] > mynewnode.yaml
+% nncp-newcfg [options] > new.yaml
 @end verbatim
 
-Generate new node: private keys, example configuration file and print it
-to stdout. You must use this command when you setup the new node.
+Generate new node configuration: private keys, example configuration
+file and print it to stdout. You must use this command when you setup
+the new node.
 
 Pay attention that private keys generation consumes an entropy from your
 operating system.

diff --git a/doc/workflow.texi b/doc/workflow.texi
index 7803a78d72d1235bbcba87d23faedae03dd112f6..5ec2c736dae95a35768990851d57d86777d3ee1b 100644 (file)
--- a/doc/workflow.texi
+++ b/doc/workflow.texi
@@ -5,7 +5,7 @@ NNCP consists of several utilities. As a rule you will have the
 following workflow:
 
 @enumerate
-@item Run @ref{nncp-newnode} on each node to create an initial
+@item Run @ref{nncp-newcfg} on each node to create an initial
 @ref{Configuration, configuration} file.
 @item Tune it up and set at least @ref{Spool, spool} and log paths.
 @item Share your public keys and reachability addressees with your

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-newnode/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-newcfg/main.go
similarity index 93%
rename from src/cypherpunks.ru/nncp/cmd/nncp-newnode/main.go
rename to src/cypherpunks.ru/nncp/cmd/nncp-newcfg/main.go
index 080160bb4581b866f3eac0b9225383636b02119a..cd36aa9023a97fe676175513f3fed1e165498265 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-newnode/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-newcfg/main.go
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-// Generate new NNCP node keys
+// Generate new NNCP node keys and configuration file
 package main
 
 import (
@@ -30,7 +30,7 @@ import (
 
 func usage() {
        fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-       fmt.Fprintln(os.Stderr, "nncp-newnode -- generate new node keys\nOptions:")
+       fmt.Fprintln(os.Stderr, "nncp-newcfg -- generate new configuration and keys\nOptions:")
        flag.PrintDefaults()
 }