diff --git a/README.md b/README.md index 12f799c92..e2dd385b5 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ If you made some changes before making a branch (you are on branch **main** and git switch -c your-branch-name ``` -Next you can start editing documentation and saving files using your favorite text editor (Visual Studio Code, Atom, Sublime Text, Brackets Notedpad++, etc). When you are done with your changes you can verify the modified files. Some code editors will actually show a status of the modified files in their UI. If you want to verify it using the command line you can run the following command: +Next you can start editing documentation and saving files using your favorite text editor (Visual Studio Code, Atom, Sublime Text, Brackets/Phoenix Code, Notepad++, etc). When you are done with your changes you can verify the modified files. Some code editors will actually show a status of the modified files in their UI. If you want to verify it using the command line you can run the following command: ``` git status @@ -122,7 +122,8 @@ Congratulations, you have created your first commit! The next step is to push yo git push -u origin your-branch-name ``` -Now your changes are available in your **fork** of the repository for anyone to view. Remember how you only have read access to the **upstream** (or offical repository)? Since we cannot push there, they need to pull. The next and last step is to propose your changes, or in other works, request from DNNDocs team to **pull** your changes, hence the name **pull request**. You can create a **pull request** directly in the browser, if you navigate the the origin or the upstream repositories any soon, you will see a banner showing the recent pushes and a button to create a pull request. If for some reason you do not see that banner, navigate to your fork and select your branch in the branches dropdown, you will see a "Create Pull Request" button. +Now your changes are available in your **fork** of the repository for anyone to view. Remember how you only have read access to the **upstream** (or offical repository)? Since we cannot push there, they need to pull. The next and last step is to propose your changes, or in other works, request the DNNDocs team to **pull** your changes, hence the name **pull request**. You can create a **pull request** directly in the browser, if you navigate to the origin or the upstream repositories soon you will see a banner showing the recent pushes and a button to create a pull request. If for some reason you do not see that banner, navigate to your fork and select your branch in the branches dropdown, you will see a "Create Pull Request" button. +![Create Pull Request Button](/images/GitHub_InBrowser_PullRequestButton.jpg) **Congratulations, you just created your first pull request!** diff --git a/content/getting-started/contribution/dnn-docs/get-dnn-docs-running-locally/index.md b/content/getting-started/contribution/dnn-docs/get-dnn-docs-running-locally/index.md index 1295aa0a3..4eee731b6 100644 --- a/content/getting-started/contribution/dnn-docs/get-dnn-docs-running-locally/index.md +++ b/content/getting-started/contribution/dnn-docs/get-dnn-docs-running-locally/index.md @@ -2,20 +2,24 @@ uid: get-dnn-docs-running-locally locale: en title: Get DNN Docs Running Locally -dnnversion: 09.02.00 +dnnversion: 10.02.00 --- # Get DNN Docs Running Locally The project uses the `docfx` library to pull XML comments from the DNN Platform source code and combine that with articles written in Markdown to form the documentation for DNN. -## Installing Git +This page first explains how to use Git in contributing to DNN Docs. The second and last part does the same for Visual Studio. + +## Using Git + +### Installing Git If you do not have Git installed you will need to install Git first. You can find instructions on installing Git from [here](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) -## Installing dotnet +### Installing dotnet Our cross-platform build scripts handle obtaining docfx for you, however you will need to have the latest .net SDK installed. [Download .NET](https://dotnet.microsoft.com/en-us/download) -## Setting Up the DNN Docs Project +### Setting Up the DNN Docs Project The next step is to clone this repo. 'Cloning the repo' will simply create a copy of the repo (files and folders) on your local machine so that you can work with them. Note the following example command clones the repo to the location of `c:\dev`. Update the `c:\dev` location to your location of choice on your machine. @@ -28,7 +32,7 @@ The previous command will have created a folder called `DNNDocs` in the `c:\dev` c:\dev> cd DNNDocs ``` -## Running the DNN Docs Project Locally +### Running the DNN Docs Project Locally You should now be able to run the development version of the docs locally with the following command: ``` @@ -52,9 +56,29 @@ Open that page up in your browser to see the documentation. [http://localhost:8080](http://localhost:8080) -### Optional git integrations +#### Optional git integrations We use a handful of plugins that will not work unless you have a valid authentication to github REST APIs. This step is optional but if not performed, you won't get some of the features like displaying contributors on pages. If you need to work in that area you will need to [Setup a git personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens). Once that is created, copy your token (you will only view it once) and create a `.env` file at the root of the project with a line like this (everything after the `=` sign is the token you copied). ``` GithubToken=github_pat_xxxxxxxxxx -``` \ No newline at end of file +``` + +## Using Microsoft Visual Studio + +The following tutorial explains how to set DNN Docs Project up locally using Visual Studio 2026. +As 'Repository location' use https://github.com/DNNCommunity/DNNDocs.git +![Repository Location Screenshot](/images/DnnDocs_VS2026_CloneRepository.png) + +- Clone a Git repository in Visual Studio +https://learn.microsoft.com/en-us/visualstudio/version-control/git-clone-repository?view=visualstudio + +Adjust the Push configuration for the DNN Docs Git repository to point to your fork/branch of the DNN Docs repoisitory on Github. Note the part. +![Visual Studio 2026 Commit Changes](/images/DnnDocs_VS2026_ManageRemotes1.png) +![Visual Studio 2026 Commit Changes](/images/DnnDocs_VS2026_ManageRemotes2.png) +![Visual Studio 2026 Commit Changes](/images/DnnDocs_VS2026_ManageRemotes3.png) + +After having set up DNN Docs in the 'Solution Explorer' switch to 'Folder View'. +![Solution Explorer Folder View Screenshot](/images/DnnDocs_VS2026_SolutionExplorer_Views.png) + +Under the 'content' branch / folder you will find (the content of) the DNN Docs. +![Content Folder View Screenshot](/images/DnnDocs_VS2026_SolutionExplorer_FolderView.png) \ No newline at end of file diff --git a/content/getting-started/contribution/dnn-docs/how-to-edit-an-article-in-browser/index.md b/content/getting-started/contribution/dnn-docs/how-to-edit-an-article-in-browser/index.md index 102b30c0b..2d1dd34f6 100644 --- a/content/getting-started/contribution/dnn-docs/how-to-edit-an-article-in-browser/index.md +++ b/content/getting-started/contribution/dnn-docs/how-to-edit-an-article-in-browser/index.md @@ -2,7 +2,7 @@ uid: how-to-edit-an-article-in-browser locale: en title: Edit an Article in the Browser -dnnversion: 09.02.00 +dnnversion: 10.02.00 --- # Edit an Article in the Browser @@ -14,16 +14,16 @@ The easiest way to edit a DNN Doc file is to edit it in the browser on GitHub.co 2. Click the ```Edit``` button icon. -![Edit article in browser](/images/edit-article-in-browser.jpg) +![Edit article in browser](/images/GitHub_InBrowser_EditArticle.jpg) 3. Edit the markdown as needed, opt to "Create a New Branch", and propose the change. -![Edit Markdown in browser](/images/in-browser-pull-request.gif) +![Edit Markdown in browser](/images/GitHub_InBrowser_PullRequest1.gif) 4. Update the title & submit the Pull Request -![Edit Markdown in browser](/images/In-Browser-Pull-Request-2.gif) +![Edit Markdown in browser](/images/GitHub_InBrowser_PullRequest2.gif) diff --git a/content/getting-started/contribution/dnn-docs/how-to-edit-an-article/index.md b/content/getting-started/contribution/dnn-docs/how-to-edit-an-article/index.md index 431c89e09..c3a1e94bd 100644 --- a/content/getting-started/contribution/dnn-docs/how-to-edit-an-article/index.md +++ b/content/getting-started/contribution/dnn-docs/how-to-edit-an-article/index.md @@ -2,11 +2,11 @@ uid: how-to-edit-an-article locale: en title: Edit an Article -dnnversion: 09.02.00 +dnnversion: 10.02.00 related-topics: --- -# Edit an Article +# Edit an Article (running DNN Docs Locally on Your Machine) ## Prerequisites 1. **Get DNN Docs Running Locally**: In order to edit an article you need to get DNN Docs running locally on your machine. Follow the steps on the [Get DNN Docs Running Locally page](xref:get-dnn-docs-running-locally) before proceeding. @@ -14,29 +14,29 @@ related-topics: 2. **Markdown**: Docs uses markdown syntax to format the docs files. Markdown is simple to pick up on. Familiarize yourself with the [Markdown Guide to DocFx](xref:markdown-guide-to-docfx) before making updates to content. -Now that you've gotten DNN Docs running locally (congrats BTW!) we will talk through the steps for making an edit, previewing the edit, pushing it to your forked repo, then creating a Pull Request. +Now that you've gotten DNN Docs running locally (congrats BTW!) we will talk through the steps for making an edit (in your local repo), previewing the (local) edit, pushing it to your forked repo (on the Github.com website), then creating a Pull Request on the Github.com website. First using Git; second using Visual Studio. -## Steps to Edit an Article & Create a Pull Request +## Steps to Edit an Article & Create a Pull Request using Git -1. Fork the [DNN Docs Repo](https://github.com/DNNCommunity/DNNDocs) into your own Repo. - ![Fork DNN Docs Screenshot](/images/fork-screenshot.jpg) +1. Fork the [DNN Docs Repo](https://github.com/DNNCommunity/DNNDocs) into your own Repo on Github. + ![Fork DNN Docs Screenshot](/images/GitHub_InBrowser_ForkDnnDocs.jpg) -2. Set your remote repositories. We will use the terms "upstream" and "origin". When you originally cloned the repo (in the "Getting DNN Docs Running Locally" pre-requisite) the ```origin``` was added for you implicitly. +2. Set your remote repositories. We will use the terms "upstream" and "origin". Note: when you originally cloned the repo locally (in the "Getting DNN Docs Running Locally" pre-requisite) the locally cloned repo was named ```origin``` implicitly (as well). Type ```git remote add upstream https://github.com/DNNCommunity/DNNDocs``` to add the main DNN Docs repo as your "upstream" repo > [!NOTE] > Remotes can be named anything you like. Find out your remotes by typing ```git remote -v``` - Type ```git remote -v``` to list your remotes. If you are new to Git then you should have 2 remotes. Your ```origin``` and ```upstream``` where ```origin``` is your forked repo and your ```upstream``` is the main DNN Docs repo. + Type ```git remote -v``` to list your remotes. If you are new to Git then you should have 2 remotes. Your ```origin``` and ```upstream``` where ```origin``` is your forked repo and your ```upstream``` is the main DNN Docs repo; both on Github. 3. Create an [Issue](https://github.com/DNNCommunity/DNNDocs/issues) on GitHub that corresponds with the edit you're working on by clicking the "New Issue" button in the browser. Be sure to include relevant information providing context to the issue in the description/comment section. This helps reviewers understand what you're working on. Make note of the issue number that GitHub generates. - ![GitHub Issue Screenshot](/images/git-issue-screenshot.jpg) + ![GitHub Issue Screenshot](/images/GitHub_InBrowser_Issue.jpg) 4. Create a new branch for your work. Typically branch names align with the issue number for ease of tracking. @@ -56,16 +56,39 @@ Now that you've gotten DNN Docs running locally (congrats BTW!) we will talk thr 9. Use ```git commit -m [INSERT YOUR COMMIT MESSAGE HERE]``` to commit your files. The ```-m``` stands for "message". Replace the *INSERT YOUR COMMIT MESSAGE HERE* text with brief and relevant text summarizing your commit -10. Use ```git push origin [INSERT A NEW BRANCH NAME HERE]``` to push your updated files to your repo. Replace the *INSERT A NEW BRANCH NAME HERE* with the name of your new branch +10. Use ```git push origin [INSERT A NEW BRANCH NAME HERE]``` to push your updated files to your remote repo (on Github with name ```origin```). Replace the *INSERT A NEW BRANCH NAME HERE* with the name of your new branch. In this example ```issue-107``` +Go to step 11. below. + + +## Steps to Edit an Article & Create a Pull Request using Visual Studio +1. Cloning the repository from Visual Studio, as described on [Get DNN Docs Running Locally page](xref:get-dnn-docs-running-locally), has forked the [DNN Docs Repo](https://github.com/DNNCommunity/DNNDocs) into your own Repo on Github. +2. Step 'Set your remote repositories' is (at this moment) not necessary. +3. Create an [Issue](https://github.com/DNNCommunity/DNNDocs/issues) on GitHub that corresponds with the edit you're working on by clicking the "New Issue" button in the browser. Be sure to include relevant information providing context to the issue in the description/comment section. This helps reviewers understand what you're working on. + + Make note of the issue number that GitHub generates. + + ![GitHub Issue Screenshot](/images/GitHub_InBrowser_Issue.jpg) +4. Create a new branch for your work using Visual Studio menu item 'Git...New Branch..' +![Visual Studio 2026 Create New Branch](/images/DnnDocs_VS2026_CreateNewBranch.png) +For more elaborate instructions on how to create a new branch in Visual Studio see https://learn.microsoft.com/en-us/visualstudio/version-control/git-create-branch?view=visualstudio. +5. Make your edits +6. & 7. & 8. Preview your work and files locally using the 'Git Changes' tab in Visual Studio. +![Visual Studio 2026 Git Changes Tab](/images/DnnDocs_VS2026_GitChangesTab.png) +9. & 10. Commit the changed and added files by clicking 'Commit All and Push'. +![Visual Studio 2026 Commit Changes](/images/DnnDocs_VS2026_GitChanges_CommitAllAndPush.png) + + + +## Common Steps to Edit an Article & Create a Pull Request (for both Git and Visual Studio) 11. Go to your forked GitHub repo on GitHub.com. GitHub should detect the updated code and prompt you to make a pull request. - ![Git compare and pull request screenshot](/images/git-compare-and-pull-request-screenshot.jpg) + ![Git compare and pull request screenshot](/images/GitHub_InBrowser_CompareAndPullRequest.jpg) -12. Create a Pull Request by clicking the "Compare and Create Pull Request" button. In the description/comments section be sure to include the text "Resolves ```#[INSERT ISSUE NUMBER HERE]``` where your previously created issue number is associated with this pull request. +12. Create a Pull Request on Github.com by clicking the "Compare and Create Pull Request" button. In the description/comments section be sure to include the text "Resolves ```#[INSERT ISSUE NUMBER HERE]``` where your previously created issue number is associated with this pull request. - ![Git pull request resolves](/images/git-pull-request-resolves-screenshot.jpg) + ![Git pull request resolves](/images/GitHub_InBrowser_PullRequestResolves.jpg) > [!TIP] -> Want more info on Git? Check out the free, online **[GitBook](https://git-scm.com/book/en/v2)** +> Want more info on Git? Check out the free, online **[GitBook](https://git-scm.com/book/en/v2)** \ No newline at end of file diff --git a/content/getting-started/contribution/index.md b/content/getting-started/contribution/index.md index 177d13921..f2909ae2b 100644 --- a/content/getting-started/contribution/index.md +++ b/content/getting-started/contribution/index.md @@ -2,7 +2,7 @@ uid: getting-started-contribution locale: en title: DNN Contribution -dnnversion: 09.05.00 +dnnversion: 10.02.00 --- # DNN Contribution @@ -15,3 +15,4 @@ Learn the basic steps for [contributing to the **DNN Platform** project on GitHu Learn the basic steps for contributing to the **DNN Docs** project on GitHub, which powers **docs.dnncommunity.org**. Please click the **Improve this Doc** button above to help us improve this page. +![Improve this Doc Screenshot](/images/GitHub_InBrowser_ImproveThisDoc.png) \ No newline at end of file diff --git a/images/DnnDocs_VS2026_CloneRepository.png b/images/DnnDocs_VS2026_CloneRepository.png new file mode 100644 index 000000000..00a4e4e7e Binary files /dev/null and b/images/DnnDocs_VS2026_CloneRepository.png differ diff --git a/images/DnnDocs_VS2026_CreateNewBranch.png b/images/DnnDocs_VS2026_CreateNewBranch.png new file mode 100644 index 000000000..df2a778a5 Binary files /dev/null and b/images/DnnDocs_VS2026_CreateNewBranch.png differ diff --git a/images/DnnDocs_VS2026_GitChangesTab.png b/images/DnnDocs_VS2026_GitChangesTab.png new file mode 100644 index 000000000..058b8c00e Binary files /dev/null and b/images/DnnDocs_VS2026_GitChangesTab.png differ diff --git a/images/DnnDocs_VS2026_GitChanges_CommitAllAndPush.png b/images/DnnDocs_VS2026_GitChanges_CommitAllAndPush.png new file mode 100644 index 000000000..215dd742f Binary files /dev/null and b/images/DnnDocs_VS2026_GitChanges_CommitAllAndPush.png differ diff --git a/images/DnnDocs_VS2026_ManageRemotes1.png b/images/DnnDocs_VS2026_ManageRemotes1.png new file mode 100644 index 000000000..564a9569f Binary files /dev/null and b/images/DnnDocs_VS2026_ManageRemotes1.png differ diff --git a/images/DnnDocs_VS2026_ManageRemotes2.png b/images/DnnDocs_VS2026_ManageRemotes2.png new file mode 100644 index 000000000..2fceae3b7 Binary files /dev/null and b/images/DnnDocs_VS2026_ManageRemotes2.png differ diff --git a/images/DnnDocs_VS2026_ManageRemotes3.png b/images/DnnDocs_VS2026_ManageRemotes3.png new file mode 100644 index 000000000..16f7c1ba6 Binary files /dev/null and b/images/DnnDocs_VS2026_ManageRemotes3.png differ diff --git a/images/DnnDocs_VS2026_SolutionExplorer_FolderView.png b/images/DnnDocs_VS2026_SolutionExplorer_FolderView.png new file mode 100644 index 000000000..572200396 Binary files /dev/null and b/images/DnnDocs_VS2026_SolutionExplorer_FolderView.png differ diff --git a/images/DnnDocs_VS2026_SolutionExplorer_Views.png b/images/DnnDocs_VS2026_SolutionExplorer_Views.png new file mode 100644 index 000000000..0a614063f Binary files /dev/null and b/images/DnnDocs_VS2026_SolutionExplorer_Views.png differ diff --git a/images/git-compare-and-pull-request-screenshot.jpg b/images/GitHub_InBrowser_CompareAndPullRequest.jpg similarity index 100% rename from images/git-compare-and-pull-request-screenshot.jpg rename to images/GitHub_InBrowser_CompareAndPullRequest.jpg diff --git a/images/edit-article-in-browser.jpg b/images/GitHub_InBrowser_EditArticle.jpg similarity index 100% rename from images/edit-article-in-browser.jpg rename to images/GitHub_InBrowser_EditArticle.jpg diff --git a/images/fork-screenshot.jpg b/images/GitHub_InBrowser_ForkDnnDocs.jpg similarity index 100% rename from images/fork-screenshot.jpg rename to images/GitHub_InBrowser_ForkDnnDocs.jpg diff --git a/images/GitHub_InBrowser_ImproveThisDoc.png b/images/GitHub_InBrowser_ImproveThisDoc.png new file mode 100644 index 000000000..dcfff8c08 Binary files /dev/null and b/images/GitHub_InBrowser_ImproveThisDoc.png differ diff --git a/images/git-issue-screenshot.jpg b/images/GitHub_InBrowser_Issue.jpg similarity index 100% rename from images/git-issue-screenshot.jpg rename to images/GitHub_InBrowser_Issue.jpg diff --git a/images/in-browser-pull-request.gif b/images/GitHub_InBrowser_PullRequest1.gif similarity index 100% rename from images/in-browser-pull-request.gif rename to images/GitHub_InBrowser_PullRequest1.gif diff --git a/images/In-Browser-Pull-Request-2.gif b/images/GitHub_InBrowser_PullRequest2.gif similarity index 100% rename from images/In-Browser-Pull-Request-2.gif rename to images/GitHub_InBrowser_PullRequest2.gif diff --git a/images/GitHub_InBrowser_PullRequestButton.jpg b/images/GitHub_InBrowser_PullRequestButton.jpg new file mode 100644 index 000000000..b7df95100 Binary files /dev/null and b/images/GitHub_InBrowser_PullRequestButton.jpg differ diff --git a/images/git-pull-request-resolves-screenshot.jpg b/images/GitHub_InBrowser_PullRequestResolves.jpg similarity index 100% rename from images/git-pull-request-resolves-screenshot.jpg rename to images/GitHub_InBrowser_PullRequestResolves.jpg