5 files changed, 18 insertions, 16 deletions
diff --git a/nikola/data/samplesite/README.txt b/nikola/data/samplesite/README.txt
index aeea39c..da0d685 100644
--- a/nikola/data/samplesite/README.txt
+++ b/nikola/data/samplesite/README.txt
@@ -1,6 +1,6 @@
-This folder contains the source used to generate a static site by nikola.
+This folder contains the source used to generate a static site using Nikola.
 
-Installation and documentation at http://getnikola.com
+Installation and documentation at https://getnikola.com/
 
 Configuration file for the site is `conf.py`.
 
@@ -12,7 +12,7 @@ To see it::
 
     nikola serve
 
-And point your browser to http://localhost:8000
+And point your browser to http://localhost:8000/
 
 
 To check all available commands::
diff --git a/nikola/data/samplesite/posts/1.rst b/nikola/data/samplesite/posts/1.rst
index 7116a7a..9a55859 100644
--- a/nikola/data/samplesite/posts/1.rst
+++ b/nikola/data/samplesite/posts/1.rst
@@ -3,22 +3,25 @@
 .. date: 2012-03-30 23:00:00 UTC-03:00
 .. tags: nikola, python, demo, blog
 .. author: Roberto Alsina
-.. link: http://getnikola.com
+.. link: https://getnikola.com/
 .. description:
+.. category: nikola
 
 .. figure:: http://farm1.staticflickr.com/138/352972944_4f9d568680.jpg
    :target: http://farm1.staticflickr.com/138/352972944_4f9d568680_z.jpg?zz=1
    :class: thumbnail
    :alt: Nikola Tesla Corner by nicwest, on Flickr
 
-If you can see this in a web browser, it means you have managed to install Nikola,
+If you can see this in a web browser, it means you managed to install Nikola,
 and build a site using it. Congratulations!
 
-* You can read the manual `here </stories/handbook.html>`__
-* You can learn more about Nikola at http://getnikola.com
-* You can see a demo photo gallery `here </galleries/demo/index.html>`__
-* Demo usage of listings `here </stories/listings-demo.html>`__
-* Demo of slideshows `here </stories/slides-demo.html>`__
-* Demo of Bootstrap `here </stories/bootstrap-demo.html>`__
+Next steps:
 
-Send feedback to ralsina@netmanagers.com.ar!
+* `Read the manual </stories/handbook.html>`__
+* `Visit the Nikola website to learn more <https://getnikola.com>`__
+* `See a demo photo gallery </galleries/demo/index.html>`__
+* `See a demo listing </stories/listings-demo.html>`__
+* `See a demo slideshow </stories/slides-demo.html>`__
+* `See a demo of the Bootstrap theme </stories/bootstrap-demo.html>`__
+
+Send feedback to info@getnikola.com!
diff --git a/nikola/data/samplesite/stories/1.rst b/nikola/data/samplesite/stories/1.rst
index b662fae..abe1d0b 100644
--- a/nikola/data/samplesite/stories/1.rst
+++ b/nikola/data/samplesite/stories/1.rst
@@ -7,5 +7,5 @@
 
 Hope you enjoy this software!
 
-* Home page at http://getnikola.com
-* Author's blog (and reason why Nikola exists): http://ralsina.me
+* Home page at https://getnikola.com/
+* Author's blog (and reason why Nikola exists): http://ralsina.me/
diff --git a/nikola/data/samplesite/stories/bootstrap-demo.rst b/nikola/data/samplesite/stories/bootstrap-demo.rst
index a7be1a9..481140a 100644
--- a/nikola/data/samplesite/stories/bootstrap-demo.rst
+++ b/nikola/data/samplesite/stories/bootstrap-demo.rst
@@ -2,7 +2,7 @@
 .. slug: bootstrap-demo
 .. date: 2012-03-30 23:00:00 UTC-03:00
 .. tags: bootstrap, demo
-.. link: http://getnikola.com
+.. link: https://getnikola.com
 .. description:
 
 
diff --git a/nikola/data/samplesite/stories/upgrading-to-v6.txt b/nikola/data/samplesite/stories/upgrading-to-v6.txt
deleted file mode 120000
index b514b70..0000000
--- a/nikola/data/samplesite/stories/upgrading-to-v6.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../../../docs/upgrading-to-v6.txt
-\ No newline at end of file