Skip to content

Commit 1214329

Browse files
committed
feat(queues): rebase to feature branch
1 parent bc5b43a commit 1214329

File tree

3 files changed

+67
-27
lines changed

3 files changed

+67
-27
lines changed

menu/navigation.json

Lines changed: 66 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4147,11 +4147,7 @@
41474147
"items": [
41484148
{
41494149
"label": "Overview",
4150-
<<<<<<< HEAD
41514150
"slug": "../nats"
4152-
=======
4153-
"slug": "../queues"
4154-
>>>>>>> 9860710e2 (feat(queues): add queues doc)
41554151
},
41564152
{
41574153
"label": "Concepts",
@@ -4168,15 +4164,11 @@
41684164
{
41694165
"items": [
41704166
{
4171-
<<<<<<< HEAD
41724167
"label": "Create a NATS account",
41734168
"slug": "create-account"
41744169
},
41754170
{
41764171
"label": "Create NATS credentials",
4177-
=======
4178-
"label": "Create credentials",
4179-
>>>>>>> 9860710e2 (feat(queues): add queues doc)
41804172
"slug": "create-credentials"
41814173
},
41824174
{
@@ -4188,13 +4180,8 @@
41884180
"slug": "monitor-nats-cockpit"
41894181
},
41904182
{
4191-
<<<<<<< HEAD
41924183
"label": "Delete a NATS account",
41934184
"slug": "delete-account"
4194-
=======
4195-
"label": "Monitor Queues with Cockpit",
4196-
"slug": "monitor-queues-cockpit"
4197-
>>>>>>> 9860710e2 (feat(queues): add queues doc)
41984185
}
41994186
],
42004187
"label": "How to",
@@ -4203,14 +4190,78 @@
42034190
{
42044191
"items": [
42054192
{
4206-
<<<<<<< HEAD
42074193
"label": "NATS API Reference",
42084194
"slug": "https://www.scaleway.com/en/developers/api/messaging-and-queuing/nats-api/"
42094195
},
42104196
{
42114197
"label": "Using the NATS CLI",
42124198
"slug": "nats-cli"
4213-
=======
4199+
}
4200+
],
4201+
"label": "API/CLI",
4202+
"slug": "api-cli"
4203+
},
4204+
{
4205+
"items": [
4206+
{
4207+
"label": "NATS overview",
4208+
"slug": "nats-overview"
4209+
},
4210+
{
4211+
"label": "Limitations",
4212+
"slug": "limitations"
4213+
}
4214+
],
4215+
"label": "Additional Content",
4216+
"slug": "reference-content"
4217+
}
4218+
],
4219+
"label": "NATS",
4220+
"slug": "nats"
4221+
},
4222+
{
4223+
"items": [
4224+
{
4225+
"label": "Overview",
4226+
"slug": "../queues"
4227+
},
4228+
{
4229+
"label": "Concepts",
4230+
"slug": "concepts"
4231+
},
4232+
{
4233+
"label": "Quickstart",
4234+
"slug": "quickstart"
4235+
},
4236+
{
4237+
"label": "FAQ",
4238+
"slug": "faq"
4239+
},
4240+
{
4241+
"items": [
4242+
{
4243+
"label": "Create credentials",
4244+
"slug": "create-credentials"
4245+
},
4246+
{
4247+
"label": "Manage credentials",
4248+
"slug": "manage-credentials"
4249+
},
4250+
{
4251+
"label": "Create and manage queues",
4252+
"slug": "create-manage-queues"
4253+
},
4254+
{
4255+
"label": "Monitor Queues with Cockpit",
4256+
"slug": "monitor-queues-cockpit"
4257+
}
4258+
],
4259+
"label": "How to",
4260+
"slug": "how-to"
4261+
},
4262+
{
4263+
"items": [
4264+
{
42144265
"label": "Queues API Reference",
42154266
"slug": "https://www.scaleway.com/en/developers/api/messaging-and-queuing/sqs-api/"
42164267
},
@@ -4225,7 +4276,6 @@
42254276
{
42264277
"label": "Using Go, Python or Node.js with Queues",
42274278
"slug": "python-node-queues"
4228-
>>>>>>> 9860710e2 (feat(queues): add queues doc)
42294279
}
42304280
],
42314281
"label": "API/CLI",
@@ -4234,17 +4284,12 @@
42344284
{
42354285
"items": [
42364286
{
4237-
<<<<<<< HEAD
4238-
"label": "NATS overview",
4239-
"slug": "nats-overview"
4240-
=======
42414287
"label": "Queues overview",
42424288
"slug": "queues-overview"
42434289
},
42444290
{
42454291
"label": "Queues - supported actions",
42464292
"slug": "queues-support"
4247-
>>>>>>> 9860710e2 (feat(queues): add queues doc)
42484293
},
42494294
{
42504295
"label": "Limitations",
@@ -4255,13 +4300,8 @@
42554300
"slug": "reference-content"
42564301
}
42574302
],
4258-
<<<<<<< HEAD
4259-
"label": "NATS",
4260-
"slug": "nats"
4261-
=======
42624303
"label": "Queues",
42634304
"slug": "queues"
4264-
>>>>>>> 9860710e2 (feat(queues): add queues doc)
42654305
},
42664306
{
42674307
"items": [

pages/queues/concepts.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The message retention period is a setting that can be configured for a queue. It
4545

4646
## Messaging and Queuing
4747

48-
Previously, Scaleway Messaging and Queuing was a single product that grouped together three different messaging protocols. It has now been split into three distinct products: [NATS](#nats), [Queues](#queues), and [Topics and Events](#topics-and-events).
48+
Previously, Scaleway Messaging and Queuing was a single product that grouped together three different messaging protocols. It has now been split into three distinct products: [NATS](/nats/), [Queues](#queues), and [Topics and Events](/topics-and-events/).
4949

5050
## Queue
5151

File renamed without changes.

0 commit comments

Comments
 (0)