Merge branch 'master' of github.com:dutchcoders/transfer.sh

Conflicts:
	transfersh-web/index.html

transfersh-web/index.html

@@ -54,7 +54,7 @@ include "includes/head.html"
                             <br>
                             <span class="code-title"># Upload from web</span>
                             <br>Drag your files here, or <a class="browse" href="#"> click to browse. <br/></a>
-                           
+
                         </code>
                         <input type="file" multiple="multiple" style='display: none;' />
                         <ul class='queue'>
@@ -131,10 +131,10 @@ include "includes/head.html"
                         <code>
                             <span class="code-title"># Uploading is easy using curl</span>
                             <br>$ curl --upload-file ./hello.txt https://transfer.sh/hello.txt
-                            <br>
+                            <br>https://transfer.sh/66nb8/hello.txt
                             <br>
                             <span class="code-title"># Download the file</span>
-                            <br>$ curl --upload-file ./hello.txt https://transfer.sh/hello.txt
+                            <br>$ curl https://transfer.sh/66nb8/hello.txt -o hello.txt
                         </code>
                     </div>
                 </div>
@@ -347,14 +347,14 @@ include "includes/head.html"
             <h2 class="page-title">Share the love</h2>
             <ul class="share-buttons">
                 <li>
-                    <a href="https://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Ftransfer.sh&t=" target="_blank" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u=' + encodeURIComponent(document.URL) + '&t=' + encodeURIComponent(document.URL)); return false;"> <i class="icon-facebook"></i> 
+                    <a href="https://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Ftransfer.sh&t=" target="_blank" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u=' + encodeURIComponent(document.URL) + '&t=' + encodeURIComponent(document.URL)); return false;"> <i class="icon-facebook"></i>
                     </a>
                 </li>
                 <li>
                     <a href="https://twitter.com/intent/tweet?source=http%3A%2F%2Ftransfer.sh&text=:%20http%3A%2F%2Ftransfer.sh" target="_blank" title="Tweet" onclick="window.open('https://twitter.com/intent/tweet?text=' + encodeURIComponent(document.title) + ':%20'  + encodeURIComponent(document.URL)); return false;"> <i class="icon-twitter"></i>
                 </li>
                 <li>
-                    <a href="https://plus.google.com/share?url=http%3A%2F%2Ftransfer.sh" target="_blank" title="Share on Google+" onclick="window.open('https://plus.google.com/share?url=' + encodeURIComponent(document.URL)); return false;"> <i class="icon-gplus"></i> 
+                    <a href="https://plus.google.com/share?url=http%3A%2F%2Ftransfer.sh" target="_blank" title="Share on Google+" onclick="window.open('https://plus.google.com/share?url=' + encodeURIComponent(document.URL)); return false;"> <i class="icon-gplus"></i>
                     </a>
                 </li>
                 <li>
@@ -385,13 +385,13 @@ include "includes/head.html"
     </section>
 
 
-    include "includes/footer.html" 
+    include "includes/footer.html"
 
     include "includes/js.html"
 
 
 
-    
+
 
 </body>