Updated Ruby on Rails docs

test/test-markdown-frontmatter.js

@@ -4,9 +4,9 @@ const yaml = require('js-yaml')
 const chalk = require('chalk')
 
 // accepted data field values
-const sdk_languages = ['nodejs', 'scala', 'python', 'swift', 'csharp', 'objective-c', 'android-java', 'any', 'java', 'kotlin', 'dart', 'golang', 'c++']
+const sdk_languages = ['nodejs', 'scala', 'python', 'swift', 'csharp', 'objective-c', 'android-java', 'any', 'java', 'kotlin', 'dart', 'golang', 'ruby', 'c++']
 
-const tags = ['Ottoman', 'Ktor', 'REST API', 'Express', 'Flask', 'TLS', 'Configuration', 'Next.js', 'iOS', 'Xcode', '.NET', 'Xamarin', 'Authentication', 'OpenID', 'Keycloak', 'Android', 'P2P', 'UIKit', 'Installation', 'Spring Boot', 'Spring Data', 'Transactions', 'SQL++ (N1QL)', 'Optimization', 'Community Edition', 'Docker', 'Data Modeling', 'Metadata', 'Best Practices', 'Data Ingestion', 'Kafka', 'Support', 'Customer', 'Prometheus', 'Monitoring', 'Observability', 'Metrics', 'Query Workbench', 'ASP.NET', 'linq', 'DBaaS', 'App Services', 'Flutter', 'Gin Gonic', 'FastAPI', 'LangChain', "OpenAI", "Streamlit", 'Google Gemini', 'Nvidia NIM', 'LLama3', 'AWS', 'Artificial Intelligence', 'Cohere', 'Jina AI', 'Mistral AI', 'Ragas', 'Haystack', 'LangGraph', 'Amazon Bedrock', 'CrewAI', 'PydanticAI', 'C++', 'C++ SDK', 'smolagents', 'Ag2', 'Autogen', 'Couchbase Edge Server', 'Deepseek', 'OpenRouter', 'mastra', 'Looker Studio', 'Google Data Studio', 'Connector', 'Couchbase Columnar', 'TAVs', 'Custom Queries', 'Data API', 'FTS', 'GSI', 'Hugging Face']
+const tags = ['Ottoman', 'Ktor', 'REST API', 'Express', 'Flask', 'TLS', 'Configuration', 'Next.js', 'iOS', 'Xcode', '.NET', 'Xamarin', 'Authentication', 'OpenID', 'Keycloak', 'Android', 'P2P', 'UIKit', 'Installation', 'Spring Boot', 'Spring Data', 'Transactions', 'SQL++ (N1QL)', 'Optimization', 'Community Edition', 'Docker', 'Data Modeling', 'Metadata', 'Best Practices', 'Data Ingestion', 'Kafka', 'Support', 'Customer', 'Prometheus', 'Monitoring', 'Observability', 'Metrics', 'Query Workbench', 'ASP.NET', 'linq', 'DBaaS', 'App Services', 'Flutter', 'Gin Gonic', 'FastAPI', 'Rails', 'Couchbase ORM', 'LangChain', 'OpenAI', 'Streamlit', 'Google Gemini', 'Nvidia NIM', 'LLama3', 'AWS', 'Artificial Intelligence', 'Cohere', 'Jina AI', 'Mistral AI', 'Ragas', 'Haystack', 'LangGraph', 'Amazon Bedrock', 'CrewAI', 'PydanticAI', 'C++', 'C++ SDK', 'smolagents', 'Ag2', 'Autogen', 'Couchbase Edge Server', 'Deepseek', 'OpenRouter', 'mastra', 'Looker Studio', 'Google Data Studio', 'Connector', 'Couchbase Columnar', 'TAVs', 'Custom Queries', 'Data API', 'FTS', 'GSI', 'Hugging Face']
 
 const technologies = ['connectors', 'kv', 'query', 'capella', 'server', 'index', 'mobile', 'fts', 'sync gateway', 'eventing', 'analytics', 'udf', 'vector search', 'react', 'edge-server', 'app-services']
 

tutorial/markdown/java/transactions.md

@@ -158,26 +158,10 @@ spring.couchbase.bucket.password=password
 > **_NOTE:_**  Couchbase Capella clusters are using Transport Security Layer (TLS) cryptographic protocol to secure traffic between the cluster and client applications.
 > For simplicity, we will forego certificate validation step in this tutorial.
 > It is highly recommended to always verify your cluster's certificate on production environments.
-
-<<<<<<< HEAD
-> **_NOTE:_** Couchbase Capepella clusters are using Transport Security Layer (TLS) cryptographic protocol to secure traffic between the cluster and client applications.
-Every Capella cluster comes with its own self-signed TLS certificate.
-This certificate can be used by client applications to verify the identity of the server and prevent attackers from intercepting database traffic. 
-It is highly recommended to always verify your cluster's certificate on production environments.
-Please refer to "Full Example / Couchbase Capella Sample" and "Cloud Connections" sections of [Install and Start Using the Java SDK with Couchbase Server](https://docs.couchbase.com/java-sdk/current/hello-world/start-using-sdk.html#full-example) for information on how to validate cluster certificates.
-
-To connect to Capella, use `couchbases://` connection protocol and add `?tls=no_verify` to the connection string:
-
-```ini
-spring.couchbase.bootstrap-hosts=couchbases://cb.jncm2s9gv4ealbm.cloud.couchbase.com?ssl=no_veriify
-```
-
-Save the file and start the sample application by running the following command in the root folder of the project:
-=======
 > Please refer to "Full Example / Couchbase Capella Sample" and "Cloud Connections" sections of [Install and Start Using the Java SDK with Couchbase Server](https://docs.couchbase.com/java-sdk/current/hello-world/start-using-sdk.html#full-example) for information on how to validate cluster certificates.
 
 
-To confiure Capella connections, use a `ClusterEnvironment` with enabled TLS security:
+To configure Capella connections, use a `ClusterEnvironment` with enabled TLS security:
 
 ```java
     @Bean
@@ -191,7 +175,7 @@ To confiure Capella connections, use a `ClusterEnvironment` with enabled TLS sec
 
     public ClusterEnvironment getClusterEnvironment() {
       ClusterEnvironment.Builder environmentBuilder = ClusterEnvironment.builder();
-      
+
       SecurityConfig.Builder securityConfig = SecurityConfig.enableTls(true)
         .trustManagerFactory(InsecureTrustManagerFactory.INSTANCE);
       environmentBuilder.securityConfig(securityConfig);
@@ -200,15 +184,14 @@ To confiure Capella connections, use a `ClusterEnvironment` with enabled TLS sec
     }
 ```
 
-Another alternative is to use`couchbases://` connection protocol and add `?ssl=no_verify` to the connection string:
+Another alternative is to use `couchbases://` connection protocol and add `?ssl=no_verify` to the connection string:
 ```ini
 spring.couchbase.bootstrap-hosts=couchbases://cb.jnym5s9gv4ealbe.cloud.couchbase.com?ssl=no_verify
 ```
 
-> **_NOTE_**: these Capella connection confguration examples should be used for development purposes only and are not recommended for production.
+> **_NOTE_**: these Capella connection configuration examples should be used for development purposes only and are not recommended for production.
 
 Save your customized configuration and start the sample application by running the following command in the root folder of the project:
->>>>>>> 066839e6fbc8c2f00fa28c21cd9a4472abeb62f1
 
 ```shell
 mvn spring-boot:run