From dd3c7ebd765e763b4cfdc2a08bf99201444aefbc Mon Sep 17 00:00:00 2001 From: Justin W. Flory Date: Oct 28 2016 09:05:36 +0000 Subject: [PATCH 1/14] Add documentation for using Markdown in Pagure --- diff --git a/doc/usage/markdown.md b/doc/usage/markdown.md new file mode 100644 index 0000000..7bc4f35 --- /dev/null +++ b/doc/usage/markdown.md @@ -0,0 +1,201 @@ +Using Markdown in Pagure +======================== +Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) +as the base for formatting comments in issues, pull requests, and in +Markdown files in repositories. For basic formatting, Pagure follows +common Markdown formatting, but it also has some unique syntax for more +advanced formatting. This help page helps demonstrate how to use Markdown +in Pagure. + +  + +## Headers + +To create headings, you will use the `#` symbol before the text. The +number of hashes before the text determines the header size. + +
# header1
+## header2
+### header3
+ +
+ +# header 1 + +## header2 + +### header3 + +
+ +  + +## Styling + +You can mark up text with bold, italics, or strikethrough. + +* **Style**: Bold + * Syntax: `** **` or `__ __` + * Example: `**This is bold text**` + * Output: **This is bold text** +* **Style**: Italics + * Syntax: `* *` or `_ _` + * Example: `_This is italicized text_` + * Output: _This is italicized text_ +* **Style**: Strikethrough + * Syntax: `~~ ~~` + * Example: `~~This text is no longer relevant~~` + * Output: ~~This text is no longer relevant~~ +* **Style**: Bold and italics + * Syntax: `** **` and `_ _` + * Example: `**This text is the _most important thing ever_**` + * Output: **This text is the _most important thing ever_** + +  + +## Quoting + +You can show text as being quoted with the `>` character. + +
Before merging this pull request, remember Clark Kent mentioned this:
+> Double-check there's no reference to the Kryptonite library in the
+> program since we removed that a few versions ago.
+ +  + +Before merging this pull request, remember Clark Kent mentioned this: +> Double-check there's no reference to the Kryptonite library in the +> program since we removed that a few versions ago. + +  + +## Code + +You can highlight parts of a line as code or create entire code blocks in +your Markdown documents. Text inside of backticks will not be formatted. + +
When running the program for the first time, use `superman --initialize`.
+ +When running the program for the first time, use `superman --initialize`. + +  + +To format multiple lines of code into its own block, you will need to use +raw HTML with the ‹pre›‹/pre› tags. + +
Install the needed system libraries:
+‹pre›
+sudo dnf install git python-virtualenv libgit2-devel \
+                 libjpeg-devel gcc libffi-devel redhat-rpm-config
+‹pre›
+ +  + +Install the needed system libraries: +
+sudo dnf install git python-virtualenv libgit2-devel \
+                 libjpeg-devel gcc libffi-devel redhat-rpm-config
+
+ +  + +## Hyperlinks + +Need to embed a link to somewhere else? No problem! You can create an in- +line link by wrapping the text in `[ ]` and appending the the URL in +parentheses `( )` immediately after. + +`Pagure is used by the [Fedora Project](https://fedoraproject.org).` + +Pagure is used by the [Fedora Project](https://fedoraproject.org). + +  + +## Lists + +You can make unordered lists spanning multiple lines with either `-` or +`*`. + +
* Superman
+* Batman
+    * Protector of Gotham City!
+* Superwoman
+* Harley Quinn
+    * Something on this list is unlike the others...
+ +* Superman +* Batman + * Protector of Gotham City! +* Superwoman +* Harley Quinn + * Something on this list is unlike the others... + +  + +You can make ordered lists by preceding each line with a number. + +
1. Superman
+2. Batman
+    1. Protector of Gotham City!
+    2. He drives the Batmobile!
+3. Superwoman
+4. Harley Quinn
+    1. Something on this list is unlike the others...
+    2. Somebody evil lurks on this list!
+ +1. Superman +2. Batman + 1. Protector of Gotham City! + 2. He drives the Batmobile! +3. Superwoman +4. Harley Quinn + 1. Something on this list is unlike the others... + 2. Somebody evil lurks on this list! + +  + +## Tagging users + +You can tag other users on Pagure to send them a notification about an +issue or pull request. To tag a user, use the `@` symbol followed by their +username. Typing the `@` symbol in a comment will bring up a list of users +that match the username. The list searches as you type. Once you see the +name of the person you are looking for, you can click their name to +automatically complete the tag. + +`@jflory7, could you please review this pull request and leave feedback?` + +[@jflory7](https://pagure.io/user/jflory7), could you please review this +pull request and leave feedback? + +  + +## Tagging issues or pull requests + +In a comment, you can automatically link a pull request or issue by its +number. To link it, use the `#` character followed by its number. Like +with tagging users, Pagure will provide suggestions for issues or pull +requests as you type the number. You can select the issue in the drop-down +to automatically tag the issue or pull request. + +  + +## Emoji + +Pagure natively supports emoji characters. To use emoji, you can use two +colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by +itself will bring up a list of suggested emoji with a small preview. If +you see the one you're looking for, you can click it to automatically +complete the emoji. + +`I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper:` + +I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper: + +  + +## Improve this documentation! + +Notice anything that can be improved in this documentation? Find a +mistake? You can improve this page! Find it in the official [Pagure +repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). From 4f0563a56b071438a94c61b8747fbd560e964de4 Mon Sep 17 00:00:00 2001 From: Justin W. Flory Date: Oct 28 2016 09:05:36 +0000 Subject: [PATCH 2/14] Include cross-project tagging in markdown doc --- diff --git a/doc/usage/markdown.md b/doc/usage/markdown.md index 7bc4f35..b3a11a8 100644 --- a/doc/usage/markdown.md +++ b/doc/usage/markdown.md @@ -1,5 +1,6 @@ Using Markdown in Pagure ======================== + Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) as the base for formatting comments in issues, pull requests, and in Markdown files in repositories. For basic formatting, Pagure follows @@ -178,6 +179,10 @@ with tagging users, Pagure will provide suggestions for issues or pull requests as you type the number. You can select the issue in the drop-down to automatically tag the issue or pull request. +If you need to tag an issue or pull request that is outside of the current +project, you are also able to do this. For cross-projects links, you can +tag them by typing `#id` or `/#id`. +   ## Emoji From 9e9a8a7d079b40a649bfbcc88ad181a15b578599 Mon Sep 17 00:00:00 2001 From: Justin W. Flory Date: Oct 28 2016 09:05:36 +0000 Subject: [PATCH 3/14] Include reference to markdown.md in usage.rst --- diff --git a/doc/usage.rst b/doc/usage.rst index 3996a8a..5608b7e 100644 --- a/doc/usage.rst +++ b/doc/usage.rst @@ -33,6 +33,7 @@ Contents: :maxdepth: 2 usage/first_steps + usage/markdown usage/project_settings usage/roadmap usage/using_doc From ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 Mon Sep 17 00:00:00 2001 From: Justin W. Flory Date: Oct 28 2016 09:05:36 +0000 Subject: [PATCH 4/14] Update file based on hotfix to staging, update documentation for code blocks --- diff --git a/doc/usage/markdown.md b/doc/usage/markdown.md index b3a11a8..420dc63 100644 --- a/doc/usage/markdown.md +++ b/doc/usage/markdown.md @@ -1,25 +1,18 @@ Using Markdown in Pagure ======================== -Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) -as the base for formatting comments in issues, pull requests, and in -Markdown files in repositories. For basic formatting, Pagure follows -common Markdown formatting, but it also has some unique syntax for more -advanced formatting. This help page helps demonstrate how to use Markdown -in Pagure. +Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) as the base for formatting comments in issues, pull requests, and in Markdown files in repositories. For basic formatting, Pagure follows common Markdown formatting, but it also has some unique syntax for more advanced formatting. This help page helps demonstrate how to use Markdown in Pagure. -  ## Headers -To create headings, you will use the `#` symbol before the text. The -number of hashes before the text determines the header size. +To create headings, you will use the `#` symbol before the text. The number of hashes before the text determines the header size. -
# header1
+~~~~
+# header1
 ## header2
-### header3
- -
+### header3 +~~~~ # header 1 @@ -27,9 +20,6 @@ number of hashes before the text determines the header size. ### header3 -
- -  ## Styling @@ -52,77 +42,72 @@ You can mark up text with bold, italics, or strikethrough. * Example: `**This text is the _most important thing ever_**` * Output: **This text is the _most important thing ever_** -  ## Quoting You can show text as being quoted with the `>` character. -
Before merging this pull request, remember Clark Kent mentioned this:
-> Double-check there's no reference to the Kryptonite library in the
-> program since we removed that a few versions ago.
- -  +~~~~ +Before merging this pull request, remember Clark Kent mentioned this: +> Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago. +~~~~ Before merging this pull request, remember Clark Kent mentioned this: -> Double-check there's no reference to the Kryptonite library in the -> program since we removed that a few versions ago. +> Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago. -  ## Code -You can highlight parts of a line as code or create entire code blocks in -your Markdown documents. Text inside of backticks will not be formatted. - -
When running the program for the first time, use `superman --initialize`.
+You can highlight parts of a line as code or create entire code blocks in your Markdown documents. You can do this with the backtick character (`). Text inside of backticks will not be formatted. +~~~~ When running the program for the first time, use `superman --initialize`. +~~~~ -  +When running the program for the first time, use `superman --initialize`. -To format multiple lines of code into its own block, you will need to use -raw HTML with the ‹pre›‹/pre› tags. +To format multiple lines of code into its own block, you can wrap the text block with four tilde (~) characters -
Install the needed system libraries:
-‹pre›
+~~~~
+Install the needed system libraries:
+`~~~~`
 sudo dnf install git python-virtualenv libgit2-devel \
                  libjpeg-devel gcc libffi-devel redhat-rpm-config
-‹pre›
+`~~~~` +~~~~ -  Install the needed system libraries: -
+
+~~~~
 sudo dnf install git python-virtualenv libgit2-devel \
                  libjpeg-devel gcc libffi-devel redhat-rpm-config
-
+~~~~ -  ## Hyperlinks -Need to embed a link to somewhere else? No problem! You can create an in- -line link by wrapping the text in `[ ]` and appending the the URL in -parentheses `( )` immediately after. +Need to embed a link to somewhere else? No problem! You can create an in-line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. `Pagure is used by the [Fedora Project](https://fedoraproject.org).` Pagure is used by the [Fedora Project](https://fedoraproject.org). -  ## Lists -You can make unordered lists spanning multiple lines with either `-` or -`*`. +#### Unordered lists -
* Superman
+You can make unordered lists spanning multiple lines with either `-` or `*`.
+
+~~~~
+* Superman
 * Batman
     * Protector of Gotham City!
 * Superwoman
 * Harley Quinn
-    * Something on this list is unlike the others...
+ * Something on this list is unlike the others... +~~~~ * Superman * Batman @@ -131,18 +116,20 @@ You can make unordered lists spanning multiple lines with either `-` or * Harley Quinn * Something on this list is unlike the others... -  +#### Ordered lists You can make ordered lists by preceding each line with a number. -
1. Superman
+~~~~
+1. Superman
 2. Batman
     1. Protector of Gotham City!
     2. He drives the Batmobile!
 3. Superwoman
 4. Harley Quinn
     1. Something on this list is unlike the others...
-    2. Somebody evil lurks on this list!
+ 2. Somebody evil lurks on this list! +~~~~ 1. Superman 2. Batman @@ -153,54 +140,32 @@ You can make ordered lists by preceding each line with a number. 1. Something on this list is unlike the others... 2. Somebody evil lurks on this list! -  ## Tagging users -You can tag other users on Pagure to send them a notification about an -issue or pull request. To tag a user, use the `@` symbol followed by their -username. Typing the `@` symbol in a comment will bring up a list of users -that match the username. The list searches as you type. Once you see the -name of the person you are looking for, you can click their name to -automatically complete the tag. +You can tag other users on Pagure to send them a notification about an issue or pull request. To tag a user, use the `@` symbol followed by their username. Typing the `@` symbol in a comment will bring up a list of users that match the username. The list searches as you type. Once you see the name of the person you are looking for, you can click their name to automatically complete the tag. `@jflory7, could you please review this pull request and leave feedback?` -[@jflory7](https://pagure.io/user/jflory7), could you please review this -pull request and leave feedback? +[@jflory7](https://pagure.io/user/jflory7), could you please review this pull request and leave feedback? -  ## Tagging issues or pull requests -In a comment, you can automatically link a pull request or issue by its -number. To link it, use the `#` character followed by its number. Like -with tagging users, Pagure will provide suggestions for issues or pull -requests as you type the number. You can select the issue in the drop-down -to automatically tag the issue or pull request. +In a comment, you can automatically link a pull request or issue by its number. To link it, use the `#` character followed by its number. Like with tagging users, Pagure will provide suggestions for issues or pull requests as you type the number. You can select the issue in the drop-down to automatically tag the issue or pull request. -If you need to tag an issue or pull request that is outside of the current -project, you are also able to do this. For cross-projects links, you can -tag them by typing `#id` or `/#id`. +If you need to tag an issue or pull request that is outside of the current project, you are also able to do this. For cross-projects links, you can tag them by typing `#id` or `/#id`. -  ## Emoji -Pagure natively supports emoji characters. To use emoji, you can use two -colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by -itself will bring up a list of suggested emoji with a small preview. If -you see the one you're looking for, you can click it to automatically -complete the emoji. +Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. `I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper:` I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper: -  ## Improve this documentation! -Notice anything that can be improved in this documentation? Find a -mistake? You can improve this page! Find it in the official [Pagure -repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). +Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). From bf156df08f90f220fdfa78462558ae94ee175a67 Mon Sep 17 00:00:00 2001 From: Justin W. Flory Date: Oct 28 2016 09:06:11 +0000 Subject: [PATCH 5/14] Add documentation for using Markdown in Pagure --- diff --git a/doc/usage/markdown.md b/doc/usage/markdown.md index 420dc63..cdb0359 100644 --- a/doc/usage/markdown.md +++ b/doc/usage/markdown.md @@ -1,5 +1,6 @@ Using Markdown in Pagure ======================== +<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) as the base for formatting comments in issues, pull requests, and in Markdown files in repositories. For basic formatting, Pagure follows common Markdown formatting, but it also has some unique syntax for more advanced formatting. This help page helps demonstrate how to use Markdown in Pagure. @@ -13,6 +14,27 @@ To create headings, you will use the `#` symbol before the text. The number of h ## header2 ### header3 ~~~~ +======= +Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) +as the base for formatting comments in issues, pull requests, and in +Markdown files in repositories. For basic formatting, Pagure follows +common Markdown formatting, but it also has some unique syntax for more +advanced formatting. This help page helps demonstrate how to use Markdown +in Pagure. + +  + +## Headers + +To create headings, you will use the `#` symbol before the text. The +number of hashes before the text determines the header size. + +
# header1
+## header2
+### header3
+ +
+>>>>>>> Add documentation for using Markdown in Pagure # header 1 @@ -20,6 +42,12 @@ To create headings, you will use the `#` symbol before the text. The number of h ### header3 +<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 +======= +
+ +  +>>>>>>> Add documentation for using Markdown in Pagure ## Styling @@ -42,11 +70,16 @@ You can mark up text with bold, italics, or strikethrough. * Example: `**This text is the _most important thing ever_**` * Output: **This text is the _most important thing ever_** +<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 +======= +  +>>>>>>> Add documentation for using Markdown in Pagure ## Quoting You can show text as being quoted with the `>` character. +<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ~~~~ Before merging this pull request, remember Clark Kent mentioned this: > Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago. @@ -88,11 +121,61 @@ sudo dnf install git python-virtualenv libgit2-devel \ ## Hyperlinks Need to embed a link to somewhere else? No problem! You can create an in-line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. +======= +
Before merging this pull request, remember Clark Kent mentioned this:
+> Double-check there's no reference to the Kryptonite library in the
+> program since we removed that a few versions ago.
+ +  + +Before merging this pull request, remember Clark Kent mentioned this: +> Double-check there's no reference to the Kryptonite library in the +> program since we removed that a few versions ago. + +  + +## Code + +You can highlight parts of a line as code or create entire code blocks in +your Markdown documents. Text inside of backticks will not be formatted. + +
When running the program for the first time, use `superman --initialize`.
+ +When running the program for the first time, use `superman --initialize`. + +  + +To format multiple lines of code into its own block, you will need to use +raw HTML with the ‹pre›‹/pre› tags. + +
Install the needed system libraries:
+‹pre›
+sudo dnf install git python-virtualenv libgit2-devel \
+                 libjpeg-devel gcc libffi-devel redhat-rpm-config
+‹pre›
+ +  + +Install the needed system libraries: +
+sudo dnf install git python-virtualenv libgit2-devel \
+                 libjpeg-devel gcc libffi-devel redhat-rpm-config
+
+ +  + +## Hyperlinks + +Need to embed a link to somewhere else? No problem! You can create an in- +line link by wrapping the text in `[ ]` and appending the the URL in +parentheses `( )` immediately after. +>>>>>>> Add documentation for using Markdown in Pagure `Pagure is used by the [Fedora Project](https://fedoraproject.org).` Pagure is used by the [Fedora Project](https://fedoraproject.org). +<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ## Lists @@ -102,12 +185,26 @@ You can make unordered lists spanning multiple lines with either `-` or `*`. ~~~~ * Superman +======= +  + +## Lists + +You can make unordered lists spanning multiple lines with either `-` or +`*`. + +
* Superman
+>>>>>>> Add documentation for using Markdown in Pagure
 * Batman
     * Protector of Gotham City!
 * Superwoman
 * Harley Quinn
+<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
     * Something on this list is unlike the others...
 ~~~~
+=======
+    * Something on this list is unlike the others...
+>>>>>>> Add documentation for using Markdown in Pagure * Superman * Batman @@ -116,20 +213,32 @@ You can make unordered lists spanning multiple lines with either `-` or `*`. * Harley Quinn * Something on this list is unlike the others... +<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 #### Ordered lists You can make ordered lists by preceding each line with a number. ~~~~ 1. Superman +======= +  + +You can make ordered lists by preceding each line with a number. + +
1. Superman
+>>>>>>> Add documentation for using Markdown in Pagure
 2. Batman
     1. Protector of Gotham City!
     2. He drives the Batmobile!
 3. Superwoman
 4. Harley Quinn
     1. Something on this list is unlike the others...
+<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
     2. Somebody evil lurks on this list!
 ~~~~
+=======
+    2. Somebody evil lurks on this list!
+>>>>>>> Add documentation for using Markdown in Pagure 1. Superman 2. Batman @@ -140,6 +249,7 @@ You can make ordered lists by preceding each line with a number. 1. Something on this list is unlike the others... 2. Somebody evil lurks on this list! +<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ## Tagging users @@ -160,12 +270,59 @@ If you need to tag an issue or pull request that is outside of the current proje ## Emoji Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. +======= +  + +## Tagging users + +You can tag other users on Pagure to send them a notification about an +issue or pull request. To tag a user, use the `@` symbol followed by their +username. Typing the `@` symbol in a comment will bring up a list of users +that match the username. The list searches as you type. Once you see the +name of the person you are looking for, you can click their name to +automatically complete the tag. + +`@jflory7, could you please review this pull request and leave feedback?` + +[@jflory7](https://pagure.io/user/jflory7), could you please review this +pull request and leave feedback? + +  + +## Tagging issues or pull requests + +In a comment, you can automatically link a pull request or issue by its +number. To link it, use the `#` character followed by its number. Like +with tagging users, Pagure will provide suggestions for issues or pull +requests as you type the number. You can select the issue in the drop-down +to automatically tag the issue or pull request. + +  + +## Emoji + +Pagure natively supports emoji characters. To use emoji, you can use two +colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by +itself will bring up a list of suggested emoji with a small preview. If +you see the one you're looking for, you can click it to automatically +complete the emoji. +>>>>>>> Add documentation for using Markdown in Pagure `I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper:` I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper: +<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ## Improve this documentation! Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). +======= +  + +## Improve this documentation! + +Notice anything that can be improved in this documentation? Find a +mistake? You can improve this page! Find it in the official [Pagure +repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). +>>>>>>> Add documentation for using Markdown in Pagure From 7a26dcdc244c554fdf467408143a0f7850f5d1cd Mon Sep 17 00:00:00 2001 From: Justin W. Flory Date: Oct 28 2016 09:06:17 +0000 Subject: [PATCH 6/14] Include cross-project tagging in markdown doc --- diff --git a/doc/usage/markdown.md b/doc/usage/markdown.md index cdb0359..b772c41 100644 --- a/doc/usage/markdown.md +++ b/doc/usage/markdown.md @@ -1,5 +1,6 @@ Using Markdown in Pagure ======================== +<<<<<<< bf156df08f90f220fdfa78462558ae94ee175a67 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) as the base for formatting comments in issues, pull requests, and in Markdown files in repositories. For basic formatting, Pagure follows common Markdown formatting, but it also has some unique syntax for more advanced formatting. This help page helps demonstrate how to use Markdown in Pagure. @@ -15,6 +16,9 @@ To create headings, you will use the `#` symbol before the text. The number of h ### header3 ~~~~ ======= +======= + +>>>>>>> Include cross-project tagging in markdown doc Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) as the base for formatting comments in issues, pull requests, and in Markdown files in repositories. For basic formatting, Pagure follows @@ -297,6 +301,10 @@ with tagging users, Pagure will provide suggestions for issues or pull requests as you type the number. You can select the issue in the drop-down to automatically tag the issue or pull request. +If you need to tag an issue or pull request that is outside of the current +project, you are also able to do this. For cross-projects links, you can +tag them by typing `#id` or `/#id`. +   ## Emoji From 5babdd5746cc3345502180b67c7f9ae56bdbb00f Mon Sep 17 00:00:00 2001 From: Justin W. Flory Date: Oct 28 2016 09:06:19 +0000 Subject: [PATCH 7/14] Update file based on hotfix to staging, update documentation for code blocks --- diff --git a/doc/usage/markdown.md b/doc/usage/markdown.md index b772c41..bbd8390 100644 --- a/doc/usage/markdown.md +++ b/doc/usage/markdown.md @@ -4,6 +4,7 @@ Using Markdown in Pagure <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) as the base for formatting comments in issues, pull requests, and in Markdown files in repositories. For basic formatting, Pagure follows common Markdown formatting, but it also has some unique syntax for more advanced formatting. This help page helps demonstrate how to use Markdown in Pagure. +<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd ## Headers @@ -25,20 +26,26 @@ Markdown files in repositories. For basic formatting, Pagure follows common Markdown formatting, but it also has some unique syntax for more advanced formatting. This help page helps demonstrate how to use Markdown in Pagure. +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks -  ## Headers -To create headings, you will use the `#` symbol before the text. The -number of hashes before the text determines the header size. +To create headings, you will use the `#` symbol before the text. The number of hashes before the text determines the header size. -
# header1
+~~~~
+# header1
 ## header2
+<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 ### header3
>>>>>>> Add documentation for using Markdown in Pagure +======= +### header3 +~~~~ +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks # header 1 @@ -46,12 +53,15 @@ number of hashes before the text determines the header size. ### header3 +<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 =======
  >>>>>>> Add documentation for using Markdown in Pagure +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Styling @@ -74,20 +84,27 @@ You can mark up text with bold, italics, or strikethrough. * Example: `**This text is the _most important thing ever_**` * Output: **This text is the _most important thing ever_** +<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 =======   >>>>>>> Add documentation for using Markdown in Pagure +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Quoting You can show text as being quoted with the `>` character. +<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ~~~~ Before merging this pull request, remember Clark Kent mentioned this: > Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago. ~~~~ +<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd Before merging this pull request, remember Clark Kent mentioned this: > Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago. @@ -131,54 +148,58 @@ Need to embed a link to somewhere else? No problem! You can create an in-line li > program since we removed that a few versions ago.   +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks Before merging this pull request, remember Clark Kent mentioned this: -> Double-check there's no reference to the Kryptonite library in the -> program since we removed that a few versions ago. +> Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago. -  ## Code -You can highlight parts of a line as code or create entire code blocks in -your Markdown documents. Text inside of backticks will not be formatted. - -
When running the program for the first time, use `superman --initialize`.
+You can highlight parts of a line as code or create entire code blocks in your Markdown documents. You can do this with the backtick character (`). Text inside of backticks will not be formatted. +~~~~ When running the program for the first time, use `superman --initialize`. +~~~~ -  +When running the program for the first time, use `superman --initialize`. -To format multiple lines of code into its own block, you will need to use -raw HTML with the ‹pre›‹/pre› tags. +To format multiple lines of code into its own block, you can wrap the text block with four tilde (~) characters -
Install the needed system libraries:
-‹pre›
+~~~~
+Install the needed system libraries:
+`~~~~`
 sudo dnf install git python-virtualenv libgit2-devel \
                  libjpeg-devel gcc libffi-devel redhat-rpm-config
-‹pre›
+`~~~~` +~~~~ -  Install the needed system libraries: -
+
+~~~~
 sudo dnf install git python-virtualenv libgit2-devel \
                  libjpeg-devel gcc libffi-devel redhat-rpm-config
-
+~~~~ -  ## Hyperlinks +<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd Need to embed a link to somewhere else? No problem! You can create an in- line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. >>>>>>> Add documentation for using Markdown in Pagure +======= +Need to embed a link to somewhere else? No problem! You can create an in-line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks `Pagure is used by the [Fedora Project](https://fedoraproject.org).` Pagure is used by the [Fedora Project](https://fedoraproject.org). +<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ## Lists @@ -191,24 +212,37 @@ You can make unordered lists spanning multiple lines with either `-` or `*`. * Superman =======   +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Lists -You can make unordered lists spanning multiple lines with either `-` or -`*`. +#### Unordered lists +<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd 
* Superman
 >>>>>>> Add documentation for using Markdown in Pagure
+=======
+You can make unordered lists spanning multiple lines with either `-` or `*`.
+
+~~~~
+* Superman
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 * Batman
     * Protector of Gotham City!
 * Superwoman
 * Harley Quinn
+<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
     * Something on this list is unlike the others...
 ~~~~
 =======
     * Something on this list is unlike the others...
>>>>>>> Add documentation for using Markdown in Pagure +======= + * Something on this list is unlike the others... +~~~~ +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks * Superman * Batman @@ -217,6 +251,7 @@ You can make unordered lists spanning multiple lines with either `-` or * Harley Quinn * Something on this list is unlike the others... +<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 #### Ordered lists @@ -231,18 +266,31 @@ You can make ordered lists by preceding each line with a number. 
1. Superman
 >>>>>>> Add documentation for using Markdown in Pagure
+=======
+#### Ordered lists
+
+You can make ordered lists by preceding each line with a number.
+
+~~~~
+1. Superman
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 2. Batman
     1. Protector of Gotham City!
     2. He drives the Batmobile!
 3. Superwoman
 4. Harley Quinn
     1. Something on this list is unlike the others...
+<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
     2. Somebody evil lurks on this list!
 ~~~~
 =======
     2. Somebody evil lurks on this list!
>>>>>>> Add documentation for using Markdown in Pagure +======= + 2. Somebody evil lurks on this list! +~~~~ +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks 1. Superman 2. Batman @@ -253,6 +301,7 @@ You can make ordered lists by preceding each line with a number. 1. Something on this list is unlike the others... 2. Somebody evil lurks on this list! +<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ## Tagging users @@ -276,50 +325,43 @@ If you need to tag an issue or pull request that is outside of the current proje Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. =======   +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Tagging users -You can tag other users on Pagure to send them a notification about an -issue or pull request. To tag a user, use the `@` symbol followed by their -username. Typing the `@` symbol in a comment will bring up a list of users -that match the username. The list searches as you type. Once you see the -name of the person you are looking for, you can click their name to -automatically complete the tag. +You can tag other users on Pagure to send them a notification about an issue or pull request. To tag a user, use the `@` symbol followed by their username. Typing the `@` symbol in a comment will bring up a list of users that match the username. The list searches as you type. Once you see the name of the person you are looking for, you can click their name to automatically complete the tag. `@jflory7, could you please review this pull request and leave feedback?` -[@jflory7](https://pagure.io/user/jflory7), could you please review this -pull request and leave feedback? +[@jflory7](https://pagure.io/user/jflory7), could you please review this pull request and leave feedback? -  ## Tagging issues or pull requests -In a comment, you can automatically link a pull request or issue by its -number. To link it, use the `#` character followed by its number. Like -with tagging users, Pagure will provide suggestions for issues or pull -requests as you type the number. You can select the issue in the drop-down -to automatically tag the issue or pull request. +In a comment, you can automatically link a pull request or issue by its number. To link it, use the `#` character followed by its number. Like with tagging users, Pagure will provide suggestions for issues or pull requests as you type the number. You can select the issue in the drop-down to automatically tag the issue or pull request. -If you need to tag an issue or pull request that is outside of the current -project, you are also able to do this. For cross-projects links, you can -tag them by typing `#id` or `/#id`. +If you need to tag an issue or pull request that is outside of the current project, you are also able to do this. For cross-projects links, you can tag them by typing `#id` or `/#id`. -  ## Emoji +<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. >>>>>>> Add documentation for using Markdown in Pagure +======= +Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks `I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper:` I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper: +<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ## Improve this documentation! @@ -334,3 +376,9 @@ Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). >>>>>>> Add documentation for using Markdown in Pagure +======= + +## Improve this documentation! + +Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks From 554748685c760f70e542cdc05dc5373b56de5348 Mon Sep 17 00:00:00 2001 From: Justin W. Flory Date: Oct 28 2016 09:06:22 +0000 Subject: [PATCH 8/14] Add documentation for using Markdown in Pagure --- diff --git a/doc/usage/markdown.md b/doc/usage/markdown.md index bbd8390..02ebf95 100644 --- a/doc/usage/markdown.md +++ b/doc/usage/markdown.md @@ -1,5 +1,6 @@ Using Markdown in Pagure ======================== +<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< bf156df08f90f220fdfa78462558ae94ee175a67 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 @@ -20,12 +21,15 @@ To create headings, you will use the `#` symbol before the text. The number of h ======= >>>>>>> Include cross-project tagging in markdown doc +======= +>>>>>>> Add documentation for using Markdown in Pagure Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) as the base for formatting comments in issues, pull requests, and in Markdown files in repositories. For basic formatting, Pagure follows common Markdown formatting, but it also has some unique syntax for more advanced formatting. This help page helps demonstrate how to use Markdown in Pagure. +<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks @@ -46,6 +50,21 @@ To create headings, you will use the `#` symbol before the text. The number of h ### header3 ~~~~ >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= + +  + +## Headers + +To create headings, you will use the `#` symbol before the text. The +number of hashes before the text determines the header size. + +
# header1
+## header2
+### header3
+ +
+>>>>>>> Add documentation for using Markdown in Pagure # header 1 @@ -53,6 +72,7 @@ To create headings, you will use the `#` symbol before the text. The number of h ### header3 +<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ======= @@ -62,6 +82,11 @@ To create headings, you will use the `#` symbol before the text. The number of h >>>>>>> Add documentation for using Markdown in Pagure ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +
+ +  +>>>>>>> Add documentation for using Markdown in Pagure ## Styling @@ -84,6 +109,7 @@ You can mark up text with bold, italics, or strikethrough. * Example: `**This text is the _most important thing ever_**` * Output: **This text is the _most important thing ever_** +<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ======= @@ -91,11 +117,15 @@ You can mark up text with bold, italics, or strikethrough. >>>>>>> Add documentation for using Markdown in Pagure ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +  +>>>>>>> Add documentation for using Markdown in Pagure ## Quoting You can show text as being quoted with the `>` character. +<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ======= @@ -143,11 +173,14 @@ sudo dnf install git python-virtualenv libgit2-devel \ Need to embed a link to somewhere else? No problem! You can create an in-line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. ======= +======= +>>>>>>> Add documentation for using Markdown in Pagure 
Before merging this pull request, remember Clark Kent mentioned this:
 > Double-check there's no reference to the Kryptonite library in the
 > program since we removed that a few versions ago.
  +<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks @@ -194,11 +227,56 @@ parentheses `( )` immediately after. ======= Need to embed a link to somewhere else? No problem! You can create an in-line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= + +Before merging this pull request, remember Clark Kent mentioned this: +> Double-check there's no reference to the Kryptonite library in the +> program since we removed that a few versions ago. + +  + +## Code + +You can highlight parts of a line as code or create entire code blocks in +your Markdown documents. Text inside of backticks will not be formatted. + +
When running the program for the first time, use `superman --initialize`.
+ +When running the program for the first time, use `superman --initialize`. + +  + +To format multiple lines of code into its own block, you will need to use +raw HTML with the ‹pre›‹/pre› tags. + +
Install the needed system libraries:
+‹pre›
+sudo dnf install git python-virtualenv libgit2-devel \
+                 libjpeg-devel gcc libffi-devel redhat-rpm-config
+‹pre›
+ +  + +Install the needed system libraries: +
+sudo dnf install git python-virtualenv libgit2-devel \
+                 libjpeg-devel gcc libffi-devel redhat-rpm-config
+
+ +  + +## Hyperlinks + +Need to embed a link to somewhere else? No problem! You can create an in- +line link by wrapping the text in `[ ]` and appending the the URL in +parentheses `( )` immediately after. +>>>>>>> Add documentation for using Markdown in Pagure `Pagure is used by the [Fedora Project](https://fedoraproject.org).` Pagure is used by the [Fedora Project](https://fedoraproject.org). +<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 @@ -228,10 +306,21 @@ You can make unordered lists spanning multiple lines with either `-` or `*`. ~~~~ * Superman >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +  + +## Lists + +You can make unordered lists spanning multiple lines with either `-` or +`*`. + +
* Superman
+>>>>>>> Add documentation for using Markdown in Pagure
 * Batman
     * Protector of Gotham City!
 * Superwoman
 * Harley Quinn
+<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
     * Something on this list is unlike the others...
@@ -243,6 +332,9 @@ You can make unordered lists spanning multiple lines with either `-` or `*`.
     * Something on this list is unlike the others...
 ~~~~
 >>>>>>> Update file based on hotfix to staging, update documentation for code blocks
+=======
+    * Something on this list is unlike the others...
+>>>>>>> Add documentation for using Markdown in Pagure * Superman * Batman @@ -251,6 +343,7 @@ You can make unordered lists spanning multiple lines with either `-` or `*`. * Harley Quinn * Something on this list is unlike the others... +<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 #### Ordered lists @@ -260,11 +353,14 @@ You can make ordered lists by preceding each line with a number. ~~~~ 1. Superman ======= +======= +>>>>>>> Add documentation for using Markdown in Pagure   You can make ordered lists by preceding each line with a number. 
1. Superman
+<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
 >>>>>>> Add documentation for using Markdown in Pagure
 =======
 #### Ordered lists
@@ -274,12 +370,15 @@ You can make ordered lists by preceding each line with a number.
 ~~~~
 1. Superman
 >>>>>>> Update file based on hotfix to staging, update documentation for code blocks
+=======
+>>>>>>> Add documentation for using Markdown in Pagure
 2. Batman
     1. Protector of Gotham City!
     2. He drives the Batmobile!
 3. Superwoman
 4. Harley Quinn
     1. Something on this list is unlike the others...
+<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
     2. Somebody evil lurks on this list!
@@ -291,6 +390,9 @@ You can make ordered lists by preceding each line with a number.
     2. Somebody evil lurks on this list!
 ~~~~
 >>>>>>> Update file based on hotfix to staging, update documentation for code blocks
+=======
+    2. Somebody evil lurks on this list!
+>>>>>>> Add documentation for using Markdown in Pagure 1. Superman 2. Batman @@ -301,6 +403,7 @@ You can make ordered lists by preceding each line with a number. 1. Something on this list is unlike the others... 2. Somebody evil lurks on this list! +<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 @@ -347,20 +450,56 @@ If you need to tag an issue or pull request that is outside of the current proje ## Emoji <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd +======= +  + +## Tagging users + +You can tag other users on Pagure to send them a notification about an +issue or pull request. To tag a user, use the `@` symbol followed by their +username. Typing the `@` symbol in a comment will bring up a list of users +that match the username. The list searches as you type. Once you see the +name of the person you are looking for, you can click their name to +automatically complete the tag. + +`@jflory7, could you please review this pull request and leave feedback?` + +[@jflory7](https://pagure.io/user/jflory7), could you please review this +pull request and leave feedback? + +  + +## Tagging issues or pull requests + +In a comment, you can automatically link a pull request or issue by its +number. To link it, use the `#` character followed by its number. Like +with tagging users, Pagure will provide suggestions for issues or pull +requests as you type the number. You can select the issue in the drop-down +to automatically tag the issue or pull request. + +  + +## Emoji + +>>>>>>> Add documentation for using Markdown in Pagure Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. +<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f >>>>>>> Add documentation for using Markdown in Pagure ======= Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +>>>>>>> Add documentation for using Markdown in Pagure `I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper:` I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper: +<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 @@ -368,6 +507,8 @@ I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper: Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). ======= +======= +>>>>>>> Add documentation for using Markdown in Pagure   ## Improve this documentation! @@ -375,6 +516,7 @@ Notice anything that can be improved in this documentation? Find a mistake? You Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). +<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f >>>>>>> Add documentation for using Markdown in Pagure ======= @@ -382,3 +524,5 @@ repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +>>>>>>> Add documentation for using Markdown in Pagure From 0e389d26d6d16167ecd4dbe881964058fbdd7daf Mon Sep 17 00:00:00 2001 From: Justin W. Flory Date: Oct 28 2016 09:06:27 +0000 Subject: [PATCH 9/14] Include cross-project tagging in markdown doc --- diff --git a/doc/usage/markdown.md b/doc/usage/markdown.md index 02ebf95..eb2c8d4 100644 --- a/doc/usage/markdown.md +++ b/doc/usage/markdown.md @@ -1,5 +1,6 @@ Using Markdown in Pagure ======================== +<<<<<<< 554748685c760f70e542cdc05dc5373b56de5348 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< bf156df08f90f220fdfa78462558ae94ee175a67 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 @@ -23,6 +24,9 @@ To create headings, you will use the `#` symbol before the text. The number of h >>>>>>> Include cross-project tagging in markdown doc ======= >>>>>>> Add documentation for using Markdown in Pagure +======= + +>>>>>>> Include cross-project tagging in markdown doc Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) as the base for formatting comments in issues, pull requests, and in Markdown files in repositories. For basic formatting, Pagure follows @@ -477,6 +481,10 @@ with tagging users, Pagure will provide suggestions for issues or pull requests as you type the number. You can select the issue in the drop-down to automatically tag the issue or pull request. +If you need to tag an issue or pull request that is outside of the current +project, you are also able to do this. For cross-projects links, you can +tag them by typing `#id` or `/#id`. +   ## Emoji From 528343f4c9211d8a01eca7650f807fc2470317da Mon Sep 17 00:00:00 2001 From: Justin W. Flory Date: Oct 28 2016 09:06:28 +0000 Subject: [PATCH 10/14] Update file based on hotfix to staging, update documentation for code blocks --- diff --git a/doc/usage/markdown.md b/doc/usage/markdown.md index eb2c8d4..11c96eb 100644 --- a/doc/usage/markdown.md +++ b/doc/usage/markdown.md @@ -6,6 +6,7 @@ Using Markdown in Pagure <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) as the base for formatting comments in issues, pull requests, and in Markdown files in repositories. For basic formatting, Pagure follows common Markdown formatting, but it also has some unique syntax for more advanced formatting. This help page helps demonstrate how to use Markdown in Pagure. +<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd @@ -55,20 +56,26 @@ To create headings, you will use the `#` symbol before the text. The number of h ~~~~ >>>>>>> Update file based on hotfix to staging, update documentation for code blocks ======= +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks -  ## Headers -To create headings, you will use the `#` symbol before the text. The -number of hashes before the text determines the header size. +To create headings, you will use the `#` symbol before the text. The number of hashes before the text determines the header size. -
# header1
+~~~~
+# header1
 ## header2
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 ### header3
>>>>>>> Add documentation for using Markdown in Pagure +======= +### header3 +~~~~ +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks # header 1 @@ -76,6 +83,7 @@ number of hashes before the text determines the header size. ### header3 +<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 @@ -91,6 +99,8 @@ number of hashes before the text determines the header size.   >>>>>>> Add documentation for using Markdown in Pagure +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Styling @@ -113,6 +123,7 @@ You can mark up text with bold, italics, or strikethrough. * Example: `**This text is the _most important thing ever_**` * Output: **This text is the _most important thing ever_** +<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 @@ -124,20 +135,26 @@ You can mark up text with bold, italics, or strikethrough. =======   >>>>>>> Add documentation for using Markdown in Pagure +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Quoting You can show text as being quoted with the `>` character. +<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ~~~~ Before merging this pull request, remember Clark Kent mentioned this: > Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago. ~~~~ +<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd Before merging this pull request, remember Clark Kent mentioned this: @@ -232,54 +249,58 @@ parentheses `( )` immediately after. Need to embed a link to somewhere else? No problem! You can create an in-line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. >>>>>>> Update file based on hotfix to staging, update documentation for code blocks ======= +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks Before merging this pull request, remember Clark Kent mentioned this: -> Double-check there's no reference to the Kryptonite library in the -> program since we removed that a few versions ago. +> Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago. -  ## Code -You can highlight parts of a line as code or create entire code blocks in -your Markdown documents. Text inside of backticks will not be formatted. - -
When running the program for the first time, use `superman --initialize`.
+You can highlight parts of a line as code or create entire code blocks in your Markdown documents. You can do this with the backtick character (`). Text inside of backticks will not be formatted. +~~~~ When running the program for the first time, use `superman --initialize`. +~~~~ -  +When running the program for the first time, use `superman --initialize`. -To format multiple lines of code into its own block, you will need to use -raw HTML with the ‹pre›‹/pre› tags. +To format multiple lines of code into its own block, you can wrap the text block with four tilde (~) characters -
Install the needed system libraries:
-‹pre›
+~~~~
+Install the needed system libraries:
+`~~~~`
 sudo dnf install git python-virtualenv libgit2-devel \
                  libjpeg-devel gcc libffi-devel redhat-rpm-config
-‹pre›
+`~~~~` +~~~~ -  Install the needed system libraries: -
+
+~~~~
 sudo dnf install git python-virtualenv libgit2-devel \
                  libjpeg-devel gcc libffi-devel redhat-rpm-config
-
+~~~~ -  ## Hyperlinks +<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf Need to embed a link to somewhere else? No problem! You can create an in- line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. >>>>>>> Add documentation for using Markdown in Pagure +======= +Need to embed a link to somewhere else? No problem! You can create an in-line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks `Pagure is used by the [Fedora Project](https://fedoraproject.org).` Pagure is used by the [Fedora Project](https://fedoraproject.org). +<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 @@ -312,18 +333,27 @@ You can make unordered lists spanning multiple lines with either `-` or `*`. >>>>>>> Update file based on hotfix to staging, update documentation for code blocks =======   +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Lists -You can make unordered lists spanning multiple lines with either `-` or -`*`. +#### Unordered lists +<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf 
* Superman
 >>>>>>> Add documentation for using Markdown in Pagure
+=======
+You can make unordered lists spanning multiple lines with either `-` or `*`.
+
+~~~~
+* Superman
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 * Batman
     * Protector of Gotham City!
 * Superwoman
 * Harley Quinn
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
@@ -339,6 +369,10 @@ You can make unordered lists spanning multiple lines with either `-` or
 =======
     * Something on this list is unlike the others...
>>>>>>> Add documentation for using Markdown in Pagure +======= + * Something on this list is unlike the others... +~~~~ +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks * Superman * Batman @@ -347,6 +381,7 @@ You can make unordered lists spanning multiple lines with either `-` or * Harley Quinn * Something on this list is unlike the others... +<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 @@ -376,12 +411,21 @@ You can make ordered lists by preceding each line with a number. >>>>>>> Update file based on hotfix to staging, update documentation for code blocks ======= >>>>>>> Add documentation for using Markdown in Pagure +======= +#### Ordered lists + +You can make ordered lists by preceding each line with a number. + +~~~~ +1. Superman +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks 2. Batman 1. Protector of Gotham City! 2. He drives the Batmobile! 3. Superwoman 4. Harley Quinn 1. Something on this list is unlike the others... +<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 @@ -397,6 +441,10 @@ You can make ordered lists by preceding each line with a number. ======= 2. Somebody evil lurks on this list! >>>>>>> Add documentation for using Markdown in Pagure +======= + 2. Somebody evil lurks on this list! +~~~~ +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks 1. Superman 2. Batman @@ -407,6 +455,7 @@ You can make ordered lists by preceding each line with a number. 1. Something on this list is unlike the others... 2. Somebody evil lurks on this list! +<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 @@ -456,39 +505,28 @@ If you need to tag an issue or pull request that is outside of the current proje <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd =======   +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Tagging users -You can tag other users on Pagure to send them a notification about an -issue or pull request. To tag a user, use the `@` symbol followed by their -username. Typing the `@` symbol in a comment will bring up a list of users -that match the username. The list searches as you type. Once you see the -name of the person you are looking for, you can click their name to -automatically complete the tag. +You can tag other users on Pagure to send them a notification about an issue or pull request. To tag a user, use the `@` symbol followed by their username. Typing the `@` symbol in a comment will bring up a list of users that match the username. The list searches as you type. Once you see the name of the person you are looking for, you can click their name to automatically complete the tag. `@jflory7, could you please review this pull request and leave feedback?` -[@jflory7](https://pagure.io/user/jflory7), could you please review this -pull request and leave feedback? +[@jflory7](https://pagure.io/user/jflory7), could you please review this pull request and leave feedback? -  ## Tagging issues or pull requests -In a comment, you can automatically link a pull request or issue by its -number. To link it, use the `#` character followed by its number. Like -with tagging users, Pagure will provide suggestions for issues or pull -requests as you type the number. You can select the issue in the drop-down -to automatically tag the issue or pull request. +In a comment, you can automatically link a pull request or issue by its number. To link it, use the `#` character followed by its number. Like with tagging users, Pagure will provide suggestions for issues or pull requests as you type the number. You can select the issue in the drop-down to automatically tag the issue or pull request. -If you need to tag an issue or pull request that is outside of the current -project, you are also able to do this. For cross-projects links, you can -tag them by typing `#id` or `/#id`. +If you need to tag an issue or pull request that is outside of the current project, you are also able to do this. For cross-projects links, you can tag them by typing `#id` or `/#id`. -  ## Emoji +<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf >>>>>>> Add documentation for using Markdown in Pagure Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by @@ -502,11 +540,15 @@ Pagure natively supports emoji characters. To use emoji, you can use two colons >>>>>>> Update file based on hotfix to staging, update documentation for code blocks ======= >>>>>>> Add documentation for using Markdown in Pagure +======= +Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks `I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper:` I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper: +<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 @@ -534,3 +576,9 @@ Notice anything that can be improved in this documentation? Find a mistake? You >>>>>>> Update file based on hotfix to staging, update documentation for code blocks ======= >>>>>>> Add documentation for using Markdown in Pagure +======= + +## Improve this documentation! + +Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks From ec0860623a3726b654c4ad94ab755cf250ed73c6 Mon Sep 17 00:00:00 2001 From: Justin W. Flory Date: Oct 28 2016 09:06:31 +0000 Subject: [PATCH 11/14] Add documentation for using Markdown in Pagure --- diff --git a/doc/usage/markdown.md b/doc/usage/markdown.md index 11c96eb..df9a2c6 100644 --- a/doc/usage/markdown.md +++ b/doc/usage/markdown.md @@ -1,9 +1,13 @@ Using Markdown in Pagure ======================== +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 554748685c760f70e542cdc05dc5373b56de5348 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< bf156df08f90f220fdfa78462558ae94ee175a67 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 +======= +<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e +>>>>>>> Add documentation for using Markdown in Pagure Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) as the base for formatting comments in issues, pull requests, and in Markdown files in repositories. For basic formatting, Pagure follows common Markdown formatting, but it also has some unique syntax for more advanced formatting. This help page helps demonstrate how to use Markdown in Pagure. <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf @@ -20,6 +24,7 @@ To create headings, you will use the `#` symbol before the text. The number of h ### header3 ~~~~ ======= +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da ======= >>>>>>> Include cross-project tagging in markdown doc @@ -28,12 +33,15 @@ To create headings, you will use the `#` symbol before the text. The number of h ======= >>>>>>> Include cross-project tagging in markdown doc +======= +>>>>>>> Add documentation for using Markdown in Pagure Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) as the base for formatting comments in issues, pull requests, and in Markdown files in repositories. For basic formatting, Pagure follows common Markdown formatting, but it also has some unique syntax for more advanced formatting. This help page helps demonstrate how to use Markdown in Pagure. +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks @@ -47,10 +55,23 @@ To create headings, you will use the `#` symbol before the text. The number of h # header1 ## header2 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd +======= + +  + +## Headers + +To create headings, you will use the `#` symbol before the text. The +number of hashes before the text determines the header size. + +
# header1
+## header2
+>>>>>>> Add documentation for using Markdown in Pagure
 ### header3
>>>>>>> Add documentation for using Markdown in Pagure +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da ======= ### header3 ~~~~ @@ -76,6 +97,8 @@ To create headings, you will use the `#` symbol before the text. The number of h ### header3 ~~~~ >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +>>>>>>> Add documentation for using Markdown in Pagure # header 1 @@ -83,15 +106,20 @@ To create headings, you will use the `#` symbol before the text. The number of h ### header3 +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ======= +<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e +>>>>>>> Add documentation for using Markdown in Pagure +=======
  >>>>>>> Add documentation for using Markdown in Pagure +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks ======= @@ -101,6 +129,8 @@ To create headings, you will use the `#` symbol before the text. The number of h >>>>>>> Add documentation for using Markdown in Pagure ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +>>>>>>> Add documentation for using Markdown in Pagure ## Styling @@ -123,6 +153,7 @@ You can mark up text with bold, italics, or strikethrough. * Example: `**This text is the _most important thing ever_**` * Output: **This text is the _most important thing ever_** +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd @@ -137,11 +168,18 @@ You can mark up text with bold, italics, or strikethrough. >>>>>>> Add documentation for using Markdown in Pagure ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e +======= +  +>>>>>>> Add documentation for using Markdown in Pagure +>>>>>>> Add documentation for using Markdown in Pagure ## Quoting You can show text as being quoted with the `>` character. +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd @@ -150,6 +188,9 @@ You can show text as being quoted with the `>` character. >>>>>>> Update file based on hotfix to staging, update documentation for code blocks ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e +>>>>>>> Add documentation for using Markdown in Pagure ~~~~ Before merging this pull request, remember Clark Kent mentioned this: > Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago. @@ -294,12 +335,65 @@ parentheses `( )` immediately after. >>>>>>> Add documentation for using Markdown in Pagure ======= Need to embed a link to somewhere else? No problem! You can create an in-line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +======= +
Before merging this pull request, remember Clark Kent mentioned this:
+> Double-check there's no reference to the Kryptonite library in the
+> program since we removed that a few versions ago.
+ +  + +Before merging this pull request, remember Clark Kent mentioned this: +> Double-check there's no reference to the Kryptonite library in the +> program since we removed that a few versions ago. + +  + +## Code + +You can highlight parts of a line as code or create entire code blocks in +your Markdown documents. Text inside of backticks will not be formatted. + +
When running the program for the first time, use `superman --initialize`.
+ +When running the program for the first time, use `superman --initialize`. + +  + +To format multiple lines of code into its own block, you will need to use +raw HTML with the ‹pre›‹/pre› tags. + +
Install the needed system libraries:
+‹pre›
+sudo dnf install git python-virtualenv libgit2-devel \
+                 libjpeg-devel gcc libffi-devel redhat-rpm-config
+‹pre›
+ +  + +Install the needed system libraries: +
+sudo dnf install git python-virtualenv libgit2-devel \
+                 libjpeg-devel gcc libffi-devel redhat-rpm-config
+
+ +  + +## Hyperlinks + +Need to embed a link to somewhere else? No problem! You can create an in- +line link by wrapping the text in `[ ]` and appending the the URL in +parentheses `( )` immediately after. +>>>>>>> Add documentation for using Markdown in Pagure +>>>>>>> Add documentation for using Markdown in Pagure `Pagure is used by the [Fedora Project](https://fedoraproject.org).` Pagure is used by the [Fedora Project](https://fedoraproject.org). +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd @@ -335,6 +429,9 @@ You can make unordered lists spanning multiple lines with either `-` or `*`.   ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e +>>>>>>> Add documentation for using Markdown in Pagure ## Lists @@ -348,11 +445,25 @@ You can make unordered lists spanning multiple lines with either `-` or `*`. ~~~~ * Superman +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +======= +  + +## Lists + +You can make unordered lists spanning multiple lines with either `-` or +`*`. + +
* Superman
+>>>>>>> Add documentation for using Markdown in Pagure
+>>>>>>> Add documentation for using Markdown in Pagure
 * Batman
     * Protector of Gotham City!
 * Superwoman
 * Harley Quinn
+<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da
 <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
@@ -373,6 +484,14 @@ You can make unordered lists spanning multiple lines with either `-` or `*`.
     * Something on this list is unlike the others...
 ~~~~
 >>>>>>> Update file based on hotfix to staging, update documentation for code blocks
+=======
+<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e
+    * Something on this list is unlike the others...
+~~~~
+=======
+    * Something on this list is unlike the others...
+>>>>>>> Add documentation for using Markdown in Pagure +>>>>>>> Add documentation for using Markdown in Pagure * Superman * Batman @@ -381,6 +500,7 @@ You can make unordered lists spanning multiple lines with either `-` or `*`. * Harley Quinn * Something on this list is unlike the others... +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd @@ -412,19 +532,33 @@ You can make ordered lists by preceding each line with a number. ======= >>>>>>> Add documentation for using Markdown in Pagure ======= +======= +<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e +>>>>>>> Add documentation for using Markdown in Pagure #### Ordered lists You can make ordered lists by preceding each line with a number. ~~~~ 1. Superman +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +======= +  + +You can make ordered lists by preceding each line with a number. + +
1. Superman
+>>>>>>> Add documentation for using Markdown in Pagure
+>>>>>>> Add documentation for using Markdown in Pagure
 2. Batman
     1. Protector of Gotham City!
     2. He drives the Batmobile!
 3. Superwoman
 4. Harley Quinn
     1. Something on this list is unlike the others...
+<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da
 <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
@@ -445,6 +579,14 @@ You can make ordered lists by preceding each line with a number.
     2. Somebody evil lurks on this list!
 ~~~~
 >>>>>>> Update file based on hotfix to staging, update documentation for code blocks
+=======
+<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e
+    2. Somebody evil lurks on this list!
+~~~~
+=======
+    2. Somebody evil lurks on this list!
+>>>>>>> Add documentation for using Markdown in Pagure +>>>>>>> Add documentation for using Markdown in Pagure 1. Superman 2. Batman @@ -455,10 +597,14 @@ You can make ordered lists by preceding each line with a number. 1. Something on this list is unlike the others... 2. Somebody evil lurks on this list! +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 +======= +<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e +>>>>>>> Add documentation for using Markdown in Pagure ## Tagging users @@ -481,6 +627,7 @@ If you need to tag an issue or pull request that is outside of the current proje Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. =======   +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks @@ -528,11 +675,43 @@ If you need to tag an issue or pull request that is outside of the current proje <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf >>>>>>> Add documentation for using Markdown in Pagure +======= + +## Tagging users + +You can tag other users on Pagure to send them a notification about an +issue or pull request. To tag a user, use the `@` symbol followed by their +username. Typing the `@` symbol in a comment will bring up a list of users +that match the username. The list searches as you type. Once you see the +name of the person you are looking for, you can click their name to +automatically complete the tag. + +`@jflory7, could you please review this pull request and leave feedback?` + +[@jflory7](https://pagure.io/user/jflory7), could you please review this +pull request and leave feedback? + +  + +## Tagging issues or pull requests + +In a comment, you can automatically link a pull request or issue by its +number. To link it, use the `#` character followed by its number. Like +with tagging users, Pagure will provide suggestions for issues or pull +requests as you type the number. You can select the issue in the drop-down +to automatically tag the issue or pull request. + +  + +## Emoji + +>>>>>>> Add documentation for using Markdown in Pagure Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f >>>>>>> Add documentation for using Markdown in Pagure ======= @@ -543,11 +722,15 @@ Pagure natively supports emoji characters. To use emoji, you can use two colons ======= Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +>>>>>>> Add documentation for using Markdown in Pagure +>>>>>>> Add documentation for using Markdown in Pagure `I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper:` I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper: +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd @@ -577,8 +760,23 @@ Notice anything that can be improved in this documentation? Find a mistake? You ======= >>>>>>> Add documentation for using Markdown in Pagure ======= +======= +<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e +>>>>>>> Add documentation for using Markdown in Pagure ## Improve this documentation! Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). +<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +======= +======= +  + +## Improve this documentation! + +Notice anything that can be improved in this documentation? Find a +mistake? You can improve this page! Find it in the official [Pagure +repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). +>>>>>>> Add documentation for using Markdown in Pagure +>>>>>>> Add documentation for using Markdown in Pagure From 09ad2ef358263c11d3da7fce88a16bc1c5746883 Mon Sep 17 00:00:00 2001 From: Justin W. Flory Date: Oct 28 2016 09:06:33 +0000 Subject: [PATCH 12/14] Include cross-project tagging in markdown doc --- diff --git a/doc/usage/markdown.md b/doc/usage/markdown.md index df9a2c6..cf4c0c6 100644 --- a/doc/usage/markdown.md +++ b/doc/usage/markdown.md @@ -1,11 +1,15 @@ Using Markdown in Pagure ======================== +<<<<<<< ec0860623a3726b654c4ad94ab755cf250ed73c6 <<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 554748685c760f70e542cdc05dc5373b56de5348 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< bf156df08f90f220fdfa78462558ae94ee175a67 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ======= +======= +<<<<<<< 263c38469dae0fae410763fd9771669806f85a2c +>>>>>>> Include cross-project tagging in markdown doc <<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e >>>>>>> Add documentation for using Markdown in Pagure @@ -24,6 +28,7 @@ To create headings, you will use the `#` symbol before the text. The number of h ### header3 ~~~~ ======= +<<<<<<< ec0860623a3726b654c4ad94ab755cf250ed73c6 <<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da ======= @@ -35,6 +40,11 @@ To create headings, you will use the `#` symbol before the text. The number of h >>>>>>> Include cross-project tagging in markdown doc ======= >>>>>>> Add documentation for using Markdown in Pagure +======= +======= + +>>>>>>> Include cross-project tagging in markdown doc +>>>>>>> Include cross-project tagging in markdown doc Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) as the base for formatting comments in issues, pull requests, and in Markdown files in repositories. For basic formatting, Pagure follows @@ -701,6 +711,10 @@ with tagging users, Pagure will provide suggestions for issues or pull requests as you type the number. You can select the issue in the drop-down to automatically tag the issue or pull request. +If you need to tag an issue or pull request that is outside of the current +project, you are also able to do this. For cross-projects links, you can +tag them by typing `#id` or `/#id`. +   ## Emoji From cc5d0803b35d62f15df55ce34618b5c107c2f15f Mon Sep 17 00:00:00 2001 From: Justin W. Flory Date: Oct 28 2016 09:06:35 +0000 Subject: [PATCH 13/14] Update file based on hotfix to staging, update documentation for code blocks --- diff --git a/doc/usage/markdown.md b/doc/usage/markdown.md index cf4c0c6..41d29d5 100644 --- a/doc/usage/markdown.md +++ b/doc/usage/markdown.md @@ -14,8 +14,12 @@ Using Markdown in Pagure >>>>>>> Add documentation for using Markdown in Pagure Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) as the base for formatting comments in issues, pull requests, and in Markdown files in repositories. For basic formatting, Pagure follows common Markdown formatting, but it also has some unique syntax for more advanced formatting. This help page helps demonstrate how to use Markdown in Pagure. +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd +======= +<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Headers @@ -51,6 +55,7 @@ Markdown files in repositories. For basic formatting, Pagure follows common Markdown formatting, but it also has some unique syntax for more advanced formatting. This help page helps demonstrate how to use Markdown in Pagure. +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 <<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f ======= @@ -66,16 +71,20 @@ To create headings, you will use the `#` symbol before the text. The number of h ## header2 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd ======= +======= +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks -  ## Headers -To create headings, you will use the `#` symbol before the text. The -number of hashes before the text determines the header size. +To create headings, you will use the `#` symbol before the text. The number of hashes before the text determines the header size. -
# header1
+~~~~
+# header1
 ## header2
+<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883
 >>>>>>> Add documentation for using Markdown in Pagure
 ### header3
@@ -99,6 +108,9 @@ To create headings, you will use the `#` symbol before the text. The number of h # header1 ## header2 <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf +======= +<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ### header3
@@ -107,8 +119,11 @@ To create headings, you will use the `#` symbol before the text. The number of h ### header3 ~~~~ >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 ======= >>>>>>> Add documentation for using Markdown in Pagure +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks # header 1 @@ -116,12 +131,16 @@ To create headings, you will use the `#` symbol before the text. The number of h ### header3 +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 <<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ======= +======= +<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks <<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e >>>>>>> Add documentation for using Markdown in Pagure ======= @@ -139,8 +158,11 @@ To create headings, you will use the `#` symbol before the text. The number of h >>>>>>> Add documentation for using Markdown in Pagure ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 ======= >>>>>>> Add documentation for using Markdown in Pagure +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Styling @@ -163,6 +185,7 @@ You can mark up text with bold, italics, or strikethrough. * Example: `**This text is the _most important thing ever_**` * Output: **This text is the _most important thing ever_** +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 <<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f @@ -179,16 +202,25 @@ You can mark up text with bold, italics, or strikethrough. ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks ======= +======= +<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks <<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e =======   >>>>>>> Add documentation for using Markdown in Pagure +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 >>>>>>> Add documentation for using Markdown in Pagure +======= +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Quoting You can show text as being quoted with the `>` character. +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 <<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f @@ -238,6 +270,12 @@ Install the needed system libraries: ~~~~ sudo dnf install git python-virtualenv libgit2-devel \ libjpeg-devel gcc libffi-devel redhat-rpm-config +======= +<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 +<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ~~~~ @@ -287,6 +325,7 @@ Install the needed system libraries: sudo dnf install git python-virtualenv libgit2-devel \ libjpeg-devel gcc libffi-devel redhat-rpm-config ~~~~ +<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 ## Hyperlinks @@ -354,55 +393,62 @@ Need to embed a link to somewhere else? No problem! You can create an in-line li > program since we removed that a few versions ago.   +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks Before merging this pull request, remember Clark Kent mentioned this: -> Double-check there's no reference to the Kryptonite library in the -> program since we removed that a few versions ago. +> Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago. -  ## Code -You can highlight parts of a line as code or create entire code blocks in -your Markdown documents. Text inside of backticks will not be formatted. - -
When running the program for the first time, use `superman --initialize`.
+You can highlight parts of a line as code or create entire code blocks in your Markdown documents. You can do this with the backtick character (`). Text inside of backticks will not be formatted. +~~~~ When running the program for the first time, use `superman --initialize`. +~~~~ -  +When running the program for the first time, use `superman --initialize`. -To format multiple lines of code into its own block, you will need to use -raw HTML with the ‹pre›‹/pre› tags. +To format multiple lines of code into its own block, you can wrap the text block with four tilde (~) characters -
Install the needed system libraries:
-‹pre›
+~~~~
+Install the needed system libraries:
+`~~~~`
 sudo dnf install git python-virtualenv libgit2-devel \
                  libjpeg-devel gcc libffi-devel redhat-rpm-config
-‹pre›
+`~~~~` +~~~~ -  Install the needed system libraries: -
+
+~~~~
 sudo dnf install git python-virtualenv libgit2-devel \
                  libjpeg-devel gcc libffi-devel redhat-rpm-config
-
+~~~~ -  ## Hyperlinks +<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 Need to embed a link to somewhere else? No problem! You can create an in- line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. >>>>>>> Add documentation for using Markdown in Pagure +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 >>>>>>> Add documentation for using Markdown in Pagure +======= +======= +Need to embed a link to somewhere else? No problem! You can create an in-line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks `Pagure is used by the [Fedora Project](https://fedoraproject.org).` Pagure is used by the [Fedora Project](https://fedoraproject.org). +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 <<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f @@ -440,6 +486,9 @@ You can make unordered lists spanning multiple lines with either `-` or `*`. ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks ======= +======= +<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks <<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e >>>>>>> Add documentation for using Markdown in Pagure @@ -460,19 +509,31 @@ You can make unordered lists spanning multiple lines with either `-` or `*`. ======= =======   +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Lists -You can make unordered lists spanning multiple lines with either `-` or -`*`. +#### Unordered lists +<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 
* Superman
 >>>>>>> Add documentation for using Markdown in Pagure
+<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883
 >>>>>>> Add documentation for using Markdown in Pagure
+=======
+=======
+You can make unordered lists spanning multiple lines with either `-` or `*`.
+
+~~~~
+* Superman
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 * Batman
     * Protector of Gotham City!
 * Superwoman
 * Harley Quinn
+<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883
 <<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da
 <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
@@ -495,13 +556,23 @@ You can make unordered lists spanning multiple lines with either `-` or
 ~~~~
 >>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 =======
+=======
+<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 <<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e
     * Something on this list is unlike the others...
 ~~~~
 =======
     * Something on this list is unlike the others...
>>>>>>> Add documentation for using Markdown in Pagure +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 >>>>>>> Add documentation for using Markdown in Pagure +======= +======= + * Something on this list is unlike the others... +~~~~ +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks * Superman * Batman @@ -510,6 +581,7 @@ You can make unordered lists spanning multiple lines with either `-` or * Harley Quinn * Something on this list is unlike the others... +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 <<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f @@ -543,6 +615,9 @@ You can make ordered lists by preceding each line with a number. >>>>>>> Add documentation for using Markdown in Pagure ======= ======= +======= +<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks <<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e >>>>>>> Add documentation for using Markdown in Pagure #### Ordered lists @@ -561,13 +636,25 @@ You can make ordered lists by preceding each line with a number. 
1. Superman
 >>>>>>> Add documentation for using Markdown in Pagure
+<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883
 >>>>>>> Add documentation for using Markdown in Pagure
+=======
+=======
+#### Ordered lists
+
+You can make ordered lists by preceding each line with a number.
+
+~~~~
+1. Superman
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 2. Batman
     1. Protector of Gotham City!
     2. He drives the Batmobile!
 3. Superwoman
 4. Harley Quinn
     1. Something on this list is unlike the others...
+<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883
 <<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da
 <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
@@ -590,13 +677,23 @@ You can make ordered lists by preceding each line with a number.
 ~~~~
 >>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 =======
+=======
+<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 <<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e
     2. Somebody evil lurks on this list!
 ~~~~
 =======
     2. Somebody evil lurks on this list!
>>>>>>> Add documentation for using Markdown in Pagure +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 >>>>>>> Add documentation for using Markdown in Pagure +======= +======= + 2. Somebody evil lurks on this list! +~~~~ +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks 1. Superman 2. Batman @@ -607,12 +704,16 @@ You can make ordered lists by preceding each line with a number. 1. Something on this list is unlike the others... 2. Somebody evil lurks on this list! +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 <<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ======= +======= +<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks <<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e >>>>>>> Add documentation for using Markdown in Pagure @@ -637,6 +738,7 @@ If you need to tag an issue or pull request that is outside of the current proje Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. =======   +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 <<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da ======= >>>>>>> Update file based on hotfix to staging, update documentation for code blocks @@ -686,40 +788,34 @@ If you need to tag an issue or pull request that is outside of the current proje <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf >>>>>>> Add documentation for using Markdown in Pagure ======= +======= +======= +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Tagging users -You can tag other users on Pagure to send them a notification about an -issue or pull request. To tag a user, use the `@` symbol followed by their -username. Typing the `@` symbol in a comment will bring up a list of users -that match the username. The list searches as you type. Once you see the -name of the person you are looking for, you can click their name to -automatically complete the tag. +You can tag other users on Pagure to send them a notification about an issue or pull request. To tag a user, use the `@` symbol followed by their username. Typing the `@` symbol in a comment will bring up a list of users that match the username. The list searches as you type. Once you see the name of the person you are looking for, you can click their name to automatically complete the tag. `@jflory7, could you please review this pull request and leave feedback?` -[@jflory7](https://pagure.io/user/jflory7), could you please review this -pull request and leave feedback? +[@jflory7](https://pagure.io/user/jflory7), could you please review this pull request and leave feedback? -  ## Tagging issues or pull requests -In a comment, you can automatically link a pull request or issue by its -number. To link it, use the `#` character followed by its number. Like -with tagging users, Pagure will provide suggestions for issues or pull -requests as you type the number. You can select the issue in the drop-down -to automatically tag the issue or pull request. +In a comment, you can automatically link a pull request or issue by its number. To link it, use the `#` character followed by its number. Like with tagging users, Pagure will provide suggestions for issues or pull requests as you type the number. You can select the issue in the drop-down to automatically tag the issue or pull request. -If you need to tag an issue or pull request that is outside of the current -project, you are also able to do this. For cross-projects links, you can -tag them by typing `#id` or `/#id`. +If you need to tag an issue or pull request that is outside of the current project, you are also able to do this. For cross-projects links, you can tag them by typing `#id` or `/#id`. -  ## Emoji +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 >>>>>>> Add documentation for using Markdown in Pagure +======= +<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If @@ -739,11 +835,15 @@ Pagure natively supports emoji characters. To use emoji, you can use two colons ======= >>>>>>> Add documentation for using Markdown in Pagure >>>>>>> Add documentation for using Markdown in Pagure +======= +Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks `I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper:` I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper: +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 <<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da <<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f @@ -775,6 +875,9 @@ Notice anything that can be improved in this documentation? Find a mistake? You >>>>>>> Add documentation for using Markdown in Pagure ======= ======= +======= +<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks <<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e >>>>>>> Add documentation for using Markdown in Pagure @@ -793,4 +896,13 @@ Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). >>>>>>> Add documentation for using Markdown in Pagure +<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 >>>>>>> Add documentation for using Markdown in Pagure +======= +======= + +## Improve this documentation! + +Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks +>>>>>>> Update file based on hotfix to staging, update documentation for code blocks From a8be13bd4fdf6f6195cb87d8ff42efcad760cab1 Mon Sep 17 00:00:00 2001 From: Justin W. Flory Date: Oct 28 2016 09:30:47 +0000 Subject: [PATCH 14/14] Let's try this one more time (fix merge issues) --- diff --git a/doc/usage/markdown.md b/doc/usage/markdown.md index 41d29d5..420dc63 100644 --- a/doc/usage/markdown.md +++ b/doc/usage/markdown.md @@ -1,25 +1,7 @@ Using Markdown in Pagure ======================== -<<<<<<< ec0860623a3726b654c4ad94ab755cf250ed73c6 -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da -<<<<<<< 554748685c760f70e542cdc05dc5373b56de5348 -<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f -<<<<<<< bf156df08f90f220fdfa78462558ae94ee175a67 -<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 -======= -======= -<<<<<<< 263c38469dae0fae410763fd9771669806f85a2c ->>>>>>> Include cross-project tagging in markdown doc -<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e ->>>>>>> Add documentation for using Markdown in Pagure Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) as the base for formatting comments in issues, pull requests, and in Markdown files in repositories. For basic formatting, Pagure follows common Markdown formatting, but it also has some unique syntax for more advanced formatting. This help page helps demonstrate how to use Markdown in Pagure. -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 -<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf -<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd -======= -<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Headers @@ -31,99 +13,6 @@ To create headings, you will use the `#` symbol before the text. The number of h ## header2 ### header3 ~~~~ -======= -<<<<<<< ec0860623a3726b654c4ad94ab755cf250ed73c6 -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da -======= - ->>>>>>> Include cross-project tagging in markdown doc -======= ->>>>>>> Add documentation for using Markdown in Pagure -======= - ->>>>>>> Include cross-project tagging in markdown doc -======= ->>>>>>> Add documentation for using Markdown in Pagure -======= -======= - ->>>>>>> Include cross-project tagging in markdown doc ->>>>>>> Include cross-project tagging in markdown doc -Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) -as the base for formatting comments in issues, pull requests, and in -Markdown files in repositories. For basic formatting, Pagure follows -common Markdown formatting, but it also has some unique syntax for more -advanced formatting. This help page helps demonstrate how to use Markdown -in Pagure. -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da -<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks - - -## Headers - -To create headings, you will use the `#` symbol before the text. The number of hashes before the text determines the header size. - -~~~~ -# header1 -## header2 -<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd -======= -======= -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks - - -## Headers - -To create headings, you will use the `#` symbol before the text. The number of hashes before the text determines the header size. - -~~~~ -# header1 -## header2 -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 ->>>>>>> Add documentation for using Markdown in Pagure -### header3 - -
->>>>>>> Add documentation for using Markdown in Pagure -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da -======= -### header3 -~~~~ ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -======= -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks - - -## Headers - -To create headings, you will use the `#` symbol before the text. The number of hashes before the text determines the header size. - -~~~~ -# header1 -## header2 -<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf -======= -<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -### header3 - -
->>>>>>> Add documentation for using Markdown in Pagure -======= -### header3 -~~~~ ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 -======= ->>>>>>> Add documentation for using Markdown in Pagure -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks # header 1 @@ -131,38 +20,6 @@ To create headings, you will use the `#` symbol before the text. The number of h ### header3 -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da -<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf -<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f -<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd -<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 -======= -======= -<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e ->>>>>>> Add documentation for using Markdown in Pagure -======= -
- -  ->>>>>>> Add documentation for using Markdown in Pagure -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -======= -
- -  ->>>>>>> Add documentation for using Markdown in Pagure -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 -======= ->>>>>>> Add documentation for using Markdown in Pagure -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Styling @@ -185,217 +42,16 @@ You can mark up text with bold, italics, or strikethrough. * Example: `**This text is the _most important thing ever_**` * Output: **This text is the _most important thing ever_** -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da -<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf -<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f -<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd -<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 -======= -  ->>>>>>> Add documentation for using Markdown in Pagure -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -======= -  ->>>>>>> Add documentation for using Markdown in Pagure -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -======= -======= -<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e -======= -  ->>>>>>> Add documentation for using Markdown in Pagure -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 ->>>>>>> Add documentation for using Markdown in Pagure -======= -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks ## Quoting You can show text as being quoted with the `>` character. -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da -<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf -<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f -<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd -<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -======= -<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e ->>>>>>> Add documentation for using Markdown in Pagure -~~~~ -Before merging this pull request, remember Clark Kent mentioned this: -> Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago. -~~~~ -<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf -<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd - -Before merging this pull request, remember Clark Kent mentioned this: -> Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago. - - -## Code - -You can highlight parts of a line as code or create entire code blocks in your Markdown documents. You can do this with the backtick character (`). Text inside of backticks will not be formatted. - -~~~~ -When running the program for the first time, use `superman --initialize`. -~~~~ - -When running the program for the first time, use `superman --initialize`. - -To format multiple lines of code into its own block, you can wrap the text block with four tilde (~) characters - -~~~~ -Install the needed system libraries: -`~~~~` -sudo dnf install git python-virtualenv libgit2-devel \ - libjpeg-devel gcc libffi-devel redhat-rpm-config -`~~~~` -~~~~ - - -Install the needed system libraries: - -~~~~ -sudo dnf install git python-virtualenv libgit2-devel \ - libjpeg-devel gcc libffi-devel redhat-rpm-config -======= -<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 -<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -~~~~ - - -## Hyperlinks - -Need to embed a link to somewhere else? No problem! You can create an in-line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. -======= -======= ->>>>>>> Add documentation for using Markdown in Pagure -
Before merging this pull request, remember Clark Kent mentioned this:
-> Double-check there's no reference to the Kryptonite library in the
-> program since we removed that a few versions ago.
- -  -<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks - -Before merging this pull request, remember Clark Kent mentioned this: -> Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago. - - -## Code - -You can highlight parts of a line as code or create entire code blocks in your Markdown documents. You can do this with the backtick character (`). Text inside of backticks will not be formatted. - -~~~~ -When running the program for the first time, use `superman --initialize`. -~~~~ - -When running the program for the first time, use `superman --initialize`. - -To format multiple lines of code into its own block, you can wrap the text block with four tilde (~) characters - -~~~~ -Install the needed system libraries: -`~~~~` -sudo dnf install git python-virtualenv libgit2-devel \ - libjpeg-devel gcc libffi-devel redhat-rpm-config -`~~~~` -~~~~ - - -Install the needed system libraries: - ~~~~ -sudo dnf install git python-virtualenv libgit2-devel \ - libjpeg-devel gcc libffi-devel redhat-rpm-config -~~~~ -<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 - - -## Hyperlinks - -<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd -Need to embed a link to somewhere else? No problem! You can create an in- -line link by wrapping the text in `[ ]` and appending the the URL in -parentheses `( )` immediately after. ->>>>>>> Add documentation for using Markdown in Pagure -======= -Need to embed a link to somewhere else? No problem! You can create an in-line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -======= -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks - Before merging this pull request, remember Clark Kent mentioned this: > Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago. - - -## Code - -You can highlight parts of a line as code or create entire code blocks in your Markdown documents. You can do this with the backtick character (`). Text inside of backticks will not be formatted. - -~~~~ -When running the program for the first time, use `superman --initialize`. -~~~~ - -When running the program for the first time, use `superman --initialize`. - -To format multiple lines of code into its own block, you can wrap the text block with four tilde (~) characters - -~~~~ -Install the needed system libraries: -`~~~~` -sudo dnf install git python-virtualenv libgit2-devel \ - libjpeg-devel gcc libffi-devel redhat-rpm-config -`~~~~` -~~~~ - - -Install the needed system libraries: - -~~~~ -sudo dnf install git python-virtualenv libgit2-devel \ - libjpeg-devel gcc libffi-devel redhat-rpm-config ~~~~ - -## Hyperlinks - -<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf -Need to embed a link to somewhere else? No problem! You can create an in- -line link by wrapping the text in `[ ]` and appending the the URL in -parentheses `( )` immediately after. ->>>>>>> Add documentation for using Markdown in Pagure -======= -Need to embed a link to somewhere else? No problem! You can create an in-line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -======= -======= -
Before merging this pull request, remember Clark Kent mentioned this:
-> Double-check there's no reference to the Kryptonite library in the
-> program since we removed that a few versions ago.
- -  -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks - Before merging this pull request, remember Clark Kent mentioned this: > Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago. @@ -431,29 +87,12 @@ sudo dnf install git python-virtualenv libgit2-devel \ ## Hyperlinks -<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 -Need to embed a link to somewhere else? No problem! You can create an in- -line link by wrapping the text in `[ ]` and appending the the URL in -parentheses `( )` immediately after. ->>>>>>> Add documentation for using Markdown in Pagure -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 ->>>>>>> Add documentation for using Markdown in Pagure -======= -======= Need to embed a link to somewhere else? No problem! You can create an in-line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after. ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks `Pagure is used by the [Fedora Project](https://fedoraproject.org).` Pagure is used by the [Fedora Project](https://fedoraproject.org). -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da -<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf -<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f -<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd -<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 ## Lists @@ -463,116 +102,12 @@ You can make unordered lists spanning multiple lines with either `-` or `*`. ~~~~ * Superman -======= -  -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks - -## Lists - -#### Unordered lists - -<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd -
* Superman
->>>>>>> Add documentation for using Markdown in Pagure
-=======
-You can make unordered lists spanning multiple lines with either `-` or `*`.
-
-~~~~
-* Superman
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
-=======
- 
-=======
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
-=======
-=======
-<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
-<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e
->>>>>>> Add documentation for using Markdown in Pagure
-
-## Lists
-
-#### Unordered lists
-
-<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
-
* Superman
->>>>>>> Add documentation for using Markdown in Pagure
-=======
-You can make unordered lists spanning multiple lines with either `-` or `*`.
-
-~~~~
-* Superman
-<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
-=======
-=======
- 
-=======
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
-
-## Lists
-
-#### Unordered lists
-
-<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559
-
* Superman
->>>>>>> Add documentation for using Markdown in Pagure
-<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883
->>>>>>> Add documentation for using Markdown in Pagure
-=======
-=======
-You can make unordered lists spanning multiple lines with either `-` or `*`.
-
-~~~~
-* Superman
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 * Batman
     * Protector of Gotham City!
 * Superwoman
 * Harley Quinn
-<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883
-<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da
-<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
-<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
-<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
-<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
-    * Something on this list is unlike the others...
-~~~~
-=======
-    * Something on this list is unlike the others...

->>>>>>> Add documentation for using Markdown in Pagure
-=======
     * Something on this list is unlike the others...
 ~~~~
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
-=======
-    * Something on this list is unlike the others...

->>>>>>> Add documentation for using Markdown in Pagure
-=======
-    * Something on this list is unlike the others...
-~~~~
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
-=======
-=======
-<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
-<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e
-    * Something on this list is unlike the others...
-~~~~
-=======
-    * Something on this list is unlike the others...
->>>>>>> Add documentation for using Markdown in Pagure -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 ->>>>>>> Add documentation for using Markdown in Pagure -======= -======= - * Something on this list is unlike the others... -~~~~ ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks * Superman * Batman @@ -581,119 +116,20 @@ You can make unordered lists spanning multiple lines with either `-` or `*`. * Harley Quinn * Something on this list is unlike the others... -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da -<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf -<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f -<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd -<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 -#### Ordered lists - -You can make ordered lists by preceding each line with a number. - -~~~~ -1. Superman -======= -======= ->>>>>>> Add documentation for using Markdown in Pagure -  - -You can make ordered lists by preceding each line with a number. - -
1. Superman
-<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
->>>>>>> Add documentation for using Markdown in Pagure
-=======
-#### Ordered lists
-
-You can make ordered lists by preceding each line with a number.
-
-~~~~
-1. Superman
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
-=======
->>>>>>> Add documentation for using Markdown in Pagure
-=======
-=======
-=======
-<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
-<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e
->>>>>>> Add documentation for using Markdown in Pagure
-#### Ordered lists
-
-You can make ordered lists by preceding each line with a number.
-
-~~~~
-1. Superman
-<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
-=======
-=======
- 
-
-You can make ordered lists by preceding each line with a number.
-
-
1. Superman
->>>>>>> Add documentation for using Markdown in Pagure
-<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883
->>>>>>> Add documentation for using Markdown in Pagure
-=======
-=======
 #### Ordered lists
 
 You can make ordered lists by preceding each line with a number.
 
 ~~~~
 1. Superman
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 2. Batman
     1. Protector of Gotham City!
     2. He drives the Batmobile!
 3. Superwoman
 4. Harley Quinn
     1. Something on this list is unlike the others...
-<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883
-<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da
-<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
-<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
-<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
-<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
-    2. Somebody evil lurks on this list!
-~~~~
-=======
-    2. Somebody evil lurks on this list!

->>>>>>> Add documentation for using Markdown in Pagure
-=======
-    2. Somebody evil lurks on this list!
-~~~~
->>>>>>> Update file based on hotfix to staging, update documentation for code blocks
-=======
-    2. Somebody evil lurks on this list!
->>>>>>> Add documentation for using Markdown in Pagure -======= - 2. Somebody evil lurks on this list! -~~~~ ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -======= -======= -<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e 2. Somebody evil lurks on this list! ~~~~ -======= - 2. Somebody evil lurks on this list! ->>>>>>> Add documentation for using Markdown in Pagure -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 ->>>>>>> Add documentation for using Markdown in Pagure -======= -======= - 2. Somebody evil lurks on this list! -~~~~ ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks 1. Superman 2. Batman @@ -704,18 +140,6 @@ You can make ordered lists by preceding each line with a number. 1. Something on this list is unlike the others... 2. Somebody evil lurks on this list! -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da -<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf -<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f -<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd -<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 -======= -======= -<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e ->>>>>>> Add documentation for using Markdown in Pagure ## Tagging users @@ -736,173 +160,12 @@ If you need to tag an issue or pull request that is outside of the current proje ## Emoji Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. -======= -  -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks - -## Tagging users - -You can tag other users on Pagure to send them a notification about an issue or pull request. To tag a user, use the `@` symbol followed by their username. Typing the `@` symbol in a comment will bring up a list of users that match the username. The list searches as you type. Once you see the name of the person you are looking for, you can click their name to automatically complete the tag. - -`@jflory7, could you please review this pull request and leave feedback?` - -[@jflory7](https://pagure.io/user/jflory7), could you please review this pull request and leave feedback? - - -## Tagging issues or pull requests - -In a comment, you can automatically link a pull request or issue by its number. To link it, use the `#` character followed by its number. Like with tagging users, Pagure will provide suggestions for issues or pull requests as you type the number. You can select the issue in the drop-down to automatically tag the issue or pull request. - -If you need to tag an issue or pull request that is outside of the current project, you are also able to do this. For cross-projects links, you can tag them by typing `#id` or `/#id`. - - -## Emoji - -<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd -======= -  -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks - -## Tagging users - -You can tag other users on Pagure to send them a notification about an issue or pull request. To tag a user, use the `@` symbol followed by their username. Typing the `@` symbol in a comment will bring up a list of users that match the username. The list searches as you type. Once you see the name of the person you are looking for, you can click their name to automatically complete the tag. - -`@jflory7, could you please review this pull request and leave feedback?` - -[@jflory7](https://pagure.io/user/jflory7), could you please review this pull request and leave feedback? - - -## Tagging issues or pull requests - -In a comment, you can automatically link a pull request or issue by its number. To link it, use the `#` character followed by its number. Like with tagging users, Pagure will provide suggestions for issues or pull requests as you type the number. You can select the issue in the drop-down to automatically tag the issue or pull request. - -If you need to tag an issue or pull request that is outside of the current project, you are also able to do this. For cross-projects links, you can tag them by typing `#id` or `/#id`. - - -## Emoji - -<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf ->>>>>>> Add documentation for using Markdown in Pagure -======= -======= -======= ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks - -## Tagging users - -You can tag other users on Pagure to send them a notification about an issue or pull request. To tag a user, use the `@` symbol followed by their username. Typing the `@` symbol in a comment will bring up a list of users that match the username. The list searches as you type. Once you see the name of the person you are looking for, you can click their name to automatically complete the tag. - -`@jflory7, could you please review this pull request and leave feedback?` - -[@jflory7](https://pagure.io/user/jflory7), could you please review this pull request and leave feedback? - - -## Tagging issues or pull requests - -In a comment, you can automatically link a pull request or issue by its number. To link it, use the `#` character followed by its number. Like with tagging users, Pagure will provide suggestions for issues or pull requests as you type the number. You can select the issue in the drop-down to automatically tag the issue or pull request. - -If you need to tag an issue or pull request that is outside of the current project, you are also able to do this. For cross-projects links, you can tag them by typing `#id` or `/#id`. - - -## Emoji - -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 ->>>>>>> Add documentation for using Markdown in Pagure -======= -<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -Pagure natively supports emoji characters. To use emoji, you can use two -colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by -itself will bring up a list of suggested emoji with a small preview. If -you see the one you're looking for, you can click it to automatically -complete the emoji. -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da -<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f ->>>>>>> Add documentation for using Markdown in Pagure -======= -Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -======= ->>>>>>> Add documentation for using Markdown in Pagure -======= -Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -======= ->>>>>>> Add documentation for using Markdown in Pagure ->>>>>>> Add documentation for using Markdown in Pagure -======= -Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji. ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks `I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper:` I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper: -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da -<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf -<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f -<<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd -<<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1 - -## Improve this documentation! - -Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). -======= -======= ->>>>>>> Add documentation for using Markdown in Pagure -  - -## Improve this documentation! - -Notice anything that can be improved in this documentation? Find a -mistake? You can improve this page! Find it in the official [Pagure -repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). -<<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f ->>>>>>> Add documentation for using Markdown in Pagure -======= - -## Improve this documentation! - -Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -======= ->>>>>>> Add documentation for using Markdown in Pagure -======= -======= -======= -<<<<<<< c6b4762f6ba76b2d903aaa3ac3938c557d2c9559 ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -<<<<<<< a1b2164b3344830e82cc7e2d76734582ae511d3e ->>>>>>> Add documentation for using Markdown in Pagure - -## Improve this documentation! - -Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). -<<<<<<< 528343f4c9211d8a01eca7650f807fc2470317da ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks -======= -======= -  - -## Improve this documentation! - -Notice anything that can be improved in this documentation? Find a -mistake? You can improve this page! Find it in the official [Pagure -repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). ->>>>>>> Add documentation for using Markdown in Pagure -<<<<<<< 09ad2ef358263c11d3da7fce88a16bc1c5746883 ->>>>>>> Add documentation for using Markdown in Pagure -======= -======= ## Improve this documentation! Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md). ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks ->>>>>>> Update file based on hotfix to staging, update documentation for code blocks