re-gen docs

couchbaselabs · Aug 26, 2015 · 21964be · 21964be
1 parent 5ae5c7e
commit 21964be
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -36,7 +36,7 @@ gen-bindata:
 	go fmt bindata_assetfs.go
 
 gen-docs: cmd/cbft_docs/main.go
-	go build -o ./cbft_docs ./cmd/cbft_docs
+	go build $(goflags) -o ./cbft_docs ./cmd/cbft_docs
 	./cbft_docs > docs/api-ref.md
 	./dist/gen-command-docs > docs/admin-guide/command.md
 

diff --git a/docs/admin-guide/command.md b/docs/admin-guide/command.md
@@ -40,6 +40,8 @@ That will print out usage/help output...
           optional directory path where local index data and
           local config files will be stored for this node;
           default is 'data'.
+      -e, -extra extra info
+          extra info you want stored with this node
       -h, -H, -?, -help 
           print this usage message and exit.
       -register STATE

diff --git a/docs/api-ref.md b/docs/api-ref.md
@@ -20,7 +20,7 @@ Sample response:
 
     {
       "indexDefs": {
-        "implVersion": "3.1.0",
+        "implVersion": "4.0.0",
         "indexDefs": {
           "myFirstIndex": {
             "name": "myFirstIndex",
@@ -329,9 +329,8 @@ Sample response:
         "TotSaveNodeDef": 2,
         "TotSaveNodeDefGetErr": 0,
         "TotSaveNodeDefOk": 2,
-        "TotSaveNodeDefSetErr": 0,
-        "TotSaveNodeDefUUIDErr": 0,
-        "TotSaveNodeDefUUIDTakenErr": 0
+        "TotSaveNodeDefSame": 0,
+        "TotSaveNodeDefSetErr": 0
       },
       "pindexes": {
         "myFirstIndex_6cc599ab7a85bf3b_0": null
@@ -463,7 +462,7 @@ Sample response:
 
     {
       "indexDefs": {
-        "implVersion": "3.1.0",
+        "implVersion": "4.0.0",
         "indexDefs": {
           "myFirstIndex": {
             "name": "myFirstIndex",
@@ -488,13 +487,13 @@ Sample response:
       "indexDefsCAS": 3,
       "indexDefsErr": null,
       "nodeDefsKnown": {
-        "implVersion": "3.1.0",
+        "implVersion": "4.0.0",
         "nodeDefs": {
-          "0.0.0.0:8095": {
+          "78fc2ffac2fd9401": {
             "container": "",
             "extras": "",
             "hostPort": "0.0.0.0:8095",
-            "implVersion": "3.1.0",
+            "implVersion": "4.0.0",
             "tags": null,
             "uuid": "78fc2ffac2fd9401",
             "weight": 1
@@ -505,13 +504,13 @@ Sample response:
       "nodeDefsKnownCAS": 1,
       "nodeDefsKnownErr": null,
       "nodeDefsWanted": {
-        "implVersion": "3.1.0",
+        "implVersion": "4.0.0",
         "nodeDefs": {
-          "0.0.0.0:8095": {
+          "78fc2ffac2fd9401": {
             "container": "",
             "extras": "",
             "hostPort": "0.0.0.0:8095",
-            "implVersion": "3.1.0",
+            "implVersion": "4.0.0",
             "tags": null,
             "uuid": "78fc2ffac2fd9401",
             "weight": 1
@@ -522,7 +521,7 @@ Sample response:
       "nodeDefsWantedCAS": 2,
       "nodeDefsWantedErr": null,
       "planPIndexes": {
-        "implVersion": "3.1.0",
+        "implVersion": "4.0.0",
         "planPIndexes": {
           "myFirstIndex_6cc599ab7a85bf3b_0": {
             "indexName": "myFirstIndex",
@@ -641,7 +640,7 @@ Sample response:
       },
       "numCPU": 8,
       "os": "darwin",
-      "versionData": "3.1.0",
+      "versionData": "4.0.0",
       "versionMain": "v0.2.0"
     }