6 files changed, 21 insertions, 25 deletions
diff --git a/_ont/ont-cig-g-97cp.md b/_ont/ont-cig-g-97cp.md
index cc280b6..d6169ad 100644
--- a/_ont/ont-cig-g-97cp.md
+++ b/_ont/ont-cig-g-97cp.md
@@ -28,13 +28,9 @@ parent: CIG
 {% include image.html file="cig/cig-1.jpg" alt="CIG G-97CP Unidata" caption="CIG G-97CP Unidata <a href='https://forum.fibra.click/u/papin'>@papin</a>" %} 
 {% include image.html file="cig/cig-2.jpg" alt="CIG G-97CP Unidata" caption="CIG G-97CP Unidata <a href='https://forum.fibra.click/u/papin'>@papin</a>" %}
 
-## Enable password
+{% include_relative ont-nokia-use.md username="ont" alertEnablePassword="The following enable password is used to enter GponCLI via serial connection in in firmware where it is not disabled." %}
 
-{% include alert.html content="The following enable password is used to enter GponCLI via Serial and SSH in Unidata's models." alert="Note" icon="svg-info" color="blue" %}
-
-You can use this tool to generate the enable password:
-
-{% include cig_password.html username="ont" %}
+{% include_relative ont-nokia-useful-command.md %}
 
 # Note
 
diff --git a/_ont/ont-nokia-g-010g-q.md b/_ont/ont-nokia-g-010g-q.md
index f3c8cc3..a393da7 100644
--- a/_ont/ont-nokia-g-010g-q.md
+++ b/_ont/ont-nokia-g-010g-q.md
@@ -69,7 +69,7 @@ A shell-like prompt will be visible:
 ONT>
 ```
 
-{% include_relative ont-nokia-use.md %}
+{% include_relative ont-nokia-use.md username="ONTUSER" %}
 
 {% include_relative ont-nokia-useful-command.md %}
 
diff --git a/_ont/ont-nokia-g-010g-r.md b/_ont/ont-nokia-g-010g-r.md
index 5705855..e2d65d5 100644
--- a/_ont/ont-nokia-g-010g-r.md
+++ b/_ont/ont-nokia-g-010g-r.md
@@ -46,7 +46,7 @@ parent: Nokia
 The ONT has a TTL 3.3v UART console (configured as 115200 8-N-1) that can be accessed from the top surface. To accept TX line commands, the GND of the TTL adapter should be attached to the ONT’s shield like the below photo:
 {% include image.html file="g-010g-r_serial_pinouts.jpg"  alt="Nokia G-010G-R Ports" caption="Nokia G-010G-R Ports" %}
 
-{% include_relative ont-nokia-use.md %}
+{% include_relative ont-nokia-use.md username="ONTUSER" %}
 
 {% include_relative ont-nokia-useful-command.md %}
 
diff --git a/_ont/ont-nokia-g-010g-t.md b/_ont/ont-nokia-g-010g-t.md
index 640aea4..d70ce30 100644
--- a/_ont/ont-nokia-g-010g-t.md
+++ b/_ont/ont-nokia-g-010g-t.md
@@ -55,7 +55,7 @@ The ONT has a TTL 3.3v UART console (configured as 115200 8-N-1) that can be acc
 
 {% include alert.html content="Some USB TTL adapters label TX and RX pins the other way around: try to swap them if the connection doesn't work." alert="Note"  icon="svg-warning" color="yellow" %}
 
-{% include_relative ont-nokia-use.md %}
+{% include_relative ont-nokia-use.md username="ONTUSER" %}
 
 {% include_relative ont-nokia-useful-command.md %}
 
diff --git a/_ont/ont-nokia-use.md b/_ont/ont-nokia-use.md
index c4f0847..5899c57 100644
--- a/_ont/ont-nokia-use.md
+++ b/_ont/ont-nokia-use.md
@@ -1,19 +1,29 @@
 # Usage
+
+{% include alert.html content=include.alertUsage alert="Note" icon="svg-info" color="blue" %}
+
+
+{% unless include.disableEnablePassword==true %}
 ## Login and enable
 
+{% if include.alertEnablePassword  %}
+{% include alert.html content=include.alertEnablePassword alert="Note" icon="svg-info" color="blue" %}
+{% endif %}
 
 Once you're logged in, a custom menu will be shown and you'll be able to access the linux shell by first typing `system` followed by `shell`:
 
 ```sh
 ONT>enable
 #ONT>login
-User name:ONTUSER
+User name:{{include.username}}
 Password: ****
 ```
 
 The enable password can be generated using the following form:
 
-{% include cig_password.html username="ONTUSER" %}
+{% include cig_password.html username=include.username %}
+
+{% endunless  %}
 
 # Accessing Full Shell
 
diff --git a/_ont/ont-zte-f6005.md b/_ont/ont-zte-f6005.md
index 4ea3f1e..1552e80 100644
--- a/_ont/ont-zte-f6005.md
+++ b/_ont/ont-zte-f6005.md
@@ -45,24 +45,14 @@ The ONT has a TTL 3.3v UART console (configured as 115200 8-N-1) that can be acc
 - V6.0.10P2N18 (OpenFiber)
 - V6.0.10P2N19 (OpenFiber)
 
-# Usage
-
-{% include_relative ont-nokia-use.md %}
+{% include_relative ont-nokia-use.md disableEnablePassword=true alertUsage="The following commands need to be executed on GponCLI via a terminal (serial, telnet or SSH). The models currently distributed in Italy by TIM and OpenFiber have no way to enter GponCLI via serial, only via telnet after flashing a custom firmware."  %}
 
 {% include_relative ont-nokia-useful-command.md %}
 
-## Enable password
-
-{% include alert.html content="The following enable password is used to enter GponCLI over a serial connection. The models currently distributed in Italy by TIM and OpenFiber have no way to enter GponCLI via serial, only via telnet after flashing a custom firmware. The enable password is not useful for accessing the Web Gui." alert="Note" icon="svg-info" color="blue" %}
-
-You can use this tool to generate the enable password:
-
-{% include cig_password.html username="ont" %}
-
 # Advanced settings
-## Unlock serial and TELNET
+## Unlock serial to flash another firmware
 
-This ONT is the twin brother of [CIG G97-CP](/ont-cig-g-97cp), if you can find its bootloader (named `CIG_bu.en_V3.09.15`), you can easly repack the firmware and enable its serial port. 
+This ONT is the twin brother of [CIG G97-CP](/ont-cig-g-97cp), if you can find its bootloader (named `CIG_bu.en_V3.09.15`), you can easly repack the firmware and enable its serial port limited to bootloader. 
 You need a 3.3V SPI programmer (like a modded CH341a) to read and write back the flash.
 
 {% include alert.html content="This was tested only on a TIM V6.0.10N20 firmware!" alert="Note" icon="svg-info" color="blue" %}
@@ -166,7 +156,7 @@ And flash image with the `upgdimage`.
 
 This way both slots will have the same firmware version and will avoid any swap by the OLT.
 
-After these steps, power-cycle ONT and login via TELNET with `root\admin` credentials. From this moment you can simply spoof your ONT with the usual commands.
+After these steps, power-cycle ONT and login via Telnet with `root\admin` credentials. From this moment you can simply spoof your ONT with the usual commands.
 
 
 # Known Bugs