From 8de8651e84da6affff64ef8ce1b79f566333d0b5 Mon Sep 17 00:00:00 2001 From: Lev Tonkikh Date: Sun, 9 Oct 2016 11:30:31 +0300 Subject: [PATCH 1/4] welcome new json --- src/intro/tour.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/intro/tour.rst b/src/intro/tour.rst index 62ae59bf..150c951c 100644 --- a/src/intro/tour.rst +++ b/src/intro/tour.rst @@ -40,13 +40,12 @@ The reply should look something like: .. code-block:: javascript { + "couchdb": "Welcome", - "uuid": "85fb71bf700c17267fef77535820e371", - "version": "1.4.0", "vendor": { - "version": "1.4.0", "name": "The Apache Software Foundation" - } + }, + "version": "2.0.0" } Not all that spectacular. CouchDB is saying "hello" with the running version From f9697b108a90b083b7f805e5e92cc08a0f8dfa9f Mon Sep 17 00:00:00 2001 From: Lev Tonkikh Date: Tue, 11 Oct 2016 11:24:45 +0300 Subject: [PATCH 2/4] fix trailing whitespace --- src/intro/tour.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/src/intro/tour.rst b/src/intro/tour.rst index 150c951c..293512f4 100644 --- a/src/intro/tour.rst +++ b/src/intro/tour.rst @@ -40,7 +40,6 @@ The reply should look something like: .. code-block:: javascript { - "couchdb": "Welcome", "vendor": { "name": "The Apache Software Foundation" From 2e7b4c7ee8fbc8b98103ad86462c18ffeb8f3289 Mon Sep 17 00:00:00 2001 From: Lev Tonkikh Date: Sat, 15 Oct 2016 22:33:26 +0300 Subject: [PATCH 3/4] fix curl.rst --- src/intro/curl.rst | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/intro/curl.rst b/src/intro/curl.rst index 6ceb4a2b..192a3a15 100644 --- a/src/intro/curl.rst +++ b/src/intro/curl.rst @@ -36,12 +36,10 @@ clarity): { "couchdb": "Welcome", - "uuid": "85fb71bf700c17267fef77535820e371", + "version": "2.0.0", "vendor": { - "name": "The Apache Software Foundation", - "version": "1.4.0" - }, - "version": "1.4.0" + "name": "The Apache Software Foundation" + } } .. note:: From e97a665eb6cdef2da6684d4dc0afaa3b97e8df1a Mon Sep 17 00:00:00 2001 From: Lev Tonkikh Date: Sat, 15 Oct 2016 22:36:09 +0300 Subject: [PATCH 4/4] fix api.rst --- src/intro/api.rst | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/intro/api.rst b/src/intro/api.rst index 9727182f..99731a5d 100644 --- a/src/intro/api.rst +++ b/src/intro/api.rst @@ -56,12 +56,10 @@ CouchDB replies, all excited to get going: { "couchdb": "Welcome", - "uuid": "85fb71bf700c17267fef77535820e371", + "version": "2.0.0", "vendor": { - "name": "The Apache Software Foundation", - "version": "1.5.0" - }, - "version": "1.5.0" + "name": "The Apache Software Foundation" + } } You get back a JSON string, that, if parsed into a native object or data