Skip to content

Commit

Permalink
Merge pull request #793 from DejanMilicic/master
Browse files Browse the repository at this point in the history
Read the docs documentation
  • Loading branch information
DejanMilicic committed Jun 17, 2017
2 parents 2be2124 + 0cd4b44 commit 53207c0
Show file tree
Hide file tree
Showing 16 changed files with 49 additions and 220 deletions.
Binary file modified docs/readthedocs/_build/doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/readthedocs/_build/doctrees/getting-started/index.doctree
Binary file not shown.
Binary file not shown.
Binary file modified docs/readthedocs/_build/doctrees/index.doctree
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ After you've installed N2CMS in one of these ways, you will want to update it fr
of the latest features, security patches, and other updates. If you opted to use the Nuget deployment model, the
Nuget packages will be updated periodically, and you can update using the built-in Nuget update mechanism to update
your local instance of N2CMS. If you chose the Git deployment model, you can use git pull to get the latest updates
<<<<<<< HEAD
in your own Git repository.
=======
in your own Git repository.

Visual Studio Snippets and Templates
Expand Down Expand Up @@ -176,3 +179,4 @@ You can choose whichever management pack is right for you. Consider the followin
| files are installed separately (not extracted). Additionally, the Zip Virtual Path
| Provider is not installed, which means that less memory is used by N2CMS.

>>>>>>> master
3 changes: 3 additions & 0 deletions docs/readthedocs/_build/html/genindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#updating-n2cms">Updating N2CMS</a></li>
</ul>
</li>
<<<<<<< HEAD
=======
<li class="toctree-l2"><a class="reference internal" href="setting-up-your-environment/index.html#visual-studio-snippets-and-templates">Visual Studio Snippets and Templates</a><ul>
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#installing-visual-studio-item-templates">Installing Visual Studio Item Templates</a></li>
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#installing-intellisense-documentation-for-visual-studio">Installing IntelliSense Documentation for Visual Studio</a></li>
Expand All @@ -103,6 +105,7 @@
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#which-management-pack-should-i-choose">Which management pack should I choose?</a></li>
</ul>
</li>
>>>>>>> master
</ul>
</li>
</ul>
Expand Down
11 changes: 11 additions & 0 deletions docs/readthedocs/_build/html/getting-started/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,13 @@



<<<<<<< HEAD
<link rel="top" title="n2cms 1 documentation" href="../index.html"/>
=======
<link rel="top" title="n2cms 1 documentation" href="../index.html"/>
<link rel="next" title="Server Requirements" href="server-requirements.html"/>
<link rel="prev" title="Welcome to N2CMS documentation!" href="../index.html"/>
>>>>>>> master


<script src="_static/js/modernizr.min.js"></script>
Expand Down Expand Up @@ -71,6 +75,9 @@



<<<<<<< HEAD
<ul class="simple">
=======
<ul class="current">
<li class="toctree-l1 current"><a class="current reference internal" href="">Getting Started</a><ul>
<li class="toctree-l2"><a class="reference internal" href="server-requirements.html">Server Requirements</a><ul>
Expand Down Expand Up @@ -106,6 +113,7 @@
</li>
</ul>
</li>
>>>>>>> master
</ul>


Expand Down Expand Up @@ -179,6 +187,8 @@ <h1>Getting Started<a class="headerlink" href="#getting-started" title="Permalin
</div>
<footer>

<<<<<<< HEAD
=======
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">

<a href="server-requirements.html" class="btn btn-neutral float-right" title="Server Requirements" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
Expand All @@ -188,6 +198,7 @@ <h1>Getting Started<a class="headerlink" href="#getting-started" title="Permalin

</div>

>>>>>>> master

<hr/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,14 @@



<<<<<<< HEAD
<link rel="top" title="n2cms 1 documentation" href="../index.html"/>
=======
<link rel="top" title="n2cms 1 documentation" href="../index.html"/>
<link rel="up" title="Getting Started" href="index.html"/>
<link rel="next" title="Setting up your environment" href="../setting-up-your-environment/index.html"/>
<link rel="prev" title="Getting Started" href="index.html"/>
>>>>>>> master


<script src="_static/js/modernizr.min.js"></script>
Expand Down Expand Up @@ -72,6 +76,9 @@



<<<<<<< HEAD
<ul class="simple">
=======
<ul class="current">
<li class="toctree-l1 current"><a class="reference internal" href="index.html">Getting Started</a><ul class="current">
<li class="toctree-l2 current"><a class="current reference internal" href="">Server Requirements</a><ul>
Expand Down Expand Up @@ -107,6 +114,7 @@
</li>
</ul>
</li>
>>>>>>> master
</ul>


Expand All @@ -131,8 +139,11 @@
<ul class="wy-breadcrumbs">
<li><a href="../index.html">Docs</a> &raquo;</li>

<<<<<<< HEAD
=======
<li><a href="index.html">Getting Started</a> &raquo;</li>

>>>>>>> master
<li>Server Requirements</li>
<li class="wy-breadcrumbs-aside">

Expand Down Expand Up @@ -296,6 +307,8 @@ <h2>Shared Hosting<a class="headerlink" href="#shared-hosting" title="Permalink
</div>
<footer>

<<<<<<< HEAD
=======
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">

<a href="../setting-up-your-environment/index.html" class="btn btn-neutral float-right" title="Setting up your environment" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
Expand All @@ -305,6 +318,7 @@ <h2>Shared Hosting<a class="headerlink" href="#shared-hosting" title="Permalink

</div>

>>>>>>> master

<hr/>

Expand Down
6 changes: 6 additions & 0 deletions docs/readthedocs/_build/html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#updating-n2cms">Updating N2CMS</a></li>
</ul>
</li>
<<<<<<< HEAD
=======
<li class="toctree-l2"><a class="reference internal" href="setting-up-your-environment/index.html#visual-studio-snippets-and-templates">Visual Studio Snippets and Templates</a><ul>
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#installing-visual-studio-item-templates">Installing Visual Studio Item Templates</a></li>
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#installing-intellisense-documentation-for-visual-studio">Installing IntelliSense Documentation for Visual Studio</a></li>
Expand All @@ -103,6 +105,7 @@
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#which-management-pack-should-i-choose">Which management pack should I choose?</a></li>
</ul>
</li>
>>>>>>> master
</ul>
</li>
</ul>
Expand Down Expand Up @@ -173,6 +176,8 @@ <h1>Welcome to N2CMS documentation!<a class="headerlink" href="#welcome-to-n2cms
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#updating-n2cms">Updating N2CMS</a></li>
</ul>
</li>
<<<<<<< HEAD
=======
<li class="toctree-l2"><a class="reference internal" href="setting-up-your-environment/index.html#visual-studio-snippets-and-templates">Visual Studio Snippets and Templates</a><ul>
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#installing-visual-studio-item-templates">Installing Visual Studio Item Templates</a></li>
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#installing-intellisense-documentation-for-visual-studio">Installing IntelliSense Documentation for Visual Studio</a></li>
Expand All @@ -182,6 +187,7 @@ <h1>Welcome to N2CMS documentation!<a class="headerlink" href="#welcome-to-n2cms
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#which-management-pack-should-i-choose">Which management pack should I choose?</a></li>
</ul>
</li>
>>>>>>> master
</ul>
</li>
</ul>
Expand Down
218 changes: 0 additions & 218 deletions docs/readthedocs/_build/html/search.html
Original file line number Diff line number Diff line change
@@ -1,218 +0,0 @@


<!DOCTYPE html>
<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
<head>
<meta charset="utf-8">

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Search &mdash; n2cms 1 documentation</title>















<link rel="stylesheet" href="_static/css/theme.css" type="text/css" />





<link rel="top" title="n2cms 1 documentation" href="index.html"/>


<script src="_static/js/modernizr.min.js"></script>

</head>

<body class="wy-body-for-nav" role="document">

<div class="wy-grid-for-nav">


<nav data-toggle="wy-nav-shift" class="wy-nav-side">
<div class="wy-side-nav-search">



<a href="index.html" class="icon icon-home"> n2cms



</a>


<div role="search">
<form id="rtd-search-form" class="wy-form" action="#" method="get">
<input type="text" name="q" placeholder="Search docs" />
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
</div>


</div>

<div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">



<ul>
<li class="toctree-l1"><a class="reference internal" href="getting-started/index.html">Getting Started</a><ul>
<li class="toctree-l2"><a class="reference internal" href="getting-started/server-requirements.html">Server Requirements</a><ul>
<li class="toctree-l3"><a class="reference internal" href="getting-started/server-requirements.html#operating-system">Operating System</a></li>
<li class="toctree-l3"><a class="reference internal" href="getting-started/server-requirements.html#client-operating-systems">Client operating systems</a></li>
<li class="toctree-l3"><a class="reference internal" href="getting-started/server-requirements.html#web-servers">Web Servers</a></li>
<li class="toctree-l3"><a class="reference internal" href="getting-started/server-requirements.html#net-framework">.NET Framework</a></li>
<li class="toctree-l3"><a class="reference internal" href="getting-started/server-requirements.html#databases">Databases</a></li>
<li class="toctree-l3"><a class="reference internal" href="getting-started/server-requirements.html#wildcard-mapping-iis-5-6-1">Wildcard mapping (IIS 5-6.1)</a></li>
<li class="toctree-l3"><a class="reference internal" href="getting-started/server-requirements.html#visual-studio-development">Visual Studio Development</a></li>
<li class="toctree-l3"><a class="reference internal" href="getting-started/server-requirements.html#shared-hosting">Shared Hosting</a></li>
</ul>
</li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="setting-up-your-environment/index.html">Setting up your environment</a><ul>
<li class="toctree-l2"><a class="reference internal" href="setting-up-your-environment/index.html#development-environment">Development Environment</a></li>
<li class="toctree-l2"><a class="reference internal" href="setting-up-your-environment/index.html#getting-the-bits">Getting the Bits</a></li>
<li class="toctree-l2"><a class="reference internal" href="setting-up-your-environment/index.html#overview-of-available-packages">Overview of Available Packages</a></li>
<li class="toctree-l2"><a class="reference internal" href="setting-up-your-environment/index.html#getting-up-and-running">Getting up and Running</a><ul>
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#web-platform-installer-wpi">Web Platform Installer (WPI)</a></li>
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#updating-n2cms">Updating N2CMS</a></li>
</ul>
</li>
<li class="toctree-l2"><a class="reference internal" href="setting-up-your-environment/index.html#visual-studio-snippets-and-templates">Visual Studio Snippets and Templates</a><ul>
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#installing-visual-studio-item-templates">Installing Visual Studio Item Templates</a></li>
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#installing-intellisense-documentation-for-visual-studio">Installing IntelliSense Documentation for Visual Studio</a></li>
</ul>
</li>
<li class="toctree-l2"><a class="reference internal" href="setting-up-your-environment/index.html#installing-n2cms-nuget-packages">Installing N2CMS NuGet Packages</a><ul>
<li class="toctree-l3"><a class="reference internal" href="setting-up-your-environment/index.html#which-management-pack-should-i-choose">Which management pack should I choose?</a></li>
</ul>
</li>
</ul>
</li>
</ul>



</div>
&nbsp;
</nav>

<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">


<nav class="wy-nav-top" role="navigation" aria-label="top navigation">
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="index.html">n2cms</a>
</nav>



<div class="wy-nav-content">
<div class="rst-content">
<div role="navigation" aria-label="breadcrumbs navigation">
<ul class="wy-breadcrumbs">
<li><a href="index.html">Docs</a> &raquo;</li>

<li></li>
<li class="wy-breadcrumbs-aside">

</li>
</ul>
<hr/>
</div>
<div role="main" class="document">

<noscript>
<div id="fallback" class="admonition warning">
<p class="last">
Please activate JavaScript to enable the search
functionality.
</p>
</div>
</noscript>


<div id="search-results">

</div>

</div>
<footer>


<hr/>

<div role="contentinfo">
<p>
&copy; Copyright 2015, n2cms.
</p>
</div>
Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.

</footer>

</div>
</div>

</section>

</div>





<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true
};
</script>
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="_static/searchtools.js"></script>





<script type="text/javascript" src="_static/js/theme.js"></script>




<script type="text/javascript">
jQuery(function () {
SphinxRtdTheme.StickyNav.enable();
});
</script>

<script type="text/javascript">
jQuery(function() { Search.loadIndex("searchindex.js"); });
</script>

<script type="text/javascript" id="searchindexloader"></script>



</body>
</html>

0 comments on commit 53207c0

Please sign in to comment.