Merge remote-tracking branch 'origin/master'

This commit is contained in:
privacytoolsIO 2016-12-02 11:19:33 +08:00
commit 1f6d66a40a
2 changed files with 21 additions and 21 deletions

View File

@ -16,24 +16,24 @@
<title>Privacy Tools - Encryption against global mass surveillance 🔒</title>
<!-- icons -->
<link rel="apple-touch-icon" sizes="57x57" href="https://www.privacytools.io/img/favicons/apple-touch-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="https://www.privacytools.io/img/favicons/apple-touch-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="https://www.privacytools.io/img/favicons/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="https://www.privacytools.io/img/favicons/apple-touch-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="https://www.privacytools.io/img/favicons/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="https://www.privacytools.io/img/favicons/apple-touch-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="https://www.privacytools.io/img/favicons/apple-touch-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="https://www.privacytools.io/img/favicons/apple-touch-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="https://www.privacytools.io/img/favicons/apple-touch-icon-180x180.png">
<link rel="icon" type="image/png" href="https://www.privacytools.io/img/favicons/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="https://www.privacytools.io/img/favicons/android-chrome-192x192.png" sizes="192x192">
<link rel="icon" type="image/png" href="https://www.privacytools.io/img/favicons/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="https://www.privacytools.io/img/favicons/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="https://www.privacytools.io/img/favicons/manifest.json">
<link rel="shortcut icon" href="https://www.privacytools.io/img/favicons/favicon.ico">
<link rel="apple-touch-icon" sizes="57x57" href="img/favicons/apple-touch-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="img/favicons/apple-touch-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="img/favicons/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="img/favicons/apple-touch-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="img/favicons/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="img/favicons/apple-touch-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="img/favicons/apple-touch-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="img/favicons/apple-touch-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="img/favicons/apple-touch-icon-180x180.png">
<link rel="icon" type="image/png" href="img/favicons/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="img/favicons/android-chrome-192x192.png" sizes="192x192">
<link rel="icon" type="image/png" href="img/favicons/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="img/favicons/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="img/favicons/manifest.json">
<link rel="shortcut icon" href="img/favicons/favicon.ico">
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-TileImage" content="https://www.privacytools.io/img/favicons/mstile-144x144.png">
<meta name="msapplication-config" content="https://www.privacytools.io/img/favicons/browserconfig.xml">
<meta name="msapplication-TileImage" content="img/favicons/mstile-144x144.png">
<meta name="msapplication-config" content="img/favicons/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<!-- css stylesheets -->
@ -80,7 +80,7 @@
<ul class="nav navbar-nav">
<!-- home icon in the navigation bar -->
<li><a href="https://www.privacytools.io/"><span class="glyphicon glyphicon-home"></span></a></li>
<li><a href="index.html"><span class="glyphicon glyphicon-home"></span></a></li>
<!-- drop down menu - Provider -->
<li class="dropdown">
@ -120,7 +120,7 @@
<li><a href="#pw">Password Manager</a></li>
<li><a href="#encrypt">File Encryption</a></li>
<li><a href="#sync">Secure File Sync</a></li>
<li><a href="https://www.privacytools.io/password.html">Secure Password Generator</a></li>
<li><a href="password.html">Secure Password Generator</a></li>
<li><a href="#network">Self Contained Network</a></li>
<li><a href="#mycloud">Self-Hosted Cloud Server</a></li>
<li><a href="#productivity">Productivity Tools</a></li>
@ -1876,7 +1876,7 @@
<h3>Worth Mentioning</h3>
<ul>
<li>
<a href="https://www.privacytools.io/password.html ">Secure Password Generator</a> - generates a unique set of custom, high quality, cryptographic-strength password strings which are safe for you to use.
<a href="password.html ">Secure Password Generator</a> - generates a unique set of custom, high quality, cryptographic-strength password strings which are safe for you to use.
</li>
<li>

View File

@ -44,7 +44,7 @@
</p>
</div>
<div class="alert alert-info" role="alert">
<p>Use this online tool to generate a strong and random password. The available characters in each set are user friendly - there are no ambiguous characters such as i, l, 1, o, 0, etc. Password generation is done on the client-side meaning no one has access to the passwords you generate here, <em>period</em>. </p>
<p>Use this online tool to generate a strong and random password. The available characters in each set are user friendly - there are no ambiguous characters such as i, l, 1, o, 0, etc. Password generation is done on the client-side meaning no one has access to the passwords you generate here. </p>
</div>
<div class="form-container clearfix ">
<div class="form-group">