diff --git a/docs/writing-docs/docs-blocks.md b/docs/writing-docs/docs-blocks.md
new file mode 100644
index 00000000000..0419171916a
--- /dev/null
+++ b/docs/writing-docs/docs-blocks.md
@@ -0,0 +1,370 @@
+---
+title: 'Doc Blocks'
+---
+
+Doc Blocks are the building blocks of Storybook documentation pages. By default, [DocsPage](./docs-page) uses a combination of the below blocks to build a page for each of your components automatically.
+
+
+TODO: ask tom about both links below to where they should point to.
+
+
+Also, custom [addons] can provide their own doc blocks, and there are [many available].
+
+### ArgsTable
+
+Storybook Docs automatically generates component props tables for components in supported frameworks. These tables list the [args](../writing-stories/args) of the component, and even integrate with [controls](../essentials/controls) to allow you to change the args of the currently rendered story.
+
+
+TODO:add image per screenshot requirements (Use the same gif present in the SB 6.0 doc)
+
+
+#### DocsPage
+
+To use the ArgsTable in [DocsPage](./docspage#component-parameter), export a component property on your stories metadata:
+
+```js
+// MyComponent.stories.js
+
+import { MyComponent } from './MyComponent';
+
+export default {
+ title: 'MyComponent',
+ component: MyComponent,
+};
+// your templates and stories
+```
+
+#### MDX
+
+To use the props table in MDX, use the Props block:
+
+```js
+// MyComponent.stories.mdx
+
+import { Props } from '@storybook/addon-docs/blocks';
+import { MyComponent } from './MyComponent';
+
+# My Component!
+
+
+```
+
+#### Customizing
+
+Props tables are automatically inferred from your components and stories, but sometimes it's useful to customize the results.
+
+
+TODO: ask tom if links are accurate
+
+
+Props tables are rendered from an internal data structure called [ArgTypes](../api/stories#argtypes). When you declare a story's component metadata, Docs automatically extracts ArgTypes based on the component's properties.
+
+You can customize what's shown in the props table by customizing the ArgTypes data. This is currently available for [DocsPage](locate-docs-page) and `` construct, but not for the `` construct.
+
+> NOTE: This API is experimental and may change outside of the typical semver release cycle
+
+The API documentation of ArgTypes is detailed in a [separate section](../api/stories#argtypes), but to control the description and default values, use the following fields:
+
+| Field | Description |
+|:-----------------------------|:----------------------------------------------------------------------------------------------:|
+| **name** |The name of the property |
+| **type.required** |The stories to be show, ordered by supplied name |
+| **description** |A markdown description for the property |
+|**table.type.summary** |A short version of the type |
+|**table.type.detail** |A short version of the type |
+|**table.defaultValue.summary**|A short version of the type |
+|**table.defaultValue.detail** |A short version of the type |
+|**control** |See [addon-controls README ](https://github.com/storybookjs/storybook/tree/next/addons/controls)|
+
+For instance:
+
+```js
+
+export default {
+ title: 'Button',
+ component: Button,
+ argTypes: {
+ label: {
+ description: 'overwritten description',
+ table: {
+ type: {
+ summary: 'something short',
+ detail: 'something really really long'
+ },
+ },
+ control: {
+ type: null,
+ },
+ },
+ },
+};
+```
+
+This would render a row with a modified description, a type display with a dropdown that shows the detail, and no control.
+
+
+TODO: ask tom about this and how we can improve.
+
+My read on this is that we come from null that shows no control. But we have some shorthands that help the reader to show something.
+
+Probably we could add this as a aside, or give it more emphasis
+
+
+> Storybook provides shorthand for common tasks:
+> type: 'number' is shorthand for type: { name: 'number' }
+> control: 'radio' is shorthand for control: { type: 'radio' }
+
+##### MDX
+
+To customize argTypes in MDX, you can set an `mdx` prop on the `Meta` or `Story` components:
+
+```js
+
+
+
+
+ {/* story contents */}
+
+```
+
+#### Controls
+
+The controls inside a props table are configured in exactly the same way as the [controls](../essentials/controls) addon pane. In fact you’ll probably notice the table is very similar! It uses the same component and mechanism behind the scenes.
+
+### Source
+
+Storybook Docs displays a story’s source code using the `Source` block. The snippet has built-in syntax highlighting and can be copied with the click of a button.
+
+
+TODO:add image per screenshot requirements (mention of a image in the SB 6.0 doc (needs to be vetted))
+
+
+#### DocsPage
+
+In DocsPage, the `Source` block appears automatically within each story’s [Preview] block.
+
+
+TODO:add image per screenshot requirements (mention of a image in the SB 6.0 doc (needs to be vetted))
+
+
+To customize the source snippet that’s displayed for a story, set the `docs.source.code` parameter:
+
+```js
+
+export const CustomSource = () => Template.bind({});
+
+CustomSource.parameters = {
+ docs: {
+ source: {
+ code: 'Some custom string here';
+ }
+ },
+};
+```
+
+#### MDX
+
+You can also use the `Source` block in MDX. It accepts either a story ID or `code` snippet the `language` for syntax highlighting:
+
+```js
+import { Source } from '@storybook/addon-docs/blocks';
+Import dedent from 'ts-dedent';
+
+
+```
+
+#### ⚒️ Description
+
+Storybook Docs shows a component’s description extracted from the source code or based on a user-provided string.
+
+
+TODO:add image per screenshot requirements (mention of a image in the SB 6.0 doc (needs to be vetted))
+
+
+#### DocsPage
+
+
+TODO: left it for now ask feedback tom/shillman on this based on [pr](https://github.com/storybookjs/storybook/issues/11441)
+
+
+In DocsPage, a component’s description is shown at the top of the page. For [supported frameworks], the component description is automatically extracted from a docgen component above the component in its source code. It can also be set by the `docs.description` parameter.
+
+
+TODO:add image per screenshot requirements (mention of a image in the SB 6.0 doc (needs to be vetted))
+
+
+```js
+
+export default {
+ title: 'CustomDescription'
+ parameters: {
+ docs: {
+ description: {
+ component: 'some component _markdown_'
+ }
+ },
+ }
+};
+
+export const WithStoryDescription = Template.bind({});
+WithStoryDescription.parameters = {
+ docs: {
+ description: {
+ story: 'some story **markdown**'
+ }
+ },
+};
+```
+
+#### MDX
+
+In MDX, the `Description` shows the component’s description using the same heuristics as the DocsPage. It also accepts a markdown parameter to show any user-provided Markdown string.
+
+```js
+
+import { Description } from '@storybook/addon-docs/blocks';
+import dedent from 'ts-dedent';
+import { Button } from './Button';
+
+
+
+```
+
+### Story
+
+Stories (component examples) are the basic building blocks in Storybook. In Storybook Docs, stories are rendered in the `Story` block.
+
+#### DocsPage
+
+In DocsPage a `Story` block is generated for each story in your [CSF] file, wrapped with a `Preview` wrapper that gives it a toolbar on top (in the case of the first “primary” story) and a source code preview underneath.
+
+#### MDX
+
+TODO: ask tom about Preview link for clarity.
+
+
+In MDX, the `Story` block is not only a way of displaying stories, but also the primary way to define them. Storybook looks for `Story` instances with the `name` prop, either defined at the top level of the document, or directly beneath a [Preview](locate-preview) block defined at the top level:
+
+```js
+import { Story } from '@storybook/addon-docs/blocks';
+import { Button } from './Button';
+
+export const Template = (args) => ;
+
+
+ {Template.bind({})
+
+```
+
+You can also reference existing stories in Storybook by ID:
+
+```js
+
+import { Story } from '@storybook/addon-docs/blocks';
+
+
+```
+
+#### Inline rendering
+
+
+TODO: ask tom/michael about the preview iframe. as we've been calling it canvas so far and now move to preview.
+And also inline rendering support location
+
+
+In Storybook’s Canvas, all stories are rendered in the [Preview iframe] for isolated development. In Storybook Docs, when [inline rendering is supported by your framework](locate-link), inline rendering is used by default for performance and convenience. However, you can force iframe rendering with `docs: { inlineStories: false }` parameter, or `inline={false}` in MDX.
+
+
+### Preview
+
+
+TODO: ask tom about Source link for clarity, as me i know that the source shows ad hoc the story file content. But another reader might not know.
+
+
+
+Storybook Docs’ `Preview` block is a wrapper that provides a toolbar for interacting with its contents, and also also provides [Source](locate-source) snippets automatically.
+
+
+TODO:add image per screenshot requirements (mention of a image in the SB 6.0 doc (needs to be vetted))
+
+
+#### DocsPage
+
+In DocsPage, every story is wrapped in a `Preview` block. The first story on the page is called the _primary_, and it has a toolbar. The other stories are also wrapped with `Previews`, but there is no toolbar by default.
+
+
+TODO:add image per screenshot requirements (mention of a image in the SB 6.0 doc (needs to be vetted))
+
+
+#### MDX
+
+In MDX, `Preview` is more flexible: in addition to the DocsPage behavior, it can show multiple stories in one, and even show non-story content.
+
+When you
+
+```js
+import { Preview } from '@storybook/addon-docs/blocks';
+
+export const Template = (args) =>
+
+
+
+ {Template.bind({})}
+
+
+ {Template.bind({})}
+
+
+ {Template.bind({})}
+
+
+```
+
+
+TODO:add image per screenshot requirements (mention of a image in the SB 6.0 doc (needs to be vetted))
+
+
+You can also place non-story content inside a `Preview` block:
+
+```js
+import { Preview } from '@storybook/addon-docs/blocks';
+import { MyComponent } from './MyComponent';
+
+
Some here
+
+
+```
+
+TODO: ask tom about Source link for clarity, as me i know that the source shows ad hoc the story file content. But another reader might not know.
+
+
+This renders the JSX content exactly as it would if you’d placed it directly in the MDX, but it also inserts the source snippet in a [Source](locate-source) block beneath the block.
+
+
+TODO:add image per screenshot requirements (mention of a image in the SB 6.0 doc (needs to be vetted))
+
\ No newline at end of file
diff --git a/docs/writing-docs/docs-page.md b/docs/writing-docs/docs-page.md
new file mode 100644
index 00000000000..b1ceb7bac2b
--- /dev/null
+++ b/docs/writing-docs/docs-page.md
@@ -0,0 +1,190 @@
+---
+title: 'DocsPage'
+---
+
+When you install [Storybook Docs](https://github.com/storybookjs/storybook/blob/next/addons/docs/README.md), DocsPage is the zero-config default documentation that all stories get out of the box. It aggregates your stories, text descriptions, docgen comments, props tables, and code examples into a single page for each component.
+
+The best practice for docs is for each component to have its own set of documentation and stories.
+
+### Component parameter
+
+Storybook uses the `component` key in the story file’s default export to extract the component's description and props.
+
+```js
+// Button.stories.js
+import { Button } from './Button';
+
+export default {
+ title: 'Storybook Examples/Button',
+ component: Button,
+};
+```
+
+### Subcomponents parameter
+
+Sometimes it's useful to document multiple components together. For example, a component library’s List and ListItem components might not make sense without one another.
+
+DocsPage has the concept of a "primary" component that is defined by the `component` parameter. It also accepts one or more `subcomponents`.
+
+
+```js
+// List.stories.js
+import { List, ListHeading, ListItem } from './List';
+
+export default {
+ title: 'Path/to/List',
+ component: List,
+ subcomponents: { ListHeading, ListItem },
+};
+```
+
+
+TODO: add image per screenshot requirements (Image of subcomponents)
+
+
+Subcomponent prop tables will show up in a tabbed interface along with the primary component. The tab titles will correspond to the keys of the subcomponents object.
+
+If you want to organize your documentation differently for component groups, we recommend using MDX. It gives you complete control over display and supports any configuration.
+
+
+### Replacing DocsPage
+
+Replace DocsPage template with your own for the entire Storybook, a specific component, or a specific story.
+
+Override the `docs.page` [parameter](../writing-stories/parameters):
+
+- With null to remove docs.
+- With MDX docs.
+- With a custom component
+
+#### Story-level
+
+Override the `docs.page` [parameter](../writing-stories/parameters#story-parameters) in the story definition.
+
+```js
+// Button.stories.js
+
+export const Primary = ButtonStory.bind({});
+Primary.parameters = { docs: { page: null } }
+```
+
+#### Component-level
+
+Override the `docs.page` [parameter](../writing-stories/parameters#component-parameters) in the default export of the story file.
+
+```js
+// Button.stories.js
+
+import { Button } from './Button';
+export default {
+ title: 'Storybook Examples/Button',
+ component: Button,
+ parameters: {
+ docs: {
+ page: null
+ }
+ },
+};
+```
+
+#### Global-level
+
+Override the `docs.page` [parameter](../writing-stories/parameters#global-parameters) in [`.storybook/preview.js`](../configure/overview#configure-story-rendering).
+
+```js
+// .storybook/preview.js
+
+export const parameters { docs: { page: null } });
+```
+
+### Remixing DocsPage using doc blocks
+
+Doc blocks are the basic building blocks of Storybook Docs. DocsPage composes them to provide a reasonable UI documentation experience out of the box.
+
+If you want to make minor customizations to the default DocsPage but don’t want to write your own MDX you can remix DocsPage. That allows you to reorder, add, or omit doc blocks without losing Storybook’s automatic docgen capabilities.
+
+Here's an example of rebuilding DocsPage for the Button component using doc blocks:
+
+```js
+// Button.stories.js
+
+import React from 'react';
+
+import {
+ Title,
+ Subtitle,
+ Description,
+ Primary,
+ Props,
+ Stories,
+} from '@storybook/addon-docs/blocks';
+
+import { Button } from './Button';
+
+export default {
+ title: 'Components/Button',
+ component: Button,
+ parameters: {
+ docs: {
+ page: () => (
+ <>
+
+
+
+
+
+
+
+ ),
+ },
+ },
+};
+```
+
+Apply a similar technique to remix the DocsPage at the [story](#story-level), [component](#component-level), or [global](#global-level) level.
+
+In addition, you can interleave your own components to customize the auto-generated contents of the page, or pass in different options to the blocks to customize their appearance. Read more about [Doc Blocks](./docs-blocks).
+
+### Story file names
+
+TODO ask tom/dom for a read on this. I went a bit of restructuring so that this page aligns with the mdx one in terms of wording/flow.
+
+
+Unless you use a custom [webpack configuration](../configure/integration#extending-storybooks-webpack-config), all of your story files should have the suffix `*.stories.@(j|t)sx?`, e.g. "Badge.stories.js", "Badge.stories.tsx", etc. This tells Storybook and its docs preset to display the docs based on the file contents.
+
+### Inline stories vs. Iframe stories
+
+DocsPage displays all the stories of a component in one page. You have the option of rendering those stories inline or in an iframe.
+
+By default, we render React and Vue stories inline. Stories from other supported frameworks will render in an `