Merge remote-tracking branch 'origin/main' into ossobuffo-main

Author: colinodell

docs/1.6/security.md

@@ -2,6 +2,7 @@
 layout: default
 title: Basic Usage
 description: Basic usage of the CommonMark parser
+redirect_from: /1.6/basic-usage/
 ---
 
 # Basic Usage
@@ -32,7 +33,7 @@ echo $converter->convertToHtml('# Hello World!');
 // <h1>Hello World!</h1>
 ```
 
-Or you can use the generic `MarkdownConverter` class to customize [the environment](/1.6/customization/environment/) with whatever extensions you wish to use:
+Or you can use the generic `MarkdownConverter` class to customize [the environment](/1.x/customization/environment/) with whatever extensions you wish to use:
 
 ```php
 require __DIR__ . '/vendor/autoload.php';
@@ -56,9 +57,9 @@ echo $converter->convertToHtml('**Hello World!**');
 ```
 
 <i class="fa fa-exclamation-triangle"></i>
-**Important:** See the [security](/1.6/security/) section for important details on avoiding security misconfigurations.
+**Important:** See the [security](/1.x/security/) section for important details on avoiding security misconfigurations.
 
-[Additional customization](/1.6/customization/overview/) is also possible, and we have many handy [extensions](/1.6/extensions/overview/) to enable additional syntax and features.
+[Additional customization](/1.x/customization/overview/) is also possible, and we have many handy [extensions](/1.x/extensions/overview/) to enable additional syntax and features.
 
 ## Supported Character Encodings
 

docs/1.6/basic-usage.md renamed to docs/1.x/basic-usage.md

@@ -2,6 +2,7 @@
 layout: default
 title: Changelog
 description: Important changes made in recent releases
+redirect_from: /1.6/changelog/
 ---
 
 # Changelog

docs/1.6/changelog.md renamed to docs/1.x/changelog.md

@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Command Line
-redirect_from: /command-line/
+redirect_from: /1.6/command-line/
 ---
 
 # Command Line

docs/1.6/command-line.md renamed to docs/1.x/command-line.md

@@ -1,6 +1,7 @@
 ---
 layout: default
 title: Configuration
+redirect_from: /1.6/configuration/
 ---
 
 # Configuration
@@ -40,7 +41,7 @@ $converter = new CommonMarkConverter($config);
 $converter = new GithubFlavoredMarkdownConverter($config);
 ```
 
-Otherwise, if you're using `MarkdownConverter` to customize the extensions in your parser, pass the configuration into the [Environment](/1.6/customization/environment/)'s `mergeConfig()` method instead:
+Otherwise, if you're using `MarkdownConverter` to customize the extensions in your parser, pass the configuration into the [Environment](/1.x/customization/environment/)'s `mergeConfig()` method instead:
 
 ```php
 use League\CommonMark\Environment;
@@ -78,7 +79,7 @@ Here's a list of currently-supported options:
 - `allow_unsafe_links` - Remove risky link and image URLs by setting this to `false` (default: `true`)
 - `max_nesting_level` - The maximum nesting level for blocks (default: `PHP_INT_MAX`). Setting this to a positive integer can help protect against long parse times and/or segfaults if blocks are too deeply-nested. Added in 0.17.
 
-Additional configuration options are available for some of the [available extensions](/1.6/customization/extensions/) - refer to their individual documentation for more details.
+Additional configuration options are available for some of the [available extensions](/1.x/customization/extensions/) - refer to their individual documentation for more details.
 
 ## Environment
 
@@ -89,4 +90,4 @@ The `Environment` also exposes two methods for managing the configuration:
 - `mergeConfig(array $config)` - Recursively merge the current configuration with the given options
 - `getConfig(string $key, $default = null)` - Returns the config value. For nested configs, use a `/`-separate path; for example: `renderer/soft_break`
 
-[Learn more about customizing the Environment](/1.6/customization/environment/)
+[Learn more about customizing the Environment](/1.x/customization/environment/)

docs/1.6/configuration.md renamed to docs/1.x/configuration.md

@@ -2,6 +2,7 @@
 layout: default
 title: Abstract Syntax Tree
 description: Using the Abstract Syntax Tree (AST) to manipulate the parsed content
+redirect_from: /1.6/customization/abstract-syntax-tree/
 ---
 
 # Abstract Syntax Tree
@@ -13,7 +14,7 @@ This library uses a doubly-linked list Abstract Syntax Tree (AST) to represent t
 The root node of the AST will always be a `Document` object.  You can obtain this node a few different ways:
 
 - By calling the `parse()` method on the `DocParser`
-- By calling the `getDocument()` method on either the `DocumentPreParsedEvent` or `DocumentParsedEvent` (see the [Event Dispatcher documentation](/1.6/customization/event-dispatcher/))
+- By calling the `getDocument()` method on either the `DocumentPreParsedEvent` or `DocumentParsedEvent` (see the [Event Dispatcher documentation](/1.x/customization/event-dispatcher/))
 
 ## Traversal
 
@@ -57,4 +58,4 @@ The following methods can be used to modify the AST:
 
 ## `DocumentParsedEvent`
 
-The best way to access and manipulate the AST is by adding an [event listener](/1.6/customization/event-dispatcher/) for the `DocumentParsedEvent`.
+The best way to access and manipulate the AST is by adding an [event listener](/1.x/customization/event-dispatcher/) for the `DocumentParsedEvent`.

docs/1.6/customization/abstract-syntax-tree.md renamed to docs/1.x/customization/abstract-syntax-tree.md

@@ -2,6 +2,7 @@
 layout: default
 title: Block Parsing
 description: How to parse block-level elements
+redirect_from: /1.6/customization/block-parsing/
 ---
 
 # Block Parsing
@@ -19,11 +20,11 @@ When parsing a new line, the `DocParser` iterates through all registered block p
 ### Parameters
 
 - `ContextInterface $context` - Provides information about the current context of the DocParser. Includes access to things like the document, current block container, and more.
-- `Cursor $cursor` - The [`Cursor`](/1.6/customization/cursor/) encapsulates the current state of the line being parsed and provides helpers for looking around the current position.
+- `Cursor $cursor` - The [`Cursor`](/1.x/customization/cursor/) encapsulates the current state of the line being parsed and provides helpers for looking around the current position.
 
 ### Return value
 
-`parse()` should return `false` if it's unable to handle the current line for any reason.  (The [`Cursor`](/1.6/customization/cursor/) state should be restored before returning false if modified). Other parsers will then have a chance to try parsing the line.  If all registered parsers return false, the line will be parsed as text.
+`parse()` should return `false` if it's unable to handle the current line for any reason.  (The [`Cursor`](/1.x/customization/cursor/) state should be restored before returning false if modified). Other parsers will then have a chance to try parsing the line.  If all registered parsers return false, the line will be parsed as text.
 
 Returning `true` tells the engine that you've successfully parsed the block at the given position.  It is your responsibility to:
 

docs/1.6/customization/block-parsing.md renamed to docs/1.x/customization/block-parsing.md

@@ -2,6 +2,7 @@
 layout: default
 title: Block Rendering
 description: How to customize the rendering of block-level elements
+redirect_from: /1.6/customization/block-rendering/
 ---
 
 # Block Rendering

docs/1.6/customization/block-rendering.md renamed to docs/1.x/customization/block-rendering.md

@@ -2,6 +2,7 @@
 layout: default
 title: Cursor
 description: Using the Cursor object to parse Markdown content
+redirect_from: /1.6/customization/cursor/
 ---
 
 # Cursor
@@ -22,7 +23,7 @@ use League\CommonMark\Cursor;
 $cursor = new Cursor('Hello World!');
 ```
 
-Or, if you're creating a custom [block parser](/1.6/customization/block-parsing/) or [inline parser](/1.6/customization/inline-parsing/), a pre-configured `Cursor` will be provided to you with (with the `Cursor` already set to the current `position` trying to be parsed).
+Or, if you're creating a custom [block parser](/1.x/customization/block-parsing/) or [inline parser](/1.x/customization/inline-parsing/), a pre-configured `Cursor` will be provided to you with (with the `Cursor` already set to the current `position` trying to be parsed).
 
 ## Methods
 

docs/1.6/customization/cursor.md renamed to docs/1.x/customization/cursor.md

@@ -2,6 +2,7 @@
 layout: default
 title: Delimiter Processing
 description: Processing CommonMark delimiter runs with a custom processor
+redirect_from: /1.6/customization/delimiter-processing/
 ---
 
 # Delimiter Processing
@@ -17,11 +18,11 @@ Delimiter runs are a special type of inline:
 This is an example of **emphasis**. Note how the text is *wrapped* with the same character(s) before and after.
 ```
 
-When implementing something with these characteristics you should consider leveraging delimiter runs; otherwise, a basic [inline parser](/1.6/inline-parsing/) should be sufficient.
+When implementing something with these characteristics you should consider leveraging delimiter runs; otherwise, a basic [inline parser](/1.x/customization/inline-parsing/) should be sufficient.
 
 ## Delimiter Priority
 
-Delimiter processors have a lower priority than inline parsers - if an [inline parser](/1.6/inline-parsing/) successfully handles the same special character you're interested in then your delimiter processor will not be called.
+Delimiter processors have a lower priority than inline parsers - if an [inline parser](/1.x/customization/inline-parsing/) successfully handles the same special character you're interested in then your delimiter processor will not be called.
 
 ## Implementing Standalone Delimiter Processors
 
@@ -75,7 +76,7 @@ Note that `$opener` and `$closer` will be automatically removed for you after th
 
 ## Combining Inline Parsers with Delimiter Processors
 
-Basic delimiter processors, as covered above, do not require any custom inline parsers - they'll "just work".  But in some rare cases you may want to pair it with a custom [inline parser](/1.6/customization/inline-parsing/): the inline parser will identify the delimiter, adding an entry to the delimiter stack for the processor to process later.  Note that this is an advanced use case and you probably don't need this.  But if you do then read on.
+Basic delimiter processors, as covered above, do not require any custom inline parsers - they'll "just work".  But in some rare cases you may want to pair it with a custom [inline parser](/1.x/customization/inline-parsing/): the inline parser will identify the delimiter, adding an entry to the delimiter stack for the processor to process later.  Note that this is an advanced use case and you probably don't need this.  But if you do then read on.
 
 ### Inline Parsers and the Delimiter Stack