Cacti / documentation

Documentation for Cacti, Spine, RRDProxy and more
62 stars 52 forks source link

Issue#6 How-to-Graph-Your-Network.md #9

Closed jpobeda closed 6 years ago

jpobeda commented 6 years ago

Missing tables 7-1 and 7-2. Let's take this one as a test.

I'm still getting these. I think Mark said something around the ###### but the length thing, remind what should be the width?

[root@cacti12 documentation-develop]# ./check_markdown_style.sh
./How-to-Graph-Your-Network.md:19: MD003 Header style
./How-to-Graph-Your-Network.md:50: MD003 Header style
./How-to-Graph-Your-Network.md:56: MD003 Header style
./How-to-Graph-Your-Network.md:4: MD013 Line length
./How-to-Graph-Your-Network.md:6: MD013 Line length
./How-to-Graph-Your-Network.md:11: MD013 Line length
./How-to-Graph-Your-Network.md:13: MD013 Line length
./How-to-Graph-Your-Network.md:46: MD013 Line length
./How-to-Graph-Your-Network.md:48: MD013 Line length
./How-to-Graph-Your-Network.md:52: MD013 Line length
./How-to-Graph-Your-Network.md:54: MD013 Line length
netniV commented 6 years ago

Bookmark this page: https://github.com/Cacti/documentation/blob/develop/Documentation-Standards.md and note that I added those above two markdown error codes so you can find the relevant requirement.

jpobeda commented 6 years ago

We should be good now.

jpobeda commented 6 years ago

Has the explanation of SNMP V3 Options moved to another location? The rest of the changes looks good but I think you've got some conflicts due to updates on our develop branch.

Interesting =^D

I put it back plus split SNMPv3 options onto a different table.

netniV commented 6 years ago

OK, just review the conflicts and see what needs sorting, then we should be good to go.

jpobeda commented 6 years ago

oh dear, missed 1 more line. Copyright (c) 2018 Cacti Group

netniV commented 6 years ago

Hi Javier,

For some reason, you have a lot of missing changes in your local repo as it's five weeks out of date. So, when attempting to push up this change, I am unable to merge the changes. If you are using the command line to manage your repo, you will need to do the following (the first line you may have already done):

  1. Add the upstream repository
    git remote add upstream https://github.com/cacti/documentation
  2. Update your internal development version before creating a new branch
    git branch develop
    git fetch upstream develop
    git rebase upstream/develop
  3. If you already have a branch perform the above, but replace the develop on the git branch line with the branch you are trying to update.

However, if you try this you'll end up in a bit of a pickle because the three-way merge will fail due to the fact that you have made changes on your develop branch directly. To fix that, you will first need to do the following after copying How-to-Graph-Your-Network.md to another location:

git checkout develop
git reset HEAD~1
git push -f

Then perform the above rebase, copy the file back, commit, push and this PR should hopefully self update. Otherwise we'll need to create a new one. I would advise to create a branch for each change though so that you can be modifying different sections without affecting individual PRs

jpobeda commented 6 years ago

OK, I've got a backup of this. I'll get my sh*** together and start over.