From 73c493f59c9ceb30791cd4a9b4415fbc376d9641 Mon Sep 17 00:00:00 2001 From: kamontre Date: Tue, 26 Jan 2016 11:17:42 -0800 Subject: [PATCH] update read me --- README.md | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 4a1b6e4..a0d88ad 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Feel free to contribute directly, or post a request or correction in the Issue T 1. To contribute, fork then clone this project. 2. Consider these guidelines: -<<<<<<< HEAD + - Use a descriptive title, one main topic per page. - Keep the content relevant to the title. If you find you have a lot of side notes and extraneous information, consider creating another topic. - State the most important content first. @@ -60,8 +60,7 @@ Feel free to contribute directly, or post a request or correction in the Issue T - **PASSIVE**. The feedthrough was composed of a sapphire optical fiber, which was pressed against the pyrotechnic that was used to confine the charge. - **ACTIVE**. The feedthrough contained a sapphire optical fiber, which pressed against the pyrotechnic containing the charge. 5. Avoid jargon. - 6. Test out the instructions yourself. Ensure the steps are complete (but brief!). -======= + 6. Test out the instructions yourself. Ensure the steps are complete (but brief!). - Use a descriptive title, one main topic per page. - Keep the content relevant to the title. If you find you have a lot of side notes and extraneous information, consider creating another topic. - State the most important content first. @@ -72,7 +71,8 @@ Feel free to contribute directly, or post a request or correction in the Issue T - **ACTIVE**. The feedthrough contained a sapphire optical fiber, which pressed against the pyrotechnic containing the charge. 5. Avoid jargon. 6. Test out the instructions yourself. Ensure the steps are complete (but brief!). ->>>>>>> master + + See the Official Cisco Technical Content Style Guide for more detailed direction. 3. When finished, commit then push to the Master. @@ -80,11 +80,5 @@ Feel free to contribute directly, or post a request or correction in the Issue T ## Open source licensing info -<<<<<<< HEAD - -1. TERMS -======= - 1. TERMS ->>>>>>> master 2. LICENSE