fix

docs/platform/concepts/vpc-peering.md

@@ -5,7 +5,7 @@ sidebar_label: VPC peering
 
 VPC peering supported on the Aiven Platform improves network connectivity and security. It simplifies architecture, helps reduce network latency, and enhances resource sharing while maintaining isolation and control.
 
-[VPC]((/doc/platform/concepts/vpcs)) peering is a networking connection between two VPCs.
+[VPC](/doc/platform/concepts/vpcs) peering is a networking connection between two VPCs.
 It allows private and direct communication between the VPCs with no traffic routing over
 the public internet.
 

docs/platform/concepts/vpcs.md

@@ -12,48 +12,20 @@ you define and control to deploy and manage resources.
 ### VPC characteristics
 
 - Isolation: Each VPC operates independently from other VPCs, ensuring secure separation.
-<<<<<<< HEAD
-- Customizable IP Range: You can define your own IP address range (CIDR block).
-- Subnets: Divide the VPC into smaller sub-networks (subnets) for organizing resources
-  based on availability zones or functional groups.
-- Network Control: Configure route tables, network gateways, and security settings.
-- Internet Connectivity: Control whether the VPC connects to the internet via Internet
-  Gateways or remains isolated.
-- Security: Strong control over network traffic and isolation.
-=======
 - Security: Control over network traffic and isolation.
 - Internet connectivity: Control whether the VPC connects to the internet via internet
   gateways or remains isolated.
 - Network control: Configure route tables, network gateways, and security settings.
 - Customizable IP range: You can define your own IP address range (CIDR block).
 - Subnets: Divide the VPC into smaller sub-networks (subnets) for organizing resources
   based on availability zones or functional groups.
->>>>>>> 80afa7a0 (vpc description draft)
 - Flexibility: Custom network architecture tailored to your application's needs.
 - Scalability: Expand or modify the network as demand grows.
 
 ### VPC components
 
-<<<<<<< HEAD
-- Subnets: Smaller networks within the VPC. They can be public or private.
-- Route Tables: Define how network traffic is directed within the VPC.
-- Internet Gateway (IGW): Allows public traffic to access the internet.
-- NAT Gateway (Network Address Translation): Enables outbound internet access for private
-  subnets.
-- Security Groups: Firewall rules to control inbound and outbound traffic for resources.
-- Network Access Control Lists (NACLs): Additional layer of security at the subnet level.
-- Peering Connections: Connect VPCs together for intercommunication.
-
-### VPC use cases
-
-- Hosting Applications: Deploying scalable web and database applications.
-- Hybrid Cloud Architecture: Connecting on-premises networks to the cloud securely.
-- Data Isolation: Keeping sensitive data within a private network.
-- Multi-tier Architecture: Separating application layers (web, app, database) within
-- distinct subnets.
-=======
 - Subnets: Represent smaller public or private networks within the VPC.
-- [Peering connection]((/doc/platform/concepts/vpc-peering)): Connect VPCs for
+- [Peering connection](/doc/platform/concepts/vpc-peering): Connect VPCs for
   intercommunication.
 - NAT (Network Address Translation) gateway: Allows outbound internet access for private
   subnets.
@@ -71,7 +43,6 @@ you define and control to deploy and manage resources.
 - Multi-tier architecture: Separating application layers (web, app, database) within
   distinct subnets
 - Hybrid cloud architecture: Connecting on-premises networks to the cloud securely
->>>>>>> 80afa7a0 (vpc description draft)
 
 ## VPC types
 

docs/platform/howto/vpc-peering-gcp.md

@@ -2,7 +2,7 @@
 title: Set up VPC peering on GCP
 ---
 
-Once you've created a [VPC on the Aiven platform](manage-vpc-peering), you can set up VPC peering on GCP.
+Once you've created a [VPC on the Aiven platform](manage-project-vpc), you can set up VPC peering on GCP.
 
 ## Set up a VPC peering connection {#set-up-vcp-peering}
 

docs/platform/howto/vpc-peering-upcloud.md

@@ -40,7 +40,7 @@ type networks.
 ## Prerequisites
 <!-- vale off -->
 -   You have
-    [created a VPC for your Aiven project](manage-vpc-peering) in the
+    [created a VPC for your Aiven project](/docs/platform/howto/manage-project-vpc) in the
     [Aiven Console](https://console.aiven.io/).
 -   The CIDR ranges of the networks you want to peer do not overlap.
 <!-- vale on -->

sidebars.ts

@@ -257,7 +257,7 @@ const sidebars: SidebarsConfig = {
               },
               items: [
                 'platform/concepts/vpc-peering',
-                'platform/howto/manage-vpc-peering',
+                'platform/howto/manage-project-vpc',
                 'platform/howto/public-access-in-vpc',
                 'platform/howto/vpc-peering-gcp',
                 'platform/howto/vpc-peering-aws',