changes following from C# (#240)

(cherry picked from commit a389d042923eaca77641672eae89840f8f1b504a)

Author: rustagir

source/fundamentals/connection.txt

@@ -38,10 +38,6 @@ You can also use the :manual:`DNS Seed List Connection Format
 want more flexibility of deployment and the ability to change the
 servers in rotation without reconfiguring clients.
 
-.. note::
-
-   To learn how to retrieve your connection string in Atlas, see the :ref:`Quick Start guide <golang-connect-to-your-cluster>`.
-
 The next part of the connection string contains your username and, if
 you are using password-based authentication, your password. Replace the value of
 ``user`` with your username and ``pass`` with your password. If you are using an
@@ -66,8 +62,10 @@ your connections and runs database commands.
 
 You can create a client that uses your connection string and other
 client options by passing a ``ClientOptions`` object to the ``Connect()``
-method. To specify your connection URI, pass it to the ``ApplyURI()``
-method, creating a ``ClientOptions`` instance. To set any other
+method.
+
+To specify your connection URI, pass it to the ``ApplyURI()``
+method, which returns a new ``ClientOptions`` instance. To set any other
 options, call the relevant helper method from the ``options`` package.
 
 To learn more about connection options, see the
@@ -80,13 +78,18 @@ breaking changes when you upgrade to a new server version. To
 learn more about the {+stable-api+} feature, see the :ref:`{+stable-api+} page
 <golang-stable-api>`.
 
-The following code shows how you can create a client that uses your
+The following code shows how you can create a client that uses an Atlas
 connection string and the {+stable-api+} version, connect to MongoDB, and
 verify that the connection is successful:
 
 .. literalinclude:: /includes/fundamentals/code-snippets/srv.go
    :language: go
 
+.. tip::
+
+   Follow the :ref:`Quick Start guide <golang-connect-to-your-cluster>`
+   to retrieve your Atlas connection string.
+
 .. note::
 
    To learn about connecting to Atlas Serverless, see the

source/includes/fundamentals/code-snippets/srv.go

@@ -4,13 +4,13 @@ import (
 	"context"
 	"fmt"
 
+	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-	"go.mongodb.org/mongo-driver/mongo/readpref"
 )
 
-// Paste your connection string URI here
-const uri = "<connection string>"
+// Replace the placeholders with your credentials
+const uri = "mongodb+srv://<username>:<password>@cluster0.sample.mongodb.net/?retryWrites=true&w=majority"
 
 func main() {
 
@@ -31,9 +31,9 @@ func main() {
 	}()
 
 	// Send a ping to confirm a successful connection
-	if err := client.Ping(context.TODO(), readpref.Primary()); err != nil {
+	var result bson.M
+	if err := client.Database("admin").RunCommand(context.TODO(), bson.D{{"ping", 1}}).Decode(&result); err != nil {
 		panic(err)
 	}
-
-	fmt.Println("Pinged the primary node of the cluster. You successfully connected to MongoDB!")
+	fmt.Println("Pinged your deployment. You successfully connected to MongoDB!")
 }